[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: issue-2897(reflective merge solution)

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 4 Aug 2008 13:51:49 -0400

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.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-04 19:52:27 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.