[svnbook] r3911 committed - Finish issue #42 ("ch02: Minor technical inconsistency in describing...
svnbook at googlecode.com
svnbook at googlecode.com
Fri Jul 15 11:12:39 CDT 2011
Revision: 3911
Author: cmpilato at gmail.com
Date: Fri Jul 15 09:11:59 2011
Log: Finish issue #42 ("ch02: Minor technical inconsistency in
describing
conflicted files").
* src/en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.pending): Rework the description of the
conflict file names to more accurately and generally describe their
functions.
http://code.google.com/p/svnbook/source/detail?r=3911
Modified:
/trunk/src/en/book/ch02-basic-usage.xml
=======================================
--- /trunk/src/en/book/ch02-basic-usage.xml Tue Jul 12 13:08:11 2011
+++ /trunk/src/en/book/ch02-basic-usage.xml Fri Jul 15 09:11:59 2011
@@ -1548,13 +1548,14 @@
<varlistentry>
<term><filename>filename.mine</filename></term>
<listitem>
- <para>This is your file as it existed in your working
- copy before you updated your working copy—that
- is, without conflict markers. This file has only
- your latest changes in it. (If Subversion considers
- the file to be unmergeable, the
- <filename>.mine</filename> file isn't created, since
- it would be identical to the working file.)</para>
+ <para>This is your file as it existed in your
+ working copy before you began the update process.
+ This version of the file contains your local
+ modifications as well as conflict markers. (If
+ Subversion considers the file to be unmergeable,
+ the <filename>.mine</filename> file isn't created,
+ since it would be identical to the working
+ file.)</para>
</listitem>
</varlistentry>
@@ -1562,11 +1563,13 @@
<term><filename>filename.r<replaceable>OLDREV</replaceable>
</filename></term>
<listitem>
- <para>This is the file that was the
- <literal>BASE</literal> revision before you updated
- your working copy. That is, the file that you
- checked out before you made your latest
- edits.</para>
+ <para>This is the file as it existed in the
+ <literal>BASE</literal> revision—that is,
+ the unmodified revision of the file in your
+ working copy <emphasis>before</emphasis> you began
+ the update process—where
+ <replaceable>OLDREV</replaceable> is that base
+ revision number.</para>
</listitem>
</varlistentry>
@@ -1575,19 +1578,16 @@
</filename></term>
<listitem>
<para>This is the file that your Subversion client
- just received from the server when you updated your
- working copy. This file corresponds to the
- <literal>HEAD</literal> revision of the
- repository.</para>
+ just received from the server via the update of
+ your working copy, where
+ <replaceable>NEWREV</replaceable> corresponds to
+ the revision number to which you were updating
+ (<literal>HEAD</literal>, unless otherwise
+ requested).</para>
</listitem>
</varlistentry>
</variablelist>
-
- <para>Here <replaceable>OLDREV</replaceable> is the revision
number
- of the file in your <filename>.svn</filename> directory,
- and <replaceable>NEWREV</replaceable> is the revision number
of
- the repository <literal>HEAD</literal>.</para>
</listitem>
</itemizedlist>
More information about the svnbook-dev
mailing list