You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Andy Lester <an...@petdance.com> on 2004/12/03 23:25:29 UTC
Patch for svn diff -x help message
Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c (revision 12141)
+++ subversion/clients/cmdline/main.c (working copy)
@@ -95,7 +95,7 @@
N_("specify a username ARG")},
{"password", svn_cl__auth_password_opt, 1,
N_("specify a password ARG")},
- {"extensions", 'x', 1, N_("pass ARG as bundled options to diff (default: '-u')")},
+ {"extensions", 'x', 1, N_("pass ARG as options to --diff-cmd (default: '-u')")},
{"targets", svn_cl__targets_opt, 1,
N_("pass contents of file ARG as additional args")},
{"xml", svn_cl__xml_opt, 0, N_("output in XML")},
@@ -286,8 +286,8 @@
"\n"
" Use just 'svn diff' to display local modifications in "
"a working copy.\n"),
- {'r', svn_cl__old_cmd_opt, svn_cl__new_cmd_opt, 'x', 'N',
- svn_cl__diff_cmd_opt, svn_cl__no_diff_deleted,
+ {'r', svn_cl__old_cmd_opt, svn_cl__new_cmd_opt, 'N',
+ svn_cl__diff_cmd_opt, 'x', svn_cl__no_diff_deleted,
svn_cl__notice_ancestry_opt, svn_cl__force_opt, SVN_CL__AUTH_OPTIONS,
svn_cl__config_dir_opt} },
--
Andy Lester => andy@petdance.com => www.petdance.com => AIM:petdance
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Patch for svn diff -x help message
Posted by kf...@collab.net.
Andy Lester <an...@petdance.com> writes:
> > Can I be fussy for a bit?
> >
> > Can you repost with "[PATCH]" in the subject line, and include a log
> > message, written in the project's standard format? See
> > http://subversion.tigris.org/mailing-list-guidelines.html#patches for
> > details.
>
> Absolutely. Isn't fussiness what version control is all about?
Thanks :-).
By the way, I normally would have just applied your patch anyway (no
need to delay it while telling you about the hoops to jump through
next time). But in this case, there was some recent discussion about
the wording of that option, so I wanted people to have a chance to
think about this proposed new wording anyway.
(The most recent change to it was r11218, but that just removed the
"GNU" qualifier from diff, which makes sense, as -x applies to any
external diff command.)
I wonder if it might simply be time to get more verbose, and have a
line break in the description, as we do with the --native-eol option.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Patch for svn diff -x help message
Posted by Andy Lester <an...@petdance.com>.
On Sat, Dec 04, 2004 at 12:07:00PM -0600, kfogel@collab.net (kfogel@collab.net) wrote:
> Thanks!
>
> Can I be fussy for a bit?
>
> Can you repost with "[PATCH]" in the subject line, and include a log
> message, written in the project's standard format? See
> http://subversion.tigris.org/mailing-list-guidelines.html#patches for
> details.
Absolutely. Isn't fussiness what version control is all about?
xoa
--
Andy Lester => andy@petdance.com => www.petdance.com => AIM:petdance
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Patch for svn diff -x help message
Posted by kf...@collab.net.
Thanks!
Can I be fussy for a bit?
Can you repost with "[PATCH]" in the subject line, and include a log
message, written in the project's standard format? See
http://subversion.tigris.org/mailing-list-guidelines.html#patches for
details.
Best,
-Karl
Andy Lester <an...@petdance.com> writes:
> Index: subversion/clients/cmdline/main.c
> ===================================================================
> --- subversion/clients/cmdline/main.c (revision 12141)
> +++ subversion/clients/cmdline/main.c (working copy)
> @@ -95,7 +95,7 @@
> N_("specify a username ARG")},
> {"password", svn_cl__auth_password_opt, 1,
> N_("specify a password ARG")},
> - {"extensions", 'x', 1, N_("pass ARG as bundled options to diff (default: '-u')")},
> + {"extensions", 'x', 1, N_("pass ARG as options to --diff-cmd (default: '-u')")},
> {"targets", svn_cl__targets_opt, 1,
> N_("pass contents of file ARG as additional args")},
> {"xml", svn_cl__xml_opt, 0, N_("output in XML")},
> @@ -286,8 +286,8 @@
> "\n"
> " Use just 'svn diff' to display local modifications in "
> "a working copy.\n"),
> - {'r', svn_cl__old_cmd_opt, svn_cl__new_cmd_opt, 'x', 'N',
> - svn_cl__diff_cmd_opt, svn_cl__no_diff_deleted,
> + {'r', svn_cl__old_cmd_opt, svn_cl__new_cmd_opt, 'N',
> + svn_cl__diff_cmd_opt, 'x', svn_cl__no_diff_deleted,
> svn_cl__notice_ancestry_opt, svn_cl__force_opt, SVN_CL__AUTH_OPTIONS,
> svn_cl__config_dir_opt} },
>
>
> --
> Andy Lester => andy@petdance.com => www.petdance.com => AIM:petdance
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org