<?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>Summary</title><link rel="stylesheet" href="styles.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.73.2" /><link rel="start" href="index.html" title="Version Control with Subversion" /><link rel="up" href="svn.branchmerge.html" title="Chapter 4. Branching and Merging" /><link rel="prev" href="svn.advanced.vendorbr.html" title="Vendor branches" /><link rel="next" href="svn.reposadmin.html" title="Chapter 5. Repository Administration" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Summary</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="svn.advanced.vendorbr.html">Prev</a> </td><th width="60%" align="center">Chapter 4. Branching and Merging</th><td width="20%" align="right"> <a accesskey="n" href="svn.reposadmin.html">Next</a></td></tr></table><hr /></div><div class="sect1" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="svn.branchmerge.summary"></a>Summary</h2></div></div></div><p>We've covered a lot of ground in this chapter. We've
discussed the concepts of tags and branches, and demonstrated
how Subversion implements these concepts by copying directories
with the <span class="command"><strong>svn copy</strong></span> command. We've shown how
to use <span class="command"><strong>svn merge</strong></span> to copy changes from one
branch to another, or roll back bad changes. We've gone over
the use of <span class="command"><strong>svn switch</strong></span> to create
mixed-location working copies. And we've talked about how one
might manage the organization and lifetimes of branches in a
repository.</p><p>Remember the Subversion mantra: branches and tags are cheap.
So use them liberally!</p><p>As a helpful reminder of all the operations we've discussed,
here's a handy reference table you can consult as you begin to
make use of branches.</p><div class="table"><a id="svn.branchemerge.summary.tbl-1"></a><p class="title"><b>Table 4.1. Branching and Merging Commands</b></p><div class="table-contents"><table summary="Branching and Merging Commands" border="1"><colgroup><col /><col /></colgroup><thead><tr><th>Action</th><th>Command</th></tr></thead><tbody><tr><td>Create a branch or tag</td><td>svn copy URL1 URL2</td></tr><tr><td>Switch a working copy to a branch or tag</td><td>svn switch URL</td></tr><tr><td>Synchronize a branch with trunk</td><td>svn merge trunkURL; svn commit</td></tr><tr><td>See merge history or eligible changests</td><td>svn mergeinfo target [--from-source=URL]</td></tr><tr><td>Merge a branch back into trunk</td><td>svn merge --reintegrate branchURL; svn commit</td></tr><tr><td>Merge one specific change</td><td>svn merge -c REV URL; svn commit</td></tr><tr><td>Merge a range of changes</td><td>svn merge -r REV1:REV2 URL; svn commit</td></tr><tr><td>Block a change from automatic merging</td><td>svn propset svn:mergeinfo newvalue; svn commit</td></tr><tr><td>Preview a merge</td><td>svn merge URL --dry-run</td></tr><tr><td>Abandon merge results</td><td>svn revert -R .</td></tr><tr><td>Resurrect something from history</td><td>svn copy URL@REV local-path</td></tr><tr><td>Undo a committed change</td><td>svn merge -c -REV URL; svn commit</td></tr><tr><td>Examine merge-sensitive history</td><td>svn log -g; svn blame -g</td></tr><tr><td>Create a tag from a working copy</td><td>svn copy . tagURL</td></tr><tr><td>Rearrange a branch or tag</td><td>svn mv URL1 URL2</td></tr><tr><td>Remove a branch or tag</td><td>svn rm URL</td></tr></tbody></table></div></div><br class="table-break" /></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="svn.advanced.vendorbr.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="svn.branchmerge.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="svn.reposadmin.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Vendor branches </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 5. Repository Administration</td></tr></table></div></body></html>
