[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: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 15 Mar 2013 01:48:42 +0100

On Thu, Mar 14, 2013 at 08:09:45PM -0000, julianfoad_at_apache.org wrote:
> Author: julianfoad
> Date: Thu Mar 14 20:09:44 2013
> New Revision: 1456636
>
> 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.
>
> Modified:
> subversion/trunk/subversion/svn/svn.c
>
> Modified: subversion/trunk/subversion/svn/svn.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1456636&r1=1456635&r2=1456636&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/svn/svn.c (original)
> +++ subversion/trunk/subversion/svn/svn.c Thu Mar 14 20:09:44 2013
> @@ -1343,7 +1343,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> {opt_targets, 'R', opt_depth, 'q', opt_accept},
> {{opt_accept, N_("specify automatic conflict resolution source\n"
> " "
> - "('base', 'working', 'mine-conflict',\n"
                                   ^^^^^^^
> + "('working', 'base', 'working', 'mine-conflict',\n"
                           ^^^^^^^ ^^^^^^^

I don't understand this change. 'working' was already mentioned.

Was this a mistake?

> " "
> "'theirs-conflict', 'mine-full', 'theirs-full')")}} },
>
>
Received on 2013-03-15 01:49:17 CET

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