[svnbook] r4187 committed - Fix issue #152 ("Prefer 'svn patch' over 'patch' in book recommendatio...
svnbook at googlecode.com
svnbook at googlecode.com
Wed Nov 9 14:21:54 CST 2011
Author: cmpilato at gmail.com
Date: Wed Nov 9 12:21:35 2011
Log: Fix issue #152 ("Prefer 'svn patch' over 'patch' in book
Note 'svn patch' in places where 'patch' is also mentioned, and use
'svn patch' instead of 'patch' in examples.
--- /trunk/en/book/ch02-basic-usage.xml Tue Nov 8 08:54:48 2011
+++ /trunk/en/book/ch02-basic-usage.xml Wed Nov 9 12:21:35 2011
@@ -1114,15 +1114,16 @@
files in which every line was added; files scheduled for
deletion are displayed as if every line was removed from
those files. The output from <command>svn diff</command> is
- compatible with the <command>patch</command> program.
- The <command>patch</command> program reads and
- applies <firstterm>patch files</firstterm>
- (or <quote>patches</quote>), which are files that describe
- differences made to one or more files. Because of this, you
- can share the changes you've made in your working copy with
- someone else without first committing those changes by
- creating a patch file from the redirected output
- of <command>svn diff</command>:</para>
+ somehwat compatible with the <command>patch</command>
+ program—more so with the <command>svn patch</command>
+ subcommand introduced in Subversion 1.7. Patch processing
+ commands such as these read and apply <firstterm>patch
+ files</firstterm> (or <quote>patches</quote>), which are
+ files that describe differences made to one or more files.
+ Because of this, you can share the changes you've made in
+ your working copy with someone else without first committing
+ those changes by creating a patch file from the redirected
+ output of <command>svn diff</command>:</para>
--- /trunk/en/book/ch04-branching-and-merging.xml Wed Nov 9 12:07:47 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Wed Nov 9 12:21:35 2011
@@ -767,21 +767,16 @@
<para>A question may be on your mind, especially if you're a
Unix user: why bother to use <command>svn merge</command> at
- all? Why not simply use the operating system's
- <command>patch</command> command to accomplish the same job?
- For example:</para>
+ all? Why not simply use <command>svn patch</command> or the
+ operating system's <command>patch</command> command to
+ accomplish the same job? For example:</para>
$ cd my-calc-branch
-$ svn diff -r 341:HEAD ^/calc/trunk > patchfile
-$ patch -p0 < patchfile
-Patching file integer.c using Plan A...
-Hunk #1 succeeded at 147.
-Hunk #2 succeeded at 164.
-Hunk #3 succeeded at 241.
-Hunk #4 succeeded at 249.
+$ svn diff -r 341:HEAD ^/calc/trunk > my-patch-file
+$ svn patch my-patch-file
More information about the svnbook-dev