<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>svn patch</title>
<link rel="stylesheet" type="text/css" href="styles.css" />
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1" />
<style type="text/css">
body { background-image: url('images/draft.png');
background-repeat: no-repeat;
background-position: top left;
/* The following properties make the watermark "fixed" on the page. */
/* I think that's just a bit too distracting for the reader... */
/* background-attachment: fixed; */
/* background-position: center center; */
}</style>
<link rel="home" href="index.html" title="Version Control with Subversion [DRAFT]" />
<link rel="up" href="svn.ref.svn.html" title="svn Reference—Subversion Command-Line Client" />
<link rel="prev" href="svn.ref.svn.c.move.html" title="svn move (mv)" />
<link rel="next" href="svn.ref.svn.c.propdel.html" title="svn propdel (pdel, pd)" />
</head>
<body>
<div xmlns="" id="vcws-version-notice">
<p>This text is a work in progress—highly subject to
change—and may not accurately describe any released
version of the Apache™ Subversion® software.
Bookmarking or otherwise referring others to this page is
probably not such a smart idea. Please visit
<a href="http://www.svnbook.com/">http://www.svnbook.com/</a>
for stable versions of this book.</p>
</div>
<div class="navheader">
<table width="100%" summary="Navigation header">
<tr>
<th colspan="3" align="center">svn patch</th>
</tr>
<tr>
<td width="20%" align="left"><a accesskey="p" href="svn.ref.svn.c.move.html">Prev</a> </td>
<th width="60%" align="center">svn Reference—Subversion Command-Line Client</th>
<td width="20%" align="right"> <a accesskey="n" href="svn.ref.svn.c.propdel.html">Next</a></td>
</tr>
</table>
<hr />
</div>
<div class="refentry" title="svn patch">
<a id="svn.ref.svn.c.patch"></a>
<div class="titlepage"></div>
<a id="idp20775600" class="indexterm"></a>
<div class="refnamediv">
<h2>Name</h2>
<p>svn patch — Apply changes represented in a unidiff patch to
the working copy.</p>
</div>
<div class="refsynopsisdiv" title="Synopsis">
<h2>Synopsis</h2>
<p>
<code class="literal">svn patch PATCHFILE [WCPATH]</code>
</p>
</div>
<div class="refsect1" title="Description">
<a id="idp20780304"></a>
<h2>Description</h2>
<p>This subcommand will apply changes described a
unidiff-formatted patch
file <em class="replaceable"><code>PATCHFILE</code></em> to the working
copy <em class="replaceable"><code>WCPATH</code></em>. As with most
other working copy subcommands,
if <em class="replaceable"><code>WCPATH</code></em> is omitted, the
changes are applied to the current working directory. A
unidiff patch suitable for application to a working copy
can be produced with the <span class="command"><strong>svn diff</strong></span>
command or third-party differencing tools. Any
non-unidiff content found in the patch file is
ignored.</p>
<p>Changes listed in the patch file will either be
applied or rejected. If a change does not match at its
exact line offset, it may be applied earlier or later in
the file if a match is found elsewhere for the surrounding
lines of context provided by the patch. A change may also
be applied with <em class="firstterm">fuzz</em>—meaning,
one or more lines of context are ignored when attempting
to match the change location. If no matching context can
be found for a change, the change conflicts and will be
written to a reject file which bears the extension
<code class="filename">.svnpatch.rej</code>.</p>
<p><span class="command"><strong>svn patch</strong></span> reports a status line for
patched file or directory using letter codes, very similar
to the way that <span class="command"><strong>svn update</strong></span> provides
notification. The letter codes have the following
meanings:</p>
<div class="variablelist">
<dl>
<dt>
<span class="term">
<code class="literal">A</code>
</span>
</dt>
<dd>
<p>Added</p>
</dd>
<dt>
<span class="term">
<code class="literal">D</code>
</span>
</dt>
<dd>
<p>Deleted</p>
</dd>
<dt>
<span class="term">
<code class="literal">C</code>
</span>
</dt>
<dd>
<p>Conflicted</p>
</dd>
<dt>
<span class="term">
<code class="literal">G</code>
</span>
</dt>
<dd>
<p>Merged</p>
</dd>
<dt>
<span class="term">
<code class="literal">U</code>
</span>
</dt>
<dd>
<p>Updated</p>
</dd>
</dl>
</div>
<p>Changes applied with an offset or fuzz are reported on
lines starting with the '<code class="literal">></code>'
symbol. You should review such changes carefully.</p>
<p>If the patch removes all content from a file, that
file is automatically scheduled for deletion. Likewise,
if the patch creates a new file, that file is
automatically scheduled for addition. Use <span class="command"><strong>svn
revert</strong></span> to undo undesired deletions and
additions.</p>
</div>
<div class="refsect1" title="Options">
<a id="idp20801216"></a>
<h2>Options</h2>
<div class="informalexample">
<pre class="screen">
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.dry_run"><code class="option">--dry-run</code></a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.ignore_whitespace"><code class="option">--ignore-whitespace</code></a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.quiet"><code class="option">--quiet</code> (<code class="option">-q</code>)</a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.reverse_diff"><code class="option">--reverse-diff</code></a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.strip"><code class="option">--strip</code> <em class="replaceable"><code>NUM</code></em></a>
</pre>
</div>
</div>
<div class="refsect1" title="Examples">
<a id="idp20807008"></a>
<h2>Examples</h2>
<p>Apply a simple patch file generated by
the <span class="command"><strong>svn diff</strong></span> command. Our patch file
will create a new file, delete another file, and modify a
third's contents and properties. Here's the patch file
itself (which we'll assume is creatively named
<code class="filename">PATCH</code>):</p>
<div class="informalexample">
<pre class="programlisting">
Index: deleted-file
===================================================================
--- deleted-file (revision 3)
+++ deleted-file (working copy)
@@ -1 +0,0 @@
-This file will be deleted.
Index: changed-file
===================================================================
--- changed-file (revision 4)
+++ changed-file (working copy)
@@ -1,6 +1,6 @@
The letters in a line of text
Could make your day much better.
But expanded into paragraphs,
-I'd tell of kangaroos and calves
+I'd tell of monkeys and giraffes
Until you were all smiles and laughs
From my letter made of letters.
Property changes on: changed-file
___________________________________________________________________
Added: propname
## -0,0 +1 ##
+propvalue
Index: added-file
===================================================================
--- added-file (revision 0)
+++ added-file (working copy)
@@ -0,0 +1 @@
+This is an added file.
</pre>
</div>
<p>We can apply the previous patch file to another
working copy from our repository using <span class="command"><strong>svn
patch</strong></span>, and verify that it did the right thing by
using <span class="command"><strong>svn diff</strong></span>:</p>
<div class="informalexample">
<pre class="screen">
$ cd /some/other/workingcopy
$ svn patch /path/to/PATCH
D deleted-file
UU changed-file
A added-file
$ svn diff
Index: deleted-file
===================================================================
--- deleted-file (revision 3)
+++ deleted-file (working copy)
@@ -1 +0,0 @@
-This file will be deleted.
Index: changed-file
===================================================================
--- changed-file (revision 4)
+++ changed-file (working copy)
@@ -1,6 +1,6 @@
The letters in a line of text
Could make your day much better.
But expanded into paragraphs,
-I'd tell of kangaroos and calves
+I'd tell of monkeys and giraffes
Until you were all smiles and laughs
From my letter made of letters.
Property changes on: changed-file
___________________________________________________________________
Added: propname
## -0,0 +1 ##
+propvalue
Index: added-file
===================================================================
--- added-file (revision 0)
+++ added-file (working copy)
@@ -0,0 +1 @@
+This is an added file.
$
</pre>
</div>
<p>Sometimes you might need Subversion to interpret a
patch <span class="quote">“<span class="quote">in reverse</span>”</span>—where added things
get treated as removed things, and vice-versa. Use
the <code class="option">--reverse-diff</code> option for this
purpose. In the following example, we'll squirrel away
a patch file which describes the changes in our working
copy, and then use a reverse patch operation to undo those
changes.</p>
<div class="informalexample">
<pre class="screen">
$ svn status
M foo.c
$ svn diff > PATCH
$ cat PATCH
Index: foo.c
===================================================================
--- foo.c (revision 128)
+++ foo.c (working copy)
@@ -1003,7 +1003,7 @@
return ERROR_ON_THE_G_STRING;
/* Do something in a loop. */
- for (i = 0; i < txns->nelts; i++)
+ for (i = 0; i < txns->nelts; i--)
{
status = do_something(i);
if (status)
$ svn patch --reverse-diff PATCH
U foo.c
$ svn status
$
</pre>
</div>
</div>
</div>
<div class="navfooter">
<hr />
<table width="100%" summary="Navigation footer">
<tr>
<td width="40%" align="left"><a accesskey="p" href="svn.ref.svn.c.move.html">Prev</a> </td>
<td width="20%" align="center">
<a accesskey="u" href="svn.ref.svn.html">Up</a>
</td>
<td width="40%" align="right"> <a accesskey="n" href="svn.ref.svn.c.propdel.html">Next</a></td>
</tr>
<tr>
<td width="40%" align="left" valign="top">svn move (mv) </td>
<td width="20%" align="center">
<a accesskey="h" href="index.html">Home</a>
</td>
<td width="40%" align="right" valign="top"> svn propdel (pdel, pd)</td>
</tr>
</table>
</div>
<div xmlns="" id="vcws-footer">
<hr />
<img src="images/cc-by.png" style="float: right;" />
<p>You are reading <em>Version Control with Subversion</em> (for
Subversion 1.8), by Ben Collins-Sussman, Brian W. Fitzpatrick,
and C. Michael Pilato.</p>
<p>This work is licensed under
the <a href="http://creativecommons.org/licenses/by/2.0/">Creative Commons Attribution License v2.0</a>.</p>
<p>To submit comments, corrections, or other contributions to the
text, please visit <a href="http://www.svnbook.com/">http://www.svnbook.com/</a>.</p>
</div>
</body>
</html>
distrib
>
Mageia
>
6
>
x86_64
>
media
>
core-updates
>
by-pkgid
>
e8fe8188cee5592550f08a19b470186d
>
files
>
125
