Using svn 1.5.1 merge tracking with existing branches
From: Murli Varadachari <mvaradachari_at_facebook.com>
Date: Mon, 25 Aug 2008 12:39:08 -0700
We are planning to switch our subversion 1.4.x repositories over to 1.5.1
Our current development model is as follows ==>
Main development work is done on the trunk -- new features etc are done on
Create a new branch ³mybranch² from trunk at rev# X
After some trunk commits the changes are sucked into mybranch
svn merge r X:Y trunk <mybranch-WC>
.. Later on more trunk commits are merged to mybranch
svn merge r Y:Z trunk <mybranch-WC>
Finally the branch commits are merged back to trunk..
svn merge trunk_at_X mybranch <trunk-WC-at latestrev>
Going forward the simplest solution would have been to have developers (a)
However that does not seem likely any time soon since many developers are
This is an archived mail posted to the Subversion Users mailing list.