[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: Mon, 06 Aug 2012 21:56:24 +0200

On 06.08.2012 20:23, Stefan Sperling wrote:
> On Mon, Aug 06, 2012 at 07:09:11PM +0100, Julian Foad wrote:
>> --reintegrate forces a 1.7 reintegrate, unconditionally, at the moment; I haven't put a deprecation warning in there.
> In my opinion it would be best to try to keep --reintegrate and its
> current behaviour around until 2.0, with a deprecation warning.

"2.0" is effectively "forever." Is that really necessary if at some
point the merge algorithm becomes truly correct and doesn't require
--reintegrate hacks?

> If we change the behaviour of --reintegrate we might break existing scripts.

We've broken scripts any number of times already. IMO --reintegrate just
papers over a bug. The idea is to fix the underlying bug. I see nothing
in our versioning rules that requires bug-for-bug backwards compatibility.

-- Brane

Certified & Supported Apache Subversion Downloads:
Received on 2012-08-06 21:57:01 CEST

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