Subversion Merge From CommandLine

How to merge a branch back to head on subversion from the Command Line

  • start out with clean working copy of head
  • Find the revision the svn branch was made at with the following command
svn log --verbose --stop-on-copy <remote url of branch>
  • the last svn copy should give you the revision the branch was created on
  • now use this revision to run a merge
svn merge -r r17543:HEAD <remote url of branch>

Now your working copy should have the diff between the head and your branch, resolve any conflicts, run your tests and commit

Note: Remember to do an svn add on any new files taken in from the branch before you commit.


It's only fair to share...
Share on Facebook
Tweet about this on Twitter
Share on LinkedIn

Leave a Reply