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

Re: Enabling symmetric merge, and UI details

From: Branko ─îibej <brane_at_wandisco.com>
Date: Fri, 03 Aug 2012 22:32:35 +0200

On 03.08.2012 21:51, Mark Phippard wrote:
> On Fri, Aug 3, 2012 at 3:25 PM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
>> It's time to lose the temporary '--symmetric' option and make it the default mode in 'svn'.
> Sounds good. Just a couple of questions.
>> * Make the '--reintegrate' option mean the user believes a reintegrate-style merge is needed, so check that the
>> previous merge is as expected (that it, in the opposite direction) and bail out if not.
> Why do you want to do this? Just to educate the user that they do not
> need reintegrate? It does not seem like it would be necessary. What
> happens today if the user does this? I guess if --reintegrate does
> the wrong thing today then this makes sense. But if it basically
> still gives a valid result why bother to make a behavior change in
> what is a deprecated option anyway?

I concur. Our goal is to make the merge algorithm truly symmetric within
the next release or two, inshallah. In order to get there, the behaviour
of "svn merge" will certainly change in some scenarios, but we obviously
expect that the results will become more correct. As long as we can
argue that any such changes in 1.8 are simply incremental adjustments on
the way towards that goal, it seems a waste of effort to maintain any
kind of special meaning for the --reintegrate option.

IMO the only thing --reintegrate should do in 1.8 is to issue a warning
about it being deprecated; and in 1.9 it we can silently ignore it.

-- Brane

Certified & Supported Apache Subversion Downloads:
Received on 2012-08-03 22:33:12 CEST

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