svn commit: r1925679 - /subversion/branches/xpatch/subversion/svn/svn.c

Author: rinrab
Date: Sun May 18 17:30:39 2025
New Revision: 1925679

URL: http://svn.apache.org/viewvc?rev=1925679&view=rev
Log:
On the 'xpatch' branch: Describe xpatch in `svn patch --help` as suggested
by hartmannathan in an old thread.

Suggested by: hartmannathan

Modified:
    subversion/branches/xpatch/subversion/svn/svn.c

Modified: subversion/branches/xpatch/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/xpatch/subversion/svn/svn.c?rev=1925679&r1=1925678&r2=1925679&view=diff
==============================================================================
--- subversion/branches/xpatch/subversion/svn/svn.c (original)
+++ subversion/branches/xpatch/subversion/svn/svn.c Sun May 18 17:30:39 2025
@@ -1427,14 +1427,22 @@ svn_cl__cmd_table_main[] =
      "Apply a patch to a working copy.\n"
      "usage: patch PATCHFILE [WCPATH[@]]\n"
      "\n"), N_(
-     "  Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n"
+     "  Apply a patch in PATCHFILE to the working copy WCPATH.\n"
      "  If WCPATH is omitted, '.' is assumed.\n"
      "\n"), N_(
+     "  The patch may be a unidiff, git extended unidiff, or xpatch file. Its\n"
+     "  type is detected automatically.\n"
+     "\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, except for Subversion\n"
      "  property diffs as produced by 'svn diff'.\n"
      "\n"), N_(
+     "  An xpatch file can be produced with the 'svn diff --xpatch' command.\n"
+     "  This patch format is specific to Subversion and can represent all\n"
+     "  types of working copy changes. It is applied with three-way merging\n"
+     "  and conflict resolution.\n"
+     "\n"), N_(
      "  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"