svn commit: r1239561 - /subversion/trunk/subversion/svn/main.c

[st...@apache.org]

Author: stsp
Date: Thu Feb  2 11:54:08 2012
New Revision: 1239561

URL: http://svn.apache.org/viewvc?rev=1239561&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__options): Rename the new svn diff --patch option to
    --patch-compatible. Update the help text to make the meaning
    of this option a bit clearer.

Modified:
    subversion/trunk/subversion/svn/main.c

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1239561&r1=1239560&r2=1239561&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Thu Feb  2 11:54:08 2012
@@ -347,12 +347,13 @@ const apr_getopt_option_t svn_cl__option
                        N_("override diff-cmd specified in config file")},
   {"git", opt_use_git_diff_format, 0,
                        N_("use git's extended diff format")},
-  {"patch", opt_use_patch_diff_format, 0,
-                       N_("generate diff suitable for GNU patch;\n"
+  {"patch-compatible", opt_use_patch_diff_format, 0,
+                       N_("generate diff suitable for generic third-party\n"
                        "                             "
-                       "implies show-copies-as-adds and ignores property\n"
+                       "patch tools; implies --show-copies-as-adds and\n"
                        "                             "
-                       "differences")},
+                       "--no-diff-properties\n"
+                       )},
   {"allow-mixed-revisions", opt_allow_mixed_revisions, 0,
                        N_("Allow merge into mixed-revision working copy.\n"
                        "                             "