On Wed, May 28, 2008 at 5:22 PM, Lieven Govaerts <svnlgo_at_mobsol.be> wrote:
> jensseidel_at_tigris.org wrote:
>> Author: jensseidel
>> Date: Wed May 28 13:24:10 2008
>> New Revision: 31506
>>
>> Log:
>> On the '1.5.x' branch:
>> Follow-up to r31501:
>>
>> * subversion/svn/main.c
>> (svn_cl__options."accept"): Added a missing comma.
>> This also brings some translations back to 100%.
>>
>> Modified:
>> branches/1.5.x/subversion/svn/main.c
>>
>> Modified: branches/1.5.x/subversion/svn/main.c
>> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/subversion/svn/main.c?pathrev=31506&r1=31505&r2=31506
>> ==============================================================================
>> --- branches/1.5.x/subversion/svn/main.c Wed May 28 13:05:49 2008 (r31505)
>> +++ branches/1.5.x/subversion/svn/main.c Wed May 28 13:24:10 2008 (r31506)
>> @@ -259,7 +259,7 @@ const apr_getopt_option_t svn_cl__option
>> {"accept", opt_accept, 1,
>> N_("specify automatic conflict resolution action\n"
>> " "
>> - "('postpone', 'base', 'mine-full', 'theirs-full'\n"
>> + "('postpone', 'base', 'mine-full', 'theirs-full',\n"
>> " "
>> " 'edit', 'launch')")},
>> /* 'mine-conflict' and 'theirs-conflict' are not
>>
>>
> As simple as this change might be, it breaks one of the getopt tests. The getopt tests are one of the only tests really matching the actual
> string content character per character. I know these tests are overly strict, but while we have them I propose you run at least those
> before you commit a text change inside the code.
And as you said in the other email, why are we doing direct commits to
the branch, without going through STATUS or even a dev@ email, right
before we are about to make the release?
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-28 23:58:30 CEST