I'd like to merge all the changes that took place between rev 10 & the HEAD rev on http://url-of-branch-a and 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...
This merges the changes from 'branch-a' into 'branch-b'
To merge a range of revisions, use svn merge -r start:end from to where start and end are revision IDs. This will merge all revisions starting at start+1 up to and INCLUDING end . Note: it will NOT include the first revision (ex: -r3:45 will merge 4 through 45).
You want to checkout a working copy of trunk and then use the svn merge --reintegrate option: $ pwd /home/user/project-trunk $ svn update # (make sure the working copy is up to date) At revision <N>. $ svn merge --reintegrate ^/project/branches/branch_1 --- Merging differences between repository URLs into '.
And when you're completely finished with your branch, your entire set of branch changes can be copied back into the trunk. In Subversion terminology, the general act of replicating changes from one branch to another is called merging, and it is performed using various invocations of the svn merge subcommand.
Reverse merge In SVN SVN will keep common file contents in working copy from the specific revision of file and HEAD revision of working copy. if it is folder level. In SVN reverse merge, if not file found in the specific revision, it keeps the working copy as it is.
The process is as follows:
svn checkout http://branch-b
)svn merge -r 10:HEAD http://branch-a .
)svn commit
)Check the man page (help file) for svn merge semantics. It shows you that svn merge always dumps the results into a working copy.
Check out the SVNBook for all the details.
Checkout URL A. Use SVN merge to merge URL B to your working copy of A. Commit A.
Or vice versa of course :)
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With