[svnbook commit] r3438 - trunk/src/en/book

[codesite-noreply at google.com]

Author: stsp at elego.de
Date: Sun Mar  1 14:07:43 2009
New Revision: 3438

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

Log:
* src/en/book/ch02-basic-usage.xml
   (svn.tour.treeconflicts.example): Feedback by cmpilato. Thanks!


Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml	(original)
+++ trunk/src/en/book/ch02-basic-usage.xml	Sun Mar  1 14:07:43 2009
@@ -2351,8 +2351,8 @@
      <sect2 id="svn.tour.treeconflicts.example">
        <title>An example Tree Conflict</title>

-      <para>Suppose a software project you are working currently
-       looks like this:</para>
+      <para>Suppose a software project you were working on currently
+       looked like this:</para>

        <screen>
  $ svn ls -Rv svn://svn.example.com/trunk/
@@ -2365,14 +2365,13 @@
        4 harry             124 Feb 06 14:34 code/foo.c
  </screen>

-      <para>Suppose your collaborator Harry has renamed the file
+      <para>Your collaborator Harry has renamed the file
          <filename>bar.c</filename> to <filename>baz.c</filename>.
          You are still working on <filename>bar.c</filename> in your
          working copy, but you don't know yet that the file has
          been renamed in the repository.</para>

-      <para>Suppose the log message to Harry's commit looks like
-        this:</para>
+      <para>The log message to Harry's commit looked like this:</para>

        <screen>
  $ svn log -r5 svn://svn.example.com/trunk
@@ -2386,7 +2385,7 @@
  Rename bar.c to baz.c, and adjust Makefile accordingly.
  </screen>

-      <para>Suppose the local changes you have made look like this:</para>
+      <para>The local changes you have made look like this:</para>

        <screen>
  $ svn diff
@@ -2406,7 +2405,7 @@
  --- code/bar.c  (revision 4)
  +++ code/bar.c  (working copy)
  @@ -1,4 +1,4 @@
- const char* bar(void)
+ const char *bar(void)
   {
  -       return "Me neither!\n";
  +       return "Well, I do like being moved around!\n";
@@ -2426,8 +2425,10 @@
  </screen>
  <!-- XXX: That error message should be cleaned up! -->

-      <para>It is now mandatory to run <command>svn update</command>.
-        This causes a tree conflict to be flagged:</para>
+      <para>At this point, you need to run <command>svn update</command>.
+        Besides bringing our working copy up to date so that you can
+        see Harry's changes, this also flags a tree conflict so you
+        have the opportunity to evaluate and properly resolve it.</para>

        <screen>
  $ svn update
@@ -2439,11 +2440,11 @@
    Tree conflicts: 1
  </screen>

-      <para>During <command>svn update</command>, tree conflicts are
-        signified by a capital C in the fourth output column. Details
-        about the conflict can be seen in the output of
-        <command>svn status</command>:</para>
-
+      <para>In its output, <command>svn update</command> signifies tree
+        conflicts using a capital C in the fourth output column.
+        <command>svn status</command> reveals additional details of the
+        conflict:</para>
+
        <screen>
  $ svn status
  M       code/foo.c
@@ -2485,7 +2486,7 @@
  --- code/baz.c  (revision 5)
  +++ code/baz.c  (working copy)
  @@ -1,4 +1,4 @@
- const char* bar(void)
+ const char *bar(void)
   {
  -       return "Me neither!\n";
  +       return "Well, I do like being moved around!\n";
@@ -2493,9 +2494,11 @@
  </screen>

        <warning>
-        <para>This only works if <filename>bar.c</filename> in your working
-          copy is based on the revision in which <filename>bar.c</filename>
-          was last modified before being moved in the repository.
+        <para>Local edits to the file <filename>bar.c</filename>, which is
+          renamed during an update to <filename>baz.c</filename>, will
+          only be applied to <filename>bar.c</filename> if your working
+          copy of <filename>bar.c</filename> is based on the revision in
+          which it was last modified before being moved in the repository.
            Otherwise, Subversion will resort to retreiving
            <filename>baz.c</filename> from the repository, and will not
            try to transfer your local modifications to it. You will have
@@ -2544,7 +2547,7 @@
  --- code/baz.c  (revision 5)
  +++ code/baz.c  (working copy)
  @@ -1,4 +1,4 @@
- const char* bar(void)
+ const char *bar(void)
   {
  -       return "Me neither!\n";
  +       return "Well, I do like being moved around!\n";
@@ -2587,7 +2590,7 @@
  --- code/bar.c	(revision 5)
  +++ code/bar.c	(working copy)
  @@ -1,4 +1,4 @@
- const char* bar(void)
+ const char *bar(void)
   {
  -	return "Me neither!\n";
  +	return "Well, I do like being moved around!\n";
@@ -2597,7 +2600,7 @@
  --- code/baz.c	(revision 5)
  +++ code/baz.c	(working copy)
  @@ -1,4 +0,0 @@
--const char* bar(void)
+-const char *bar(void)
  -{
  -	return "Me neither!\n";
  -}