Monday, April 22, 2013

SVN - merge one branch into another? - thanks to Stack Overflow

I'd like to merge all the changes that took place between rev 10 & the HEAD rev on http://url-of-branch-aand apply them to http://url-of-branch-b.
Something like...
svn merge -r 10:HEAD http://url-of-branch-a
Is this possible? If so, what is the syntax?
I am running the SVN client from the unix command line. The SVN client version is 1.4
EDIT: Yes, my specific solution was...
  1. change directory to the location of my working copy that wants to receive the changes (branch-b)
  2. svn merge -r 10:HEAD http://url-of-branch-a
This merges the changes from 'branch-a' into 'branch-b'
Up voted as this is a common need, has a good answer from Billy3, and is poorly documented in other places on the web. – fooMonster Apr 12 '11 at 11:40
You also need to know when the branch was taken. You can do this (svn log --stop-on-copy .) in your branch to get the revision number you branched from. – Jamie McNaught Jun 15 '12 at 12:05

SVN - merge one branch into another? - Stack Overflow

'via Blog this'

No comments:

Post a Comment