[svnbook] r4178 committed - * en/book/ch04-branching-and-merging.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Tue Nov 8 11:27:51 CST 2011
Revision: 4178
Author: ptburba at gmail.com
Date: Tue Nov 8 09:26:55 2011
Log: * en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.logblame): Minor wording tweaks and
correct the sampel 'svn log -q output', it should not show
line count.
http://code.google.com/p/svnbook/source/detail?r=4178
Modified:
/trunk/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 8 08:54:48 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml Tue Nov 8 09:26:55 2011
@@ -2430,7 +2430,7 @@
<para>One of the main features of any version control system is
to keep track of who changed what, and when they did it.
The <command>svn log</command> and <command>svn
- blame</command> commands are just the tools for this: when
+ blame</command> subcommands are just the tools for this: when
invoked on individual files, they show not only the history of
changesets that affected the file, but also exactly which user
wrote which line of code, and when she did it.</para>
@@ -2446,29 +2446,29 @@
$ cd my-calc-branch
$ svn log -q
------------------------------------------------------------------------
-r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
+r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002)
------------------------------------------------------------------------
-r388 | user | 2002-11-21 05:20:00 -0600 (Thu, 21 Nov 2002) | 2 lines
+r388 | user | 2002-11-21 05:20:00 -0600 (Thu, 21 Nov 2002)
------------------------------------------------------------------------
-r381 | user | 2002-11-20 15:07:06 -0600 (Wed, 20 Nov 2002) | 2 lines
+r381 | user | 2002-11-20 15:07:06 -0600 (Wed, 20 Nov 2002)
------------------------------------------------------------------------
-r359 | user | 2002-11-19 19:19:20 -0600 (Tue, 19 Nov 2002) | 2 lines
+r359 | user | 2002-11-19 19:19:20 -0600 (Tue, 19 Nov 2002)
------------------------------------------------------------------------
-r357 | user | 2002-11-15 14:29:52 -0600 (Fri, 15 Nov 2002) | 2 lines
+r357 | user | 2002-11-15 14:29:52 -0600 (Fri, 15 Nov 2002)
------------------------------------------------------------------------
-r343 | user | 2002-11-07 13:50:10 -0600 (Thu, 07 Nov 2002) | 2 lines
+r343 | user | 2002-11-07 13:50:10 -0600 (Thu, 07 Nov 2002)
------------------------------------------------------------------------
-r341 | user | 2002-11-03 07:17:16 -0600 (Sun, 03 Nov 2002) | 2 lines
+r341 | user | 2002-11-03 07:17:16 -0600 (Sun, 03 Nov 2002)
------------------------------------------------------------------------
-r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines
+r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002)
------------------------------------------------------------------------
-r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
+r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002)
------------------------------------------------------------------------
</screen>
</informalexample>
<para>But is this really an accurate picture of all the changes
- that happened on the branch? What's being left out here is
+ that happened on the branch? What's left out here is
the fact that revisions 390, 381, and 357 were actually the
results of merging changes from the trunk. If you look at one
of these logs in detail, the multiple trunk changesets that
More information about the svnbook-dev
mailing list