hi,
documents about -x [--extensions] option seem to be misleading.
external diff command doesn't need to be GNU diff now.
YAMAMOTO Takashi
Index: subversion/clients/cmdline/man/svn.1
===================================================================
--- subversion/clients/cmdline/man/svn.1 (revision 7032)
+++ subversion/clients/cmdline/man/svn.1 (working copy)
@@ -67,7 +67,8 @@ Specify a username ARG.
Specify a password ARG.
.TP
\fB-x\fP, \fB--extensions ARG\fB
-Pass ARG as bundled options to GNU diff.
+Pass ARG as bundled options to external diff command, that is specified by
+--diff-cmd option.
.TP
\fB--targets\fP
Supply a file used as entry and URL args for a given command. You can also
@@ -168,7 +169,7 @@ the repository, and deleted from your wo
\fBexample:\fP svn delete foo.c bar.h
.TP
-\fBdiff\fP [\fItarget...\fP] [\fI--username name\fR] [\fI--password pass\fR] [\fI--no-auth-cache\fR] [\fI--no-diff-deleted\fR] [\fI-rxN\fR]\fI
+\fBdiff\fP [\fItarget...\fP] [\fI--username name\fR] [\fI--password pass\fR] [\fI--no-auth-cache\fR] [\fI--diff-cmd arg] [\fI--no-diff-deleted\fR] [\fI-rxN\fR]\fI
(Alias: di)
Display file changes as contextual diffs. The target can be a
directory, in which it operates recursively. The target can be an URL,
@@ -183,6 +184,8 @@ repository revision.
-N/--non-recursive with a directory target will prevent recursive
descent into subdirectories.
+--diff-cmd will use ARG as diff command instead of subversion internal one.
+
--no-diff-deleted will not print differences for deleted files.
\fBexample:\fP svn diff README
Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c (revision 7032)
+++ subversion/clients/cmdline/main.c (working copy)
@@ -85,7 +85,7 @@ const apr_getopt_option_t svn_cl__option
{"show-updates", 'u', 0, "display update information"},
{"username", svn_cl__auth_username_opt, 1, "specify a username ARG"},
{"password", svn_cl__auth_password_opt, 1, "specify a password ARG"},
- {"extensions", 'x', 1, "pass ARG as bundled options to GNU diff"},
+ {"extensions", 'x', 1, "pass ARG as bundled options to diff command"},
{"targets", svn_cl__targets_opt, 1,
"pass contents of file ARG as additional args"},
{"xml", svn_cl__xml_opt, 0, "output in xml"},
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 10 18:06:05 2003