[svnbook] r3775 committed - Fix issue 93 by noting that the target of a particular merge was the...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Sep 7 10:58:28 CDT 2010
Revision: 3775
Author: cmpilato at gmail.com
Date: Tue Sep 7 08:57:49 2010
Log: Fix issue 93 by noting that the target of a particular merge was the
trunk, not a branch.
Reported by: dan.franklin{_AT_}pearson.com
http://code.google.com/p/svnbook/source/detail?r=3775
Modified:
/trunk/src/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml Thu Feb 18 10:12:26
2010
+++ /trunk/src/en/book/ch04-branching-and-merging.xml Tue Sep 7 08:57:49
2010
@@ -2058,7 +2058,7 @@
new <filename>whole.c</filename> file—which is a
duplicate of the <emphasis>older</emphasis> version
of <filename>integer.c</filename>. The net effect is that
- merging your <quote>rename</quote> to the branch has removed
+ merging your <quote>rename</quote> to the trunk has removed
Sally's recent changes from the latest revision!</para>
<para>This isn't true data loss. Sally's changes are still in
More information about the svnbook-dev
mailing list