TortoiseSVN: copy the contents of one branch over another

Question

I am using TortoiseSVN without an external Subversion server to control the LabView source (i.e. a large set of constantly changing binaries).

I would like to have a beta version of the repository that anyone can subscribe to and receive daily updates. I think this is different from the regular beta with separate branches, but that's right for this project.

What is the best / easiest way to copy the contents of a particular revision of a trunk branch to a beta branch? Essentially, I want to delete the old content betaand insert the new content. Delete + add will work, I suppose, but this is clearly suboptimal. Merging is not an option if I cannot get Tortoise to automatically resolve all conflicts in favor of trunk, including deleting files.

Update: A person asks why I do not want delete + add. I need a cleaner alternative.

• This method results in half the beta tree updates that "destroy the latest rev."
• Updates are not atomic, so someone might get an empty release.
• I have not tried or seen, but betawould not be the right branch. Will the change log even track multiple versions at all, because each time it is a “new” file?

Update 2: svn allows any arbitrary commands before committing, but I couldn't get Tortoise to work that way. After selecting Delete, the stub directories still remained until I committed, after which I could re-populate the branch. There must be a way to unmark the directory for deletion when it exists in both old and new versions of tags.

Answer 1

SVN - ( !) . ( )

Answer 2

, Tortoise , .

TortoiseSVN, , , trunk beta:

cd c:/path/to/my/working/copy/of/beta/branch
svn merge file:///c:/path/to/my/repository/trunk --accept theirs-full
svn commit -m "merged latest trunk changes to beta branch"

--accept theirs-full , , .

: subversion , , , . , beta, , , .

Answer 3

Why not remove beta / * and then copy trunk / * to beta /?