I created a branch and then made changes to trunk which need merging into the branch. TortoiseSVN has a nice handy merge branch->trunk utility, but to do it this way round do I have to manually merge specific revision ranges?
A:
If you made the branch using 1.6, the branch will have the information to allow merging from trunk to branch automagically.
C-Pound Guru
2010-03-04 01:02:53
Can you elaborate? command-line syntax, or something?
John
2010-03-04 01:08:37
+2
A:
Bringing a branch up to date with trunk is usually very simple with SVN 1.6. This feature keeps track of the specific trunk revisions already in the branch and knows how to only merge in the revisions you don't have in the branch. TortoiseSVN takes full advantage of SVN's merge tracking feature.
When merging new trunk changes into a branch, choose the "Merge a range of revisions" option. Leaving the revision range entry blank will cause Tortoise to merge all new changes from trunk without you having to figure out what revisions those are.
Here is the TortoiseSVN documentation on merge tracking.
ChrisH
2010-03-04 01:09:19