You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Danger Bentley <dt...@gmail.com> on 2008/03/21 11:42:16 UTC

[PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

This is my first attempt to change svn; so please tell me if I did anything
not-up-to-snuff.  I would love to snuff-up.

(BTW, I made this patch with my svn built with this change applied, which
felt a lot better than running an external program that I'm *pretty sure*
has the same semantics...)

-Dan Bentley

P.S. One potential objection I could imagine is that this breaks parallelism
with other options in the "[helpers]" section.  Should I expand the scope of
this patch to fix up every such use of editor-cmd and diff3-cmd as well?

[[[
Fix issue #3071: enhancement to svn diff to indicate that an external
diff-cmd should NOT be used

* subversion/libsvn_client/diff.c
  (diff_content_changed): Changed to use "" to mean "use built-in diff".
This allows a default in config to be overridden on command line.

* subversion/svn/main.c:
  (svn_cl__options): Document new meaning of empty string in diff-cmd
option.

Patch by: Dan Bentley <su...@danbentley.com>
]]]

Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c     (revision 29979)
+++ subversion/libsvn_client/diff.c     (working copy)
@@ -566,10 +566,12 @@
                                        SVN_CONFIG_CATEGORY_CONFIG,
                                        APR_HASH_KEY_STRING);
       svn_config_get(cfg, &diff_cmd, SVN_CONFIG_SECTION_HELPERS,
-                     SVN_CONFIG_OPTION_DIFF_CMD, NULL);
+                     SVN_CONFIG_OPTION_DIFF_CMD, "");
     }

-  if (diff_cmd)
+  /* "" means use internal diff so that an option in a config file can be
+     overridden by a command-line setting. */
+  if (strlen(diff_cmd))
     {
       /* Print out the diff header. */
       SVN_ERR(svn_stream_printf_from_utf8
Index: subversion/svn/main.c
===================================================================
--- subversion/svn/main.c       (revision 29979)
+++ subversion/svn/main.c       (working copy)
@@ -211,7 +211,8 @@
   {"ignore-externals", opt_ignore_externals, 0,
                     N_("ignore externals definitions")},
 #ifndef AS400
-  {"diff-cmd",      opt_diff_cmd, 1, N_("use ARG as diff command")},
+  {"diff-cmd",      opt_diff_cmd, 1, N_("use ARG as diff command ('' for "
+                                       "built-in diff)")},
   {"diff3-cmd",     opt_merge_cmd, 1, N_("use ARG as merge command")},
   {"editor-cmd",    opt_editor_cmd, 1, N_("use ARG as external editor")},
 #endif

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
Daniel Shahaf wrote on Fri, 4 Apr 2008 at 12:47 +0300:
> Daniel (Bentley), what is the status of this patch?  You received some
> feedback on the last iteration you posted, have you seen it?
> 

I added to issue #3071 a pointer to Dan's patch.

Daniel


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
Daniel (Bentley), what is the status of this patch?  You received some 
feedback on the last iteration you posted, have you seen it?

Daniel

Daniel Danger Bentley wrote on Fri, 21 Mar 2008 at 07:42 -0400:
> This is my first attempt to change svn; so please tell me if I did anything
> not-up-to-snuff.  I would love to snuff-up.
>
> (BTW, I made this patch with my svn built with this change applied, which
> felt a lot better than running an external program that I'm *pretty sure*
> has the same semantics...)
>
> -Dan Bentley
>
> P.S. One potential objection I could imagine is that this breaks parallelism
> with other options in the "[helpers]" section.  Should I expand the scope of
> this patch to fix up every such use of editor-cmd and diff3-cmd as well?
>
> [[[
> Fix issue #3071: enhancement to svn diff to indicate that an external
> diff-cmd should NOT be used
>
> * subversion/libsvn_client/diff.c
>  (diff_content_changed): Changed to use "" to mean "use built-in diff".
> This allows a default in config to be overridden on command line.
>
> * subversion/svn/main.c:
>  (svn_cl__options): Document new meaning of empty string in diff-cmd
> option.
>
> Patch by: Dan Bentley <su...@danbentley.com>
> ]]]
>
> Index: subversion/libsvn_client/diff.c
> ===================================================================
> --- subversion/libsvn_client/diff.c     (revision 29979)
> +++ subversion/libsvn_client/diff.c     (working copy)
> @@ -566,10 +566,12 @@
>                                        SVN_CONFIG_CATEGORY_CONFIG,
>                                        APR_HASH_KEY_STRING);
>       svn_config_get(cfg, &diff_cmd, SVN_CONFIG_SECTION_HELPERS,
> -                     SVN_CONFIG_OPTION_DIFF_CMD, NULL);
> +                     SVN_CONFIG_OPTION_DIFF_CMD, "");
>     }
>
> -  if (diff_cmd)
> +  /* "" means use internal diff so that an option in a config file can be
> +     overridden by a command-line setting. */
> +  if (strlen(diff_cmd))
>     {
>       /* Print out the diff header. */
>       SVN_ERR(svn_stream_printf_from_utf8
> Index: subversion/svn/main.c
> ===================================================================
> --- subversion/svn/main.c       (revision 29979)
> +++ subversion/svn/main.c       (working copy)
> @@ -211,7 +211,8 @@
>   {"ignore-externals", opt_ignore_externals, 0,
>                     N_("ignore externals definitions")},
> #ifndef AS400
> -  {"diff-cmd",      opt_diff_cmd, 1, N_("use ARG as diff command")},
> +  {"diff-cmd",      opt_diff_cmd, 1, N_("use ARG as diff command ('' for "
> +                                       "built-in diff)")},
>   {"diff3-cmd",     opt_merge_cmd, 1, N_("use ARG as merge command")},
>   {"editor-cmd",    opt_editor_cmd, 1, N_("use ARG as external editor")},
> #endif
>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Stefan Sperling <st...@elego.de>.
On Tue, Mar 25, 2008 at 03:09:20AM -0400, Daniel Danger Bentley wrote:
>    Hmm, I understand the concern about using the empty string to mean
>    "internal diff".
> 
>    Here's my concerns with the other UI of having a
>    --force-internal-diff.  These may be handled by svn's options
>    parser library, and thus response of the form "go read this code"
>    is totally understandable, but if you could tell me what code to
>    read I'd be grateful.

See http://subversion.tigris.org/servlets/ReadMsg?listName=svn&msgNo=32343
for a commit that added a new diff option to the svnlook command.
The process should be very similar for the svn command.

I'm referring you to this diff and not the code itself because:

1) I made that patch, i.e. I can answer questions about it if you have any.
2) You need to understand what needs to be changed, and using both
   a diff like that *and* the code will probably get you there quicker.

>    What happens if I set --force-internal-diff while also setting
>    --diff-cmd="/path/to/my/diff"?

UNIX tools usually implement it so that the flag specified last wins.
I think is perfectly acceptable for us, too.

Or you could also have svn error out if both options are specified,
and print an appropriate message.

Either behaviour is fine.

>    What happens if I set force-internal-diff in my config, but
>    diff-cmd on the command line?

I suggest we make it so that you can't set --force-internal-diff
in the config file at all.

See the first post of issue #3071 again. It's about *overriding*
the config file, nothing else. As such, the force flag itself
does not need to be in the config file, and hence is unambiguous.

In fact, the reporter himself suggested a flag. He said:
"Maybe something like:

  svn diff --no-diff-cmd"

His idea seems oddly familiar to me :)

>    It seems to me what we are discussing is one option (which diff
>    command should be used), and so it makes sense to specify that
>    option in one place.

To me it seems that we are discussing a new option that allows
overriding a setting in the config file with a known default value.

The aim is to get rid of the pain of having to edit the config
file if usually a diff-cmd specified in the config file should
be used, but the internal diff should be used in exceptional cases.

I don't think that's the same as "which diff command should be used".
That question is already covered by --diff-cmd. And if that flag is
not specified at all, then the internal implementation is used,
which is a reasonable example of default behaviour.
 
>    Having "" mean default matches informal user expectation, I
>    posit.

No way :)

I posit you like it this way because you've already implemented it,
and because you didn't have to do lots of changes to implement it the
way you did, and because it seems easier to you than adding a new
option :P

>    Uninitialized strings in languages that have a default are
>    "", and supply the value most like null to specify that you meant
>    no value seems consistent.

Many people, even Subversion users, are not programmers, and won't
understand you when you say "But hey, look, it makes perfect sense
this way, the default value is NULL! That is consistent!".
Instead they will probably sigh and think "Oh my god this is just
like when I started using Linux for the first time ever".

Attributing special meaning to an empty string in a user interface
is beyond confusing, it's madness. Subversion has enough UI issues
as it is. (As an aside I myself still have to clean up UI issues on
the tree-conflicts branch, so I'm not innocent either in this respect.
And these fixes may possibly affect trunk, too, but that is a
different topic I'll bring up another day in another thread.).

>    I'd love to do what will make this work, but I think that keeping
>    it as one option (especially when it's documented that "" is a
>    special value instead of a non-sensical one to specify) is going
>    to be simplest when integrated over many variables.

I think we should not extend this discussion to other variables
just yet.  We should focus on the diff-cmd discussion first, then see
if we can apply the result of that to diff3-cmd as well (since it's
obviously similar), and then see what else can be done.

>    The
>    discussion on the bug (
>    http://subversion.tigris.org/issues/show_bug.cgi?id=3071 ) settled
>    with jph saying this wasn't a perfect syntax, but acceptable.  

Of course he won't object, because your patch solves his problem,
and he knows about the quirk so he won't run into it without
knowing what hit him.

Other users who read the help text the first time ("empty string...
wait... whaaat?") or accidentally specify an empty string for some
reason and then complain about "unexpected behaviour" might have a
different opinion than jph.

On the other hand, a new override flag is a straightforward UI
design that nobody will have much trouble grasping.

And in other UIs (think GUIs like TortoiseSVN, Subclipse, etc.)
it perfectly matches to a small check box with the text
"ignore diff-cmd option in config file" next to it.

>    It's not perfect, but I think it might be the least flawed out
>    there.

You are really, really close to making your patch perfect.
Adding an option is not hard! Go for it :)
 
-- 
Stefan Sperling <st...@elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Augie Fackler <du...@gmail.com>.
On Mar 25, 2008, at 3:37 PM, Daniel Shahaf wrote:

> Daniel Danger Bentley wrote on Tue, 25 Mar 2008 at 03:09 -0400:
>> Hmm, I understand the concern about using the empty string to mean  
>> "internal
>> diff".
>>
> ...
>> It seems to me what we are discussing is one option (which diff  
>> command
>> should be used), and so it makes sense to specify that option in  
>> one place.
>>
>
> Makes sense to me too.
>
>> Using "" to mean "built-in" may be confusing.  I get that.  Another  
>> option
>> would be to be "builtin" to mean "built-in", but that 1) prevents  
>> running
>> binaries named "builtin"
>
>    --diff-cmd=/path/to/builtin
>
> Is there actually a 'builtin' binary anywhere that does diffs?

Just a thought, we could use 'svn' to mean use the built-in diff  
command. That sorta makes sense to me, although I'm undecided if the  
special case makes sense...

Augie

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
C. Michael Pilato wrote on Wed, 26 Mar 2008 at 13:29 -0400:
> Daniel Shahaf wrote:
>> Daniel Danger Bentley wrote on Tue, 25 Mar 2008 at 03:09 -0400:
>>> Using "" to mean "built-in" may be confusing.  I get that.  Another option
>>> would be to be "builtin" to mean "built-in", but that 1) prevents running
>>> binaries named "builtin"
>>
>>     --diff-cmd=/path/to/builtin
>> 
>> Is there actually a 'builtin' binary anywhere that does diffs?
>
> There are some thin wrapper binaries (diff, diff3, and diff4) that you can 
> build on Linux with 'make tools' in the Subversion source tree.
>
>

Nice trick!  I didn't know that invocation.

But I actually meant to ask, 'Is there anywhere a binary that does
diffs and is named "builtin"';  not 'Does Subversion have built-in
binaries for diffing".  Sorry if I wasn't clear.

Daniel



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Daniel Shahaf <d....@daniel.shahaf.co.il>.
Daniel Danger Bentley wrote on Tue, 25 Mar 2008 at 03:09 -0400:
> Hmm, I understand the concern about using the empty string to mean "internal
> diff".
>
...
> It seems to me what we are discussing is one option (which diff command
> should be used), and so it makes sense to specify that option in one place.
>

Makes sense to me too.

> Using "" to mean "built-in" may be confusing.  I get that.  Another option
> would be to be "builtin" to mean "built-in", but that 1) prevents running
> binaries named "builtin"

     --diff-cmd=/path/to/builtin

Is there actually a 'builtin' binary anywhere that does diffs?

> and 2) is easy to confuse with something else; say
> "built-in".
>

It is equally easy to confuse --diff-cmd/--diffcmd, -R/-r, and so on.

If the wrong name is specified, it won't be executable and an error
message will be given.  That error message could point people to the
help, which lists the correct spelling.

> Having "" mean default matches informal user expectation, I posit.

Usually, it means to use the empty string, which may or may not be
a legal value.  For example, svn ci -m "" doesn't commit with a default
log message, svn up -r "" doesn't update to a default revision, and so
on.

Daniel

> Uninitialized strings in languages that have a default are "", and supply
> the value most like null to specify that you meant no value seems
> consistent.
>
> I'd love to do what will make this work, but I think that keeping it as one
> option (especially when it's documented that "" is a special value instead
> of a non-sensical one to specify) is going to be simplest when integrated
> over many variables.  The discussion on the bug (
> http://subversion.tigris.org/issues/show_bug.cgi?id=3071 ) settled with jph
> saying this wasn't a perfect syntax, but acceptable.   It's not perfect, but
> I think it might be the least flawed out there.
>
> Thank you for the help/guidance,
> -Dan
>
> On Mon, Mar 24, 2008 at 4:33 PM, C. Michael Pilato <cm...@collab.net>
> wrote:
>
>> Stefan Sperling wrote:
>>> On Mon, Mar 24, 2008 at 05:05:06AM -0400, Daniel Danger Bentley wrote:
>>>>    Ping.
>>>>
>>>>    Is there something I can do to help this process along or that I
>> forgot to
>>>>    do initially?  Should I pick a reviewer based on revision history?
>>>
>>> Since no-one else has commented so far, let me just give you my
>>> (non-authoritative!) take on the design of your patch.
>>>
>>> I think making an empty string carry special semantics is wrong UI
>> design.
>>> It's not obvious enough.
>>>
>>> What would be better IMHO (and various standard UNIX tools do the
>>> same thing) is adding an additional option that overrides all previous
>>> --diff-cmd options, and also config file settings.
>>>
>>> Maybe --force-internal-diff ?
>>
>> As a commentary about the proposed UI, I have to agree with Stefan here.
>>
>> --
>> C. Michael Pilato <cm...@collab.net>
>> CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
>>
>>
>
>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Daniel Danger Bentley <dt...@gmail.com>.
Hmm, I understand the concern about using the empty string to mean "internal
diff".

Here's my concerns with the other UI of having a --force-internal-diff.
These may be handled by svn's options parser library, and thus response of
the form "go read this code" is totally understandable, but if you could
tell me what code to read I'd be grateful.

What happens if I set --force-internal-diff while also setting
--diff-cmd="/path/to/my/diff"?

What happens if I set force-internal-diff in my config, but diff-cmd on the
command line?

It seems to me what we are discussing is one option (which diff command
should be used), and so it makes sense to specify that option in one place.

Using "" to mean "built-in" may be confusing.  I get that.  Another option
would be to be "builtin" to mean "built-in", but that 1) prevents running
binaries named "builtin" and 2) is easy to confuse with something else; say
"built-in".

Having "" mean default matches informal user expectation, I posit.
Uninitialized strings in languages that have a default are "", and supply
the value most like null to specify that you meant no value seems
consistent.

I'd love to do what will make this work, but I think that keeping it as one
option (especially when it's documented that "" is a special value instead
of a non-sensical one to specify) is going to be simplest when integrated
over many variables.  The discussion on the bug (
http://subversion.tigris.org/issues/show_bug.cgi?id=3071 ) settled with jph
saying this wasn't a perfect syntax, but acceptable.   It's not perfect, but
I think it might be the least flawed out there.

Thank you for the help/guidance,
-Dan

On Mon, Mar 24, 2008 at 4:33 PM, C. Michael Pilato <cm...@collab.net>
wrote:

> Stefan Sperling wrote:
> > On Mon, Mar 24, 2008 at 05:05:06AM -0400, Daniel Danger Bentley wrote:
> >>    Ping.
> >>
> >>    Is there something I can do to help this process along or that I
> forgot to
> >>    do initially?  Should I pick a reviewer based on revision history?
> >
> > Since no-one else has commented so far, let me just give you my
> > (non-authoritative!) take on the design of your patch.
> >
> > I think making an empty string carry special semantics is wrong UI
> design.
> > It's not obvious enough.
> >
> > What would be better IMHO (and various standard UNIX tools do the
> > same thing) is adding an additional option that overrides all previous
> > --diff-cmd options, and also config file settings.
> >
> > Maybe --force-internal-diff ?
>
> As a commentary about the proposed UI, I have to agree with Stefan here.
>
> --
> C. Michael Pilato <cm...@collab.net>
> CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
>
>


-- 
'Ladislav Sticha, the tall spokesman for Czech Television, told me that the
show's audience was "miniature" — presumably he meant small in number.' -
New York Times, January 24, 2008

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by "C. Michael Pilato" <cm...@collab.net>.
Stefan Sperling wrote:
> On Mon, Mar 24, 2008 at 05:05:06AM -0400, Daniel Danger Bentley wrote:
>>    Ping.
>>
>>    Is there something I can do to help this process along or that I forgot to
>>    do initially?  Should I pick a reviewer based on revision history?
> 
> Since no-one else has commented so far, let me just give you my
> (non-authoritative!) take on the design of your patch.
> 
> I think making an empty string carry special semantics is wrong UI design.
> It's not obvious enough.
> 
> What would be better IMHO (and various standard UNIX tools do the
> same thing) is adding an additional option that overrides all previous
> --diff-cmd options, and also config file settings.
> 
> Maybe --force-internal-diff ?

As a commentary about the proposed UI, I have to agree with Stefan here.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand


Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Stefan Sperling <st...@elego.de>.
On Mon, Mar 24, 2008 at 05:05:06AM -0400, Daniel Danger Bentley wrote:
>    Ping.
> 
>    Is there something I can do to help this process along or that I forgot to
>    do initially?  Should I pick a reviewer based on revision history?

Since no-one else has commented so far, let me just give you my
(non-authoritative!) take on the design of your patch.

I think making an empty string carry special semantics is wrong UI design.
It's not obvious enough.

What would be better IMHO (and various standard UNIX tools do the
same thing) is adding an additional option that overrides all previous
--diff-cmd options, and also config file settings.

Maybe --force-internal-diff ?

Coding-wise, your patch looks great.

>      P.S. One potential objection I could imagine is that this breaks
>      parallelism with other options in the "[helpers]" section.  Should I
>      expand the scope of this patch to fix up every such use of editor-cmd
>      and diff3-cmd as well?

What should the semantics of editor-cmd "" be?

For diff3, --force-internal-diff3 would be suitable also. If you can
make diff3 consistent with diff, all the better :)

>      * subversion/libsvn_client/diff.c
>        (diff_content_changed): Changed to use "" to mean "use built-in
>      diff".  This allows a default in config to be overridden on command
>      line.

We usually indent log messages like this, using single spaces:

      * subversion/libsvn_client/diff.c
        (diff_content_changed): Changed to use "" to mean "use built-in
         diff".  This allows a default in config to be overridden on command
         line.
       ^^^

Hope this helps,
-- 
Stefan Sperling <st...@elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

Re: [PATCH] issue #3071: allow built-in diff to be specified as diff-cmd

Posted by Daniel Danger Bentley <dt...@gmail.com>.
Ping.

Is there something I can do to help this process along or that I forgot to
do initially?  Should I pick a reviewer based on revision history?

Thanks,
-Dan

On Fri, Mar 21, 2008 at 7:42 AM, Daniel Danger Bentley <dt...@gmail.com>
wrote:

> This is my first attempt to change svn; so please tell me if I did
> anything not-up-to-snuff.  I would love to snuff-up.
>
> (BTW, I made this patch with my svn built with this change applied, which
> felt a lot better than running an external program that I'm *pretty sure*
> has the same semantics...)
>
> -Dan Bentley
>
> P.S. One potential objection I could imagine is that this breaks
> parallelism with other options in the "[helpers]" section.  Should I expand
> the scope of this patch to fix up every such use of editor-cmd and diff3-cmd
> as well?
>
> [[[
> Fix issue #3071: enhancement to svn diff to indicate that an external
> diff-cmd should NOT be used
>
> * subversion/libsvn_client/diff.c
>   (diff_content_changed): Changed to use "" to mean "use built-in diff".
> This allows a default in config to be overridden on command line.
>
> * subversion/svn/main.c:
>   (svn_cl__options): Document new meaning of empty string in diff-cmd
> option.
>
> Patch by: Dan Bentley <su...@danbentley.com>
> ]]]
>
> Index: subversion/libsvn_client/diff.c
> ===================================================================
> --- subversion/libsvn_client/diff.c     (revision 29979)
> +++ subversion/libsvn_client/diff.c     (working copy)
> @@ -566,10 +566,12 @@
>                                         SVN_CONFIG_CATEGORY_CONFIG,
>                                         APR_HASH_KEY_STRING);
>        svn_config_get(cfg, &diff_cmd, SVN_CONFIG_SECTION_HELPERS,
> -                     SVN_CONFIG_OPTION_DIFF_CMD, NULL);
> +                     SVN_CONFIG_OPTION_DIFF_CMD, "");
>      }
>
> -  if (diff_cmd)
> +  /* "" means use internal diff so that an option in a config file can be
> +     overridden by a command-line setting. */
> +  if (strlen(diff_cmd))
>      {
>        /* Print out the diff header. */
>        SVN_ERR(svn_stream_printf_from_utf8
> Index: subversion/svn/main.c
> ===================================================================
> --- subversion/svn/main.c       (revision 29979)
> +++ subversion/svn/main.c       (working copy)
> @@ -211,7 +211,8 @@
>    {"ignore-externals", opt_ignore_externals, 0,
>                      N_("ignore externals definitions")},
>  #ifndef AS400
> -  {"diff-cmd",      opt_diff_cmd, 1, N_("use ARG as diff command")},
> +  {"diff-cmd",      opt_diff_cmd, 1, N_("use ARG as diff command ('' for
> "
> +                                       "built-in diff)")},
>    {"diff3-cmd",     opt_merge_cmd, 1, N_("use ARG as merge command")},
>    {"editor-cmd",    opt_editor_cmd, 1, N_("use ARG as external editor")},
>  #endif
>
>


-- 
'Ladislav Sticha, the tall spokesman for Czech Television, told me that the
show's audience was "miniature" — presumably he meant small in number.' -
New York Times, January 24, 2008