Re: issue-2897(reflective merge solution)

On Mon, Aug 4, 2008 at 1:48 PM, Julian Foad <julianfoad_at_btopenworld.com> wrote:

> Solution 0: If you were to use Subversion 1.5's plain "svn
> merge /feature_branch /trunk" command, then Subversion would omit rY
> entirely, which is wrong because we need the conflict-resolution part of
> the change. Without that part, the merge would throw up those same (or
> similar) conflicts again, which the user would have to resolve again.

I think what we finally decided to do in 1.5 was include rY in this
scenario. So you would get a lot of repeated merges and likely
conflicts from that. I'd have to search our archives to be sure, but
I recall we decided it was better to not risk losing code. Obviously
both options "omit rY" and "take rY" are imperfect.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org