subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1297256 - /subversion/site/publish/faq.html
Date Mon, 05 Mar 2012 22:27:34 GMT
Author: stsp
Date: Mon Mar  5 22:27:33 2012
New Revision: 1297256

URL: http://svn.apache.org/viewvc?rev=1297256&view=rev
Log:
* site/publish/faq.html
  (hidden-log): Use a more practical mixed-revision example. The new HEAD
   revision is often not BASE+1. So use r7 and r20 instead of r7 and r8.
   Also link to the mixed-revision section in the svnbook.

Modified:
    subversion/site/publish/faq.html

Modified: subversion/site/publish/faq.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1297256&r1=1297255&r2=1297256&view=diff
==============================================================================
--- subversion/site/publish/faq.html (original)
+++ subversion/site/publish/faq.html Mon Mar  5 22:27:33 2012
@@ -3477,28 +3477,32 @@ on all platforms, but works on Linux.
 
 <p>Assume you run '<tt>svn&nbsp;checkout</tt>' on a repository and
 receive a working copy at revision 7 (aka, r7) with one file in it
-called <tt>foo.c</tt>.  You modify the file and commit it
-successfully.  Two things happen:</p>
+called <tt>foo.c</tt>.  You spend some time modifying the file and
+then commit it successfully.  Two things happen:</p>
 
 <ul>
-<li>The repository moves to r8 on the server.</li>
-<li>In your working copy, only the file <tt>foo.c</tt> moves to r8.
+<li>The repository moves to a new HEAD revision on the server.
+The number of the new HEAD revision depends on how many other commits
+were made since your working copy was checked out. For example, the
+new HEAD revision might be r20.</li>
+<li>In your working copy, only the file <tt>foo.c</tt> moves to r20.
     The rest of your working copy remains at r7.</li>
 </ul>
 
-<p>You now have what is known as a <i>mixed revision working copy</i>.
-One file is at r8, but all other files remain at r7 until they too are
+<p>You now have what is known as a
+<i><a href="http://svnbook.red-bean.com/nightly/en/svn.basic.in-action.html#svn.basic.in-action.mixedrevs.update-commit">mixed
revision working copy</a></i>.
+One file is at r20, but all other files remain at r7 until they too are
 committed, or until '<tt>svn&nbsp;update</tt>' is run.</p>
 
 <pre>   $ svn -v status
-   7        7 nesscg       .
-   8        8 nesscg       foo.c
+    7         7 nesscg       .
+   20        20 nesscg       foo.c
    $</pre>
 
 <p>If you run the '<tt>svn&nbsp;log</tt>' command without any
 arguments, it prints the log information for the current directory
 (named '<tt>.</tt>' in the above listing).  Since the directory itself
-is still at r7, you do not see the log information for r8.</p>
+is still at r7, you do not see the log information for r20.</p>
 
 <p>To see the latest logs, do one of the following:</p>
 
@@ -3507,7 +3511,7 @@ is still at r7, you do not see the log i
 <li>Run '<tt>svn&nbsp;log&nbsp;URL</tt>', where URL is the repository
URL.</li>
 <li>Ask for just that file's log information, by running
     '<tt>svn&nbsp;log&nbsp;foo.c</tt>'.</li>
-<li>Update your working copy so it's all at r8, then run
+<li>Update your working copy so it's all at r20, then run
     '<tt>svn&nbsp;log</tt>'.</li>
 </ol>
 



Mime
View raw message