Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0744E9F90 for ; Mon, 5 Mar 2012 22:27:58 +0000 (UTC) Received: (qmail 47563 invoked by uid 500); 5 Mar 2012 22:27:57 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 47543 invoked by uid 500); 5 Mar 2012 22:27:57 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 47535 invoked by uid 99); 5 Mar 2012 22:27:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2012 22:27:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2012 22:27:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 80D6D2388C2C; Mon, 5 Mar 2012 22:27:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1297256 - /subversion/site/publish/faq.html Date: Mon, 05 Mar 2012 22:27:34 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120305222734.80D6D2388C2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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.

Assume you run 'svn checkout' on a repository and receive a working copy at revision 7 (aka, r7) with one file in it -called foo.c. You modify the file and commit it -successfully. Two things happen:

+called foo.c. You spend some time modifying the file and +then commit it successfully. Two things happen:

The repository moves to r8 on the server.
In your working copy, only the file foo.c moves to r8. +
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.
In your working copy, only the file foo.c moves to r20. The rest of your working copy remains at r7.

You now have what is known as a mixed revision working copy. -One file is at r8, but all other files remain at r7 until they too are +

You now have what is known as a +mixed revision working copy. +One file is at r20, but all other files remain at r7 until they too are committed, or until 'svn update' is run.

   $ svn -v status
-   7        7 nesscg       .
-   8        8 nesscg       foo.c
+    7         7 nesscg       .
+   20        20 nesscg       foo.c
    $

If you run the 'svn log' command without any arguments, it prints the log information for the current directory (named '.' in the above listing). Since the directory itself -is still at r7, you do not see the log information for r8.

+is still at r7, you do not see the log information for r20.

To see the latest logs, do one of the following:

@@ -3507,7 +3511,7 @@ is still at r7, you do not see the log i

Run 'svn log URL', where URL is the repository URL.

Ask for just that file's log information, by running 'svn log foo.c'.

Update your working copy so it's all at r8, then run +

Update your working copy so it's all at r20, then run 'svn log'.