Menu
If
How do I merge the changes made in r6 back into my working copy?
I've tried
svn merge -r5:6 .
and
svn merge -r5:HEAD .
Both of which seem to do nothing. What am I doing wrong?
794
If you are using a relatively recent svn release, you can use: svn merge -c -6 . (or the specific file(s) you would like to revert, rather than '.
It's in your best interest to replicate those changes to your own branch, just to make sure they mesh well with your changes. This is done by performing a sync merge—a merge operation designed to bring your branch up to date with any changes made to its ancestral parent branch since your branch was created.
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.
Try this:
svn merge --ignore-ancestry -r5:6 .
or using newer syntax:
svn merge --ignore-ancestry -c6 .
b.t.w.: I recommend to always specify what files you want to work with instead of "."
64
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
