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

Re: [PATCH] Allow the merge tool to abort the merge

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 2 Jan 2009 11:38:12 +0100

On Thu, Jan 01, 2009 at 09:44:36PM -0600, Augie Fackler wrote:
> On Dec 31, 2008, at 11:15 AM, John Gardiner Myers wrote:
>> Augie Fackler wrote:
>>> Ah, it's been too long since I looked at the code. What happens now
>>> if
>>> --non-interactive is specified and the merge tool exits with a
>>> nonzero
>>> status? You should end up with a 'C'onflicted file in status output
>>> at
>>> the end.
>> It currently behaves the same for a non-{0,1} status as it does for a 1
>> status. The merge proceeds and subsequent conflicting files are left
>> in
>> conflicted state, as if "--accept postpone" had been specified.
> It seems like that ought to be enough -

No, it's not, at least not in John's case.

> if the merge fails, the tool
> exits nonzero and then you end up with a conflicted file at the end (at
> least, barring any bugs). It feels wrong (to me at least) to provide
> special meaning to non-{0,1} exits. That's my 2ยข.

The problem is that John wants to control from his merge tool
whether svn aborts the merge if the merge tool fails, or whether
svn continues with the merge regardless.

This is not the same problem as "merge tool fails or not".


Received on 2009-01-02 11:38:44 CET

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