You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ben Reser <be...@reser.org> on 2004/10/11 22:35:09 UTC
Re: svn commit: r11218 - trunk/subversion/clients/cmdline
On Sun, Oct 03, 2004 at 06:54:52PM -0500, julianfoad@tigris.org wrote:
> Author: julianfoad
> Date: Sun Oct 3 18:54:44 2004
> New Revision: 11218
>
> Modified:
> trunk/subversion/clients/cmdline/main.c
> Log:
> Improve help for '-x': don't say it is for GNU diff, as it is for any diff;
> also state the default value, as it is not obvious.
>
> * subversion/clients/cmdline/main.c (svn_cl__options): Update help for '-x'.
>
>
> Modified: trunk/subversion/clients/cmdline/main.c
> Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/clients/cmdline/main.c?view=diff&rev=11218&p1=trunk/subversion/clients/cmdline/main.c&r1=11217&p2=trunk/subversion/clients/cmdline/main.c&r2=11218
> ==============================================================================
> --- trunk/subversion/clients/cmdline/main.c (original)
> +++ trunk/subversion/clients/cmdline/main.c Sun Oct 3 18:54:44 2004
> @@ -97,7 +97,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 GNU diff")},
> + {"extensions", 'x', 1, N_("pass ARG as bundled options to diff (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")},
I disagree with this commit. Until we stop passing -u and -L desipite
this param the documentation is probably better iwth GNU diff. You can
write a wrapper script that emulates GNU diff and then calls whatever
you want.
--
Ben Reser <be...@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r11218 - trunk/subversion/clients/cmdline
Posted by Ben Reser <be...@reser.org>.
On Tue, Oct 12, 2004 at 01:13:09AM +0100, Julian Foad wrote:
> I did wonder about this, and held off changing it for about six months for
> that sort of reason. When confusion over the undocumented default of "-u"
> cropped up on the mailing list for the Nth time, I finally decided that it
> was worth changing this help to mention the default, and that changing the
> phrase "GNU diff" to "diff" was a good thing to do at the same time. (It
> has been suggested by Big Names on this list a long time ago.)
>
> It could add more information by saying "GNU-like diff", but it was wrong
> to suggest that this is only for passing options to GNU diff, and it is now
> correct in suggesting that it passes options to (unspecified) "diff". Yes,
> the diff program has to accept "-L" options, which means that in that
> respect it must be similar to GNU diff, but that does not mean that it _is_
> GNU diff.
>
> (Note also that the "-L" options are passed always, and separately from the
> options passed by "-x", which is why I don't mention them in the help for
> "-x".)
GNU-like diff works for me.
--
Ben Reser <be...@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r11218 - trunk/subversion/clients/cmdline
Posted by Julian Foad <ju...@btopenworld.com>.
Ben Reser wrote:
>>Author: julianfoad
>>Date: Sun Oct 3 18:54:44 2004
>>New Revision: 11218
[...]
>>Modified: trunk/subversion/clients/cmdline/main.c
[...]
>>- {"extensions", 'x', 1, N_("pass ARG as bundled options to GNU diff")},
>>+ {"extensions", 'x', 1, N_("pass ARG as bundled options to diff (default: '-u')")},
>
> I disagree with this commit. Until we stop passing -u and -L desipite
> this param the documentation is probably better iwth GNU diff. You can
> write a wrapper script that emulates GNU diff and then calls whatever
> you want.
I did wonder about this, and held off changing it for about six months for that sort of reason. When confusion over the undocumented default of "-u" cropped up on the mailing list for the Nth time, I finally decided that it was worth changing this help to mention the default, and that changing the phrase "GNU diff" to "diff" was a good thing to do at the same time. (It has been suggested by Big Names on this list a long time ago.)
It could add more information by saying "GNU-like diff", but it was wrong to suggest that this is only for passing options to GNU diff, and it is now correct in suggesting that it passes options to (unspecified) "diff". Yes, the diff program has to accept "-L" options, which means that in that respect it must be similar to GNU diff, but that does not mean that it _is_ GNU diff.
(Note also that the "-L" options are passed always, and separately from the options passed by "-x", which is why I don't mention them in the help for "-x".)
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org