[svnbook] r4449 committed - More chapter 4 review and update for 1.8....
svnbook at googlecode.com
svnbook at googlecode.com
Thu Feb 21 16:37:08 CST 2013
Date: Thu Feb 21 14:36:54 2013
Log: More chapter 4 review and update for 1.8.
(svn.branchmerge.basicmerging.undo): Update to use forthcoming
ch 4 sample repository.
--- /trunk/en/book/ch04-branching-and-merging.xml Thu Feb 21 14:05:12 2013
+++ /trunk/en/book/ch04-branching-and-merging.xml Thu Feb 21 14:36:54 2013
@@ -1652,38 +1652,46 @@
is to roll back a change that has already been committed.
Suppose you're working away happily on a working copy of
<filename>/calc/trunk</filename>, and you discover that the
- change made way back in revision 303, which changed
- <filename>integer.c</filename>, is completely wrong. It never
+ change made back in revision 392, which changed
+ several code files, is completely wrong. It never
should have been committed. You can use <command>svn
merge</command> to <quote>undo</quote> the change in your
working copy, and then commit the local modification to the
repository. All you need to do is to specify a
<emphasis>reverse</emphasis> difference. (You can do this by
- specifying <option>--revision 303:302</option>, or by an
- equivalent <option>--change -303</option>.)</para>
+ specifying <option>--revision 392:391</option>, or by an
+ equivalent <option>--change -392</option>.)</para>
-$ svn merge -c -303 ^/calc/trunk
---- Reverse-merging r303 into 'integer.c':
---- Recording mergeinfo for reverse merge of r303 into 'integer.c':
- U A-branch
+$ svn merge ^/calc/trunk . -c-392
+--- Reverse-merging r392 into '.':
+--- Recording mergeinfo for reverse merge of r392 into '.':
+ U .
-$ svn status
- M .
+$ svn st
$ svn diff
# verify that the change is removed
-$ svn commit -m "Undoing change committed in r303."
-Transmitting file data .
-Committed revision 350.
+$ svn commit -m "Undoing erroneous change committed in r392."
+Transmitting file data ....
+Committed revision 399.
@@ -1693,7 +1701,7 @@
merge</command> to apply a changeset, or a whole range of
changesets, to your working copy. In our case of undoing a
change, we're asking <command>svn merge</command> to apply
- changeset r303 to our working copy
+ changeset r392 to our working copy
<para>Keep in mind that rolling back a change like this is just
@@ -1706,10 +1714,10 @@
in the <literal>HEAD</literal> revision.</para>
<para>Again, you may be thinking: well, that really didn't undo
- the commit, did it? The change still exists in revision 303.
+ the commit, did it? The change still exists in revision 392.
If somebody checks out a version of the
- <filename>calc</filename> project between revisions 303 and
- 349, she'll still see the bad change, right?</para>
+ <filename>calc</filename> project between revisions 392 and
+ 398, she'll still see the bad change, right?</para>
<para>Yes, that's true. When we talk about
<quote>removing</quote> a change, we're really talking about
More information about the svnbook-dev