Geek Answers Handbook

SVN-Tortoise Consolidation - New Branch Path

Say I have a chest and I create a branch (branch A) on Sunday, making Revision 10.

On Monday, I work both on branch A and on the trunk (branch A is responsible for Revision 11,12 and 15, and the trunk is responsible for 13, 14 and 16).

Tuesday I created a new branch (branch B) from the trunk (option 17).

On Wednesday, I work both on branch A and branch B (branch A is responsible for Revision 18-24 and 26, and branch B is responsible for changes 25 and 27).

On Thursday, I remove the old trunk and replace it with branch B (do not merge, just remove the connecting line and copy branch B to the trunk) (Revision 28).

If on Friday I want to merge the new trunk into branch A, how would I do it? I would like all changes to be made to the different connecting lines and branch B to branch A. What revision numbers would I use?

Any help would be greatly appreciated!

+4
source share
2 answers
  • go to working copy branch A, i.e. your merge target
  • Right-click the root folder of the working copy, click the TortoiseSVN menu item merge, select "merge a range of changes"
  • Enter the trunk URL as the merge URL; leave the "revision list" empty text
  • Click Next and Merge. sabotage will automatically determine which changes are eligible to merge.
  • If necessary, resolve any conflicts. Review the changes made to the working copy of the merge. Test!
  • Fix

Note that a normal workflow should not include deleting and re-creating a trunk. I have never done that.

+6
source

If you are using the new version of Subversion (1.5 or later), you do not need to worry about the version of #s ... it should handle the merge for you.

0
source

More articles:


All Articles