Filed as issue #1205.
Sander
On Fri, Mar 14, 2003 at 11:33:07AM +0100, Rafael Garcia-Suarez wrote:
> The user docs (svn help, config file, man page) are not very clear
> about the internal/external diff.
>
> If I understand correctly, the internal diff is used by default by
> "svn diff", except when one of the following is true :
>
> 1. -x is used
> 2. --diff-cmd is used
> 3. diff-cmd is set in the config file
>
> In this case, at least the following doc patch is needed.
>
> Moreover, there's a situation which can't be configured, apparently :
> when one wants to use the internal diff by default, but
> /some/unsual/path/to/diff when -x is specified. Maybe a new option in
> config/[helpers] is needed to handle this case.
>
> --- subversion/libsvn_subr/config_file.c.orig Fri Mar 14 11:12:42 2003
> +++ subversion/libsvn_subr/config_file.c Fri Mar 14 11:17:59 2003
> @@ -759,11 +759,11 @@ svn_config_ensure (apr_pool_t *pool)
> "### examines by default to find this information ($EDITOR, \n"
> "### et al).\n"
> "### Set diff-cmd to the absolute path of your `diff' program.\n"
> - "### This will override the compile-time default path to `diff'\n"
> - "### that Subversion default to.\n"
> + "### This will override the compile-time default, which is to use\n"
> + "### Subversion's internal diff.\n"
> "### Set diff3-cmd to the absolute path of your `diff3' program.\n"
> - "### This will override the compile-time default path to `diff3'\n"
> - "### that Subversion default to.\n"
> + "### This will override the compile-time default, which is to use\n"
> + "### Subversion's internal diff.\n"
> "### Set diff3-has-program-arg to `true' or `yes' if your `diff3'\n"
> "### program accepts the `--diff-program' option.\n"
> "# [helpers]\n"
> End of Patch.
>
> ---------------------------------------------------------------------
> 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
Received on Wed Mar 26 15:31:42 2003