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 - 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ยข.
>
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=997045
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=999073
- application/pkcs7-signature attachment: smime.p7s
Received on 2009-01-02 09:36:10 CET