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

RE: svn commit: r1577835 - /subversion/trunk/subversion/svn/svn.c

From: Bert Huijben <bert_at_qqmail.nl>
Date: Sat, 15 Mar 2014 15:11:09 +0100

> -----Original Message-----
> From: stsp_at_apache.org [mailto:stsp_at_apache.org]
> Sent: zaterdag 15 maart 2014 13:09
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1577835 - /subversion/trunk/subversion/svn/svn.c
>
> Author: stsp
> Date: Sat Mar 15 12:08:52 2014
> New Revision: 1577835
>
> URL: http://svn.apache.org/r1577835
> Log:
> * subversion/svn/svn.c
> (svn_cl__cmd_table): Grammar and wording tweak for svn merge --force
> option help string.
>
> 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=
> 1577835&r1=1577834&r2=1577835&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/svn/svn.c (original)
> +++ subversion/trunk/subversion/svn/svn.c Sat Mar 15 12:08:52 2014
> @@ -1142,7 +1142,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> {'r', 'c', 'N', opt_depth, 'q', opt_force, opt_dry_run, opt_merge_cmd,
> opt_record_only, 'x', opt_ignore_ancestry, opt_accept, opt_reintegrate,
> opt_allow_mixed_revisions, 'v'},
> - { { opt_force, N_("force deletions even if the contents doesn't match") } }
> + { { opt_force, N_("force deletions even if deleted contents don't match")

As far as I can tell it is "contents doesn't" or "content doesn't", not "contents don't".

I like the s/the contents/deleted contents/

        Bert
Received on 2014-03-15 15:11:46 CET

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