http://subversion.tigris.org/issues/show_bug.cgi?id=3036







------- Additional comments from markphiptigris.org Mon Dec  3 07:55:32 -0800 2007 -------
The current workaround for the reflective merge problem
(merge a feature branch back to
trunk) is to do this:

svn merge //trunkLAST-SYNCED-REV
//branches/feature-branchHEAD

This merges the differences without merging back the changes
that were merged to the branch
from trunk as part of keeping it in synch.  

Good point on --ignore-ancestry though.  Obviously it is
making it even more hacky (to
the user), but at least it would be a solution.


------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org