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

[st...@apache.org]

Author: stsp
Date: Thu Feb  2 13:29:26 2012
New Revision: 1239609

URL: http://svn.apache.org/viewvc?rev=1239609&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__options): Explicitly state that --patch-compatible is currently
   the same as "--show-copies-as-adds --no-diff-properties."

Suggested by: julianfoad

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=1239609&r1=1239608&r2=1239609&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Thu Feb  2 13:29:26 2012
@@ -350,9 +350,9 @@ const apr_getopt_option_t svn_cl__option
   {"patch-compatible", opt_use_patch_diff_format, 0,
                        N_("generate diff suitable for generic third-party\n"
                        "                             "
-                       "patch tools; implies --show-copies-as-adds and\n"
+                       "patch tools; currently the same as\n"
                        "                             "
-                       "--no-diff-properties\n"
+                       "--show-copies-as-adds --no-diff-properties\n"
                        )},
   {"allow-mixed-revisions", opt_allow_mixed_revisions, 0,
                        N_("Allow merge into mixed-revision working copy.\n"