sightfert.blogg.se

#SVN MERGE BRANCH INTO TRUNK SNAILSVN HOW TO#

My thanks to Samuel Wright for bringing that to my attention :-) Bonus: Cutting a BranchĬutting a branch is a lot easier than merging a branch. Steps 2-4 can be replaced by a remote log lookup: svn log -stop-on-copy svn+ssh://server/path/to/branch You have now merged “myBranch” with trunk.

Check in the results: svn ci -m "MERGE myProject myBranch : into trunk".

Resolve any conflicts that arose during the merge.

Now we can perform an SVN merge: svn merge -rXXXX:YYYY svn+ssh://server/path/to/branch/myBranchThis will put all updates into your current working directory for trunk.

Make note of that number as well (should say “At revision YYYY” where YYYY is the second number you need to remember).

Change your current working directory to trunk # Perform an SVN update: svn upThis will update your copy of trunk to the most recent version, and tell you the revision you are at.

Remember that number (should be rXXXX, where XXXX is the revision number). Find the revision “myBranch” began at: svn log -stop-on-copyThis should display back to you the changes that have been made back to the point the branch was cut.Change your current working directory to “myBranch”.Check out a copy of the branch you are going to merge: svn co svn+ssh://server/path/to/branch/myBranch.Check out a copy of trunk: svn co svn+ssh://server/path/to/trunk.The source control program I am using is SVN and the source code is stored on a server with SSH access.

#SVN MERGE BRANCH INTO TRUNK SNAILSVN HOW TO#

It took me a while to figure out how to manage everything properly and most of the stuff I found on the web wasn’t much help so I will explain it here. Part of that includes branch control over a few web sites I work on. Recently at work, I have taken on more responsibilities. This is more for my benefit than anything else, but someone might find this useful.