Subversion Unification

Question

Just ask a simple question. What is the best way to merge two Subversion branches together?

I want to combine the name of the branch 3661into the name of the branch2011-01-17

3661 has version code 16658

2011-01-17 has version code 16613

Answer 1

This is how I do it (I use the command line)

(1) Get the revision 3661when the branch was created as

svn log --verbose --stop-on-copy http://url/to/branch/3661

Take the smallest revision from the exit. Let's just say 911

(2) Reserve the last branch 2011-01-17and run it in the main directory. This will show all conflicts and updates, but will do nothing.

 svn merge --dry-run -r 911:HEAD http://url/to/branch/3661

(3) If you are ok with the changes, do the actual merge

 svn merge -r 911:HEAD http://url/to/branch/3661

. . .

(4) , ,

 svn commit -m "Merged 3661 changes into 2011-01-17"

, . http://svnbook.red-bean.com/en/1.0/ch04s04.html

, SVN . - Subversion.

Answer 2

, . SVN, , .