[svnbook] r3697 committed - * src/en/book/ch02-basic-usage.xml...

[svnbook at googlecode.com]

Revision: 3697
Author: stsp at elego.de
Date: Wed Feb 17 02:30:38 2010
Log: * src/en/book/ch02-basic-usage.xml
   (svn.tour.treeconflicts): Mention that "svn info" prints the left and
    right URLs of a tree conflict victim.

http://code.google.com/p/svnbook/source/detail?r=3697

Modified:
  /trunk/src/en/book/ch02-basic-usage.xml

=======================================
--- /trunk/src/en/book/ch02-basic-usage.xml	Sat Feb  6 21:57:56 2010
+++ /trunk/src/en/book/ch02-basic-usage.xml	Wed Feb 17 02:30:38 2010
@@ -2507,6 +2507,21 @@
          </para>
        </warning>

+      <para><command>svn info</command> shows the URLs of the items
+        involved in the conflict. The <emphasis>left</emphasis>
+        URL shows the source of the local side of the conflict,
+        while the <emphasis>right</emphasis> URL shows the source
+        of the incoming side of the conflict. These URLs indicate
+        where you should start searching the repository's history
+        for the change which conflicts with your local change.
+      </para>
+
+      <screen>
+$ svn info code/bar.c | tail -n 4
+Tree conflict: local edit, incoming delete upon update
+  Source  left: (file) ^/trunk/code/bar.c at 4
+  Source right: (none) ^/trunk/code/bar.c at 5
+</screen>

        <para><filename>bar.c</filename> is now said to be the
          <firstterm>victim</firstterm> of a tree conflict.