Menu
I'm using Subversion 1.4.6, and I cannot upgrade to version 1.5 right now.
The situation:
The trunk has a lot of structural changes (i.e. moving files around, mostly).
I have a branch that was recently merged from the trunk, but before the major changes.
What is the best way to merge the trunk to the branch?
What I had in mind:
First carefully merge the branch to the trunk, by merging only the modified files in the branch to the trunk.
Copy the trunk to the branch. What is the best way to do this without losing the branch history? Should I deprecate the branch and create a new one?
Okay, it looks like I didn't given SVN enough credit. It's smart enough after all. I was just put off by the output of "D" and "A", but in the background it did a move.
400
Unlike svn diff, the merge command takes the ancestry of a file into consideration when performing a merge operation. This is very important when you're merging changes from one branch into another and you've renamed a file on one branch but not the other.
To merge a range of revisions, use svn merge -r start:end from to where start and end are revision IDs. This will merge all revisions starting at start+1 up to and INCLUDING end . Note: it will NOT include the first revision (ex: -r3:45 will merge 4 through 45).
Is there something that prevents you from merging all revisions on trunk since the last merge?
svn merge -rLastRevisionMergedFromTrunkToBranch:HEAD url/of/trunk path/to/branch/wc should work just fine. At least if you want to merge all changes on trunk to your branch.
157
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
