[Python-checkins] CVS: python/nondist/sf-html sf-faq.html,1.6,1.7
Peter Schneider-Kamp
python-dev@python.org
Thu, 20 Jul 2000 08:15:07 -0700
Update of /cvsroot/python/python/nondist/sf-html
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23113
Modified Files:
sf-faq.html
Log Message:
added entry about reverting of changes
Index: sf-faq.html
===================================================================
RCS file: /cvsroot/python/python/nondist/sf-html/sf-faq.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** sf-faq.html 2000/07/19 09:46:13 1.6
--- sf-faq.html 2000/07/20 15:15:04 1.7
***************
*** 33,36 ****
--- 33,37 ----
<li><a href="#c4">Where can I learn more about CVS?</a></li>
<li><a href="#c5">How can I remove a directory from the CVS tree?</a></li>
+ <li><a href="#c6">How to revert changes?</a></li>
</ol>
***************
*** 304,307 ****
--- 305,324 ----
<tt>cd ..</tt><br />
<tt>cvs update -P</tt></blockquote>
+
+ <h3><a name="c6" id="c6"></a>2.6.:</h3>
+
+ <h4>Q: How to revert changes?</h4>
+
+ <h4>A:</h4>
+ The fast (and history-friendly) method for backing out a CVS commit is the use
+ of the <tt>join</tt> flag of the <tt>update</tt> command. You supply the last
+ version you committed (and probably messed up) with the first and the version
+ you want to back out to with the second flag. Example given:
+
+ <blockquote>
+ <tt>cvs update -j 1.17 -j 1.16 ceval.c</tt> <tt>cvs update</tt> <tt>cvs
+ commit ceval.c</tt></blockquote>
+ This example would create and apply a reverse patch from revision 1.17 to
+ revision 1.16 of <tt>ceval.c</tt>.
<h1><a name="patches" id="patches"></a>3. Patches</h1>