You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/03/15 13:08:53 UTC
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") } }
},
{ "mergeinfo", svn_cl__mergeinfo, {0}, N_
Re: svn commit: r1577835 - /subversion/trunk/subversion/svn/svn.c
Posted by Mark Phippard <ma...@gmail.com>.
> On Mar 15, 2014, at 4:44 PM, Branko Čibej <br...@wandisco.com> wrote:
>
>> On 15.03.2014 15:19, Stefan Sperling wrote:
>>> On Sat, Mar 15, 2014 at 03:11:09PM +0100, Bert Huijben wrote:
>>>> 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 believe "contents don't" is correct.
>> Let's let a native speaker decide :) Anyone?
>
> You don't need a native speaker; "contents don't" is correct, both grammatically and stylistically.
>
> -- Brane
+1
Mark
Re: svn commit: r1577835 - /subversion/trunk/subversion/svn/svn.c
Posted by Branko Čibej <br...@wandisco.com>.
On 15.03.2014 15:19, Stefan Sperling wrote:
> On Sat, Mar 15, 2014 at 03:11:09PM +0100, Bert Huijben wrote:
>>> 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 believe "contents don't" is correct.
> Let's let a native speaker decide :) Anyone?
You don't need a native speaker; "contents don't" is correct, both
grammatically and stylistically.
-- Brane
--
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. brane@wandisco.com
Re: svn commit: r1577835 - /subversion/trunk/subversion/svn/svn.c
Posted by Stefan Sperling <st...@elego.de>.
On Sat, Mar 15, 2014 at 03:11:09PM +0100, Bert Huijben wrote:
> > 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 believe "contents don't" is correct.
Let's let a native speaker decide :) Anyone?
> I like the s/the contents/deleted contents/
Great!
Re: svn commit: r1577835 - /subversion/trunk/subversion/svn/svn.c
Posted by Stefan Sperling <st...@elego.de>.
On Sat, Mar 15, 2014 at 03:11:09PM +0100, Bert Huijben wrote:
> > 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 believe "contents don't" is correct.
Let's let a native speaker decide :) Anyone?
> I like the s/the contents/deleted contents/
Great!
RE: svn commit: r1577835 - /subversion/trunk/subversion/svn/svn.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: zaterdag 15 maart 2014 13:09
> To: commits@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
RE: svn commit: r1577835 - /subversion/trunk/subversion/svn/svn.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: stsp@apache.org [mailto:stsp@apache.org]
> Sent: zaterdag 15 maart 2014 13:09
> To: commits@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