svn commit: r1149386 - /subversion/site/publish/faq.html

[danielsh]

Author: danielsh
Date: Thu Jul 21 21:55:36 2011
New Revision: 1149386

URL: http://svn.apache.org/viewvc?rev=1149386&view=rev
Log:
* faq.html: Add the 'undo' wayita factoid, which has been invoked rather
    too frequently on IRC recently.

Modified:
    subversion/site/publish/faq.html

Modified: subversion/site/publish/faq.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1149386&r1=1149385&r2=1149386&view=diff
==============================================================================
--- subversion/site/publish/faq.html (original)
+++ subversion/site/publish/faq.html Thu Jul 21 21:55:36 2011
@@ -142,6 +142,8 @@ to FSFS or from FSFS to BDB?</a></li>
 </li>
 <li><a href="#vendor-branch">How can I maintain a modified version  (a
     "vendor branch") of third-party software using Subversion?</a></li>
+<li><a href="#undo">How do I make the contents of a previous
+  revision become HEAD again?</a></li>
 </ul>
 
 <h4>Troubleshooting:</h4>
@@ -2467,6 +2469,18 @@ identical files.</p>
 
 </div>
 
+<div class="h3" id="undo">
+<h3>How do I make the contents of a previous revision become HEAD again?
+  <a class="sectionlink" href="#undo"
+    title="Link to this section">&para;</a>
+</h3>
+
+<p>Use 'svn merge' or 'svn copy', as <a
+href="http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo";
+>described in the Subversion book</a>.</p>
+
+</div>
+
 </div>
 
 <div class="h2" id="troubleshooting">