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

[st...@apache.org]

Author: stsp
Date: Fri Feb  5 19:13:51 2010
New Revision: 907060

URL: http://svn.apache.org/viewvc?rev=907060&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__cmd_table): Some more help text tweaks for svn patch.

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=907060&r1=907059&r2=907060&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri Feb  5 19:13:51 2010
@@ -781,6 +781,7 @@
      "\n"
      "  Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n"
      "  If WCPATH is omitted, '.' is assumed.\n"
+     "\n"
      "  A unidiff patch suitable for application to a working copy can be\n"
      "  produced with the 'svn diff' command or third-party diffing tools.\n"
      "  Any non-unidiff content of PATCHFILE is ignored.\n"
@@ -788,9 +789,9 @@
      "  Changes listed in the patch will either be applied or rejected.\n"
      "  If a change does not match at its exact line offset, it may be applied\n"
      "  earlier or later in the file if a match is found elsewhere for the\n"
-     "  surrounding lines of context provided in the unidiff.\n"
-     "  A change may also be applied with fuzz, which means that one or more\n"
-     "  lines of context are ignored when matching the change.\n"
+     "  surrounding lines of context provided by the patch.\n"
+     "  A change may also be applied with fuzz, which means that one\n"
+     "  or more lines of context are ignored when matching the change.\n"
      "  If no matching context can be found for a change, the change conflicts\n"
      "  and will be written to a reject file with the extension .svnpatch.rej.\n"
      "\n"
@@ -801,7 +802,7 @@
      "    D  Deleted\n"
      "    U  Updated\n"
      "    C  Conflict\n"
-     "    G  Merged\n"
+     "    G  Merged (with local uncommitted changes)\n"
      "\n"
      "  Changes applied with an offset or fuzz are reported on lines starting\n"
      "  with the '>' symbol. You should review such changes carefully.\n"