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

Re: svn commit: r1456636 - /subversion/trunk/subversion/svn/svn.c

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 15 Mar 2013 12:37:30 +0000 (GMT)

>> URL: http://svn.apache.org/r1456636

>> Log:
>> * subversion/svn/svn.c
>>   (svn_cl__cmd_table): In the help for 'svn resolve', add the missing value
>>     'working' for the '--accept' option.
[...]
>> -                    "('base', 'working', 'mine-conflict',\n"
>                                   ^^^^^^^ 
>> +                    "('working', 'base', 'working', 'mine-conflict',\n"
>                           ^^^^^^^            ^^^^^^^

Bert wrote:

> I see litterally ‘working, base, working’ in this patch??
>

> How was it missing? (Is it somehow filtered?)
Stefan wrote:
> I don't understand this change. 'working' was already mentioned.
>
> Was this a mistake?

Huh.  Yes, I must have been too tired.  (What happened was I was initially expecting the value to be named 'merged', and that was missing so I started to add it, and then I realized the correct name is 'working'... and didn't look or think any further.)

Reverted in r1456930.  Thanks both of you for catching it.

- Julian
Received on 2013-03-15 13:38:11 CET

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