[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: Augie Fackler <durin42_at_gmail.com>
Date: Wed, 31 Dec 2008 10:40:15 -0600

On Dec 31, 2008, at 10:38 AM, John Gardiner Myers wrote:

> Augie Fackler wrote:
>> Why isn't it good enough for the operation to abort as happens now
>> with a non-{0,1} exit code? If we fix the bug in the existing
>> implementation, wouldn't that result in a working copy with
>> conflicted files?
> The operation does not abort now with non-{0,1} exit code. That is
> what the patch is trying to make happen.

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.


  • application/pkcs7-signature attachment: smime.p7s
Received on 2008-12-31 17:43:07 CET

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.