[svnbook] r4454 committed - Add a dump of the sample repository used in the chapter 4 examples....

svnbook at googlecode.com svnbook at googlecode.com
Mon Mar 11 12:06:09 CDT 2013


Revision: 4454
Author:   ptburba
Date:     Mon Mar 11 10:04:42 2013
Log:      Add a dump of the sample repository used in the chapter 4  
examples.

* en/book/ch04-branching-and-merging.xml
   Adjust examples to reflect dates in the final sample repos.

* en/book/sample-repositories/ch04-sample-repos.dump
   Dump of the sample repos for ch4.

* en/book/sample-repositories/README
   Notes about the sample repos.

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

Added:
  /trunk/en/book/sample-repositories
  /trunk/en/book/sample-repositories/README
  /trunk/en/book/sample-repositories/ch04-sample-repos.dump
Modified:
  /trunk/en/book/ch04-branching-and-merging.xml

=======================================
--- /dev/null
+++ /trunk/en/book/sample-repositories/README	Mon Mar 11 10:04:42 2013
@@ -0,0 +1,10 @@
+This directory contains dumps of the sample repositories used in the book's
+examples.
+
+ch04-sample-repos.dump:
+
+While the logs, mergeinfo, path names, and merge history all agree with the
+chapter 4 "paint" and "calc" examples, the actual file contents are
+nonsensical -- the file contents are from
+https://svn.apache.org/repos/asf/subversion/trunk. So if future examples
+require an explicit diff, you'll need to "fake" it.
=======================================
--- /dev/null	
+++ /trunk/en/book/sample-repositories/ch04-sample-repos.dump	Mon Mar 11  
10:04:42 2013
File is too large to display a diff.
=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Tue Feb 26 15:23:29 2013
+++ /trunk/en/book/ch04-branching-and-merging.xml	Mon Mar 11 10:04:42 2013
@@ -335,36 +335,33 @@

  $ svn log -v src/integer.c
  ------------------------------------------------------------------------
-r343 | user | 2013-02-07 10:41:34 -0500 (Thu, 07 Feb 2013) | 1 line
+r343 | user | 2013-02-15 14:11:09 -0500 (Fri, 15 Feb 2013) | 1 line
  Changed paths:
     M /calc/branches/my-calc-branch/src/integer.c

  * integer.c:  frozzled the wazjub.
  ------------------------------------------------------------------------
-r341 | user | 2013-02-02 17:39:21 -0500 (Sat, 02 Feb 2013) | 1 line
+r341 | user | 2013-02-15 07:41:25 -0500 (Fri, 15 Feb 2013) | 1 line
  Changed paths:
     A /calc/branches/my-calc-branch (from /calc/trunk:340)

  Creating a private branch of /calc/trunk.
  ------------------------------------------------------------------------
-r154 | sally | 2013-02-01 12:57:55 -0500 (Fri, 01 Feb 2013) | 2 lines
+r154 | sally | 2013-01-30 04:20:03 -0500 (Wed, 30 Jan 2013) | 2 lines
  Changed paths:
     M /calc/trunk/src/integer.c

  * integer.c:  changed a docstring.
  ------------------------------------------------------------------------
-.
-.
-.
+…
  ------------------------------------------------------------------------
-r113 | sally | 2013-01-24 12:52:27 -0500 (Thu, 24 Jan 2013) | 2 lines
+r113 | sally | 2013-01-26 15:50:21 -0500 (Sat, 26 Jan 2013) | 2 lines
  Changed paths:
     M /calc/trunk/src/integer.c

  * integer.c: Revise the fooplus API.
-
  ------------------------------------------------------------------------
-r8 | sally | 2013-01-05 11:43:27 -0500 (Sat, 05 Jan 2013) | 1 line
+r8 | sally | 2013-01-17 16:55:36 -0500 (Thu, 17 Jan 2013) | 1 line
  Changed paths:
     A /calc/trunk/Makefile
     A /calc/trunk/README
@@ -395,13 +392,13 @@

  $ svn log -v src/integer.c
  ------------------------------------------------------------------------
-r344 | sally | 2013-02-08 10:45:20 -0500 (Fri, 08 Feb 2013) | 1 line
+r344 | sally | 2013-02-15 16:44:44 -0500 (Fri, 15 Feb 2013) | 1 line
  Changed paths:
     M /calc/trunk/src/integer.c

  Refactor the bazzle functions.
  ------------------------------------------------------------------------
-r154 | sally | 2013-02-01 12:57:55 -0500 (Fri, 01 Feb 2013) | 2 lines
+r154 | sally | 2013-01-30 04:20:03 -0500 (Wed, 30 Jan 2013) | 2 lines
  Changed paths:
     M /calc/trunk/src/integer.c

@@ -409,13 +406,13 @@
  ------------------------------------------------------------------------
  …
  ------------------------------------------------------------------------
-r113 | sally | 2013-01-24 12:52:27 -0500 (Thu, 24 Jan 2013) | 2 lines
+r113 | sally | 2013-01-26 15:50:21 -0500 (Sat, 26 Jan 2013) | 2 lines
  Changed paths:
     M /calc/trunk/src/integer.c

  * integer.c: Revise the fooplus API.
  ------------------------------------------------------------------------
-r8 | sally | 2013-01-05 11:43:27 -0500 (Sat, 05 Jan 2013) | 1 line
+r8 | sally | 2013-01-17 16:55:36 -0500 (Thu, 17 Jan 2013) | 1 line
  Changed paths:
     A /calc/trunk/Makefile
     A /calc/trunk/README
@@ -716,7 +713,7 @@
            <screen>
  $ svn log -v -r341
  ------------------------------------------------------------------------
-r341 | user | 2013-02-02 17:39:21 -0500 (Sat, 02 Feb 2013) | 1 line
+r341 | user | 2013-02-15 07:41:25 -0500 (Fri, 15 Feb 2013) | 1 line
  Changed paths:
     A /calc/branches/my-calc-branch (from /calc/trunk:340)

@@ -737,7 +734,7 @@
            <screen>
  $ svn log -q -rHEAD http://svn.example.com/repos/calc/trunk
  ------------------------------------------------------------------------
-r351 | sally | 2013-02-20 10:49:41 -0500 (Wed, 20 Feb 2013)
+r351 | sally | 2013-02-16 08:04:22 -0500 (Sat, 16 Feb 2013)
  ------------------------------------------------------------------------

  $ svn merge http://svn.example.com/repos/calc/trunk -r340:351
@@ -1794,13 +1791,13 @@

  $ svn log -v --limit 3
  ------------------------------------------------------------------------
-r401 | sally | 2013-02-22 10:07:10 -0500 (Fri, 22 Feb 2013) | 1 line
+r401 | sally | 2013-02-19 23:15:44 -0500 (Tue, 19 Feb 2013) | 1 line
  Changed paths:
     M /calc/trunk/src/main.c

  Follow-up to r400: Fix typos in help text.
  ------------------------------------------------------------------------
-r400 | bill | 2013-02-22 09:52:10 -0500 (Fri, 22 Feb 2013) | 4 lines
+r400 | bill | 2013-02-19 20:55:08 -0500 (Tue, 19 Feb 2013) | 4 lines
  Changed paths:
     M /calc/trunk/src/main.c
     D /calc/trunk/src/real.c
@@ -1810,7 +1807,7 @@
  * calc/trunk/src/real.c: Remove this file, none of the APIs
    implemented here are used anymore.
  ------------------------------------------------------------------------
-r399 | jrandom | 2013-02-21 17:19:32 -0500 (Thu, 21 Feb 2013) | 1 line
+r399 | sally | 2013-02-19 20:05:14 -0500 (Tue, 19 Feb 2013) | 1 line
  Changed paths:
     M /calc/trunk/src/button.c
     M /calc/trunk/src/integer.c
@@ -1969,7 +1966,7 @@
          <screen>
  $ svn log ^/calc/branches/new-calc-feature-branch -v -r403
  ------------------------------------------------------------------------
-r403 | user | 2013-02-22 11:30:40 -0500 (Fri, 22 Feb 2013) | 1 line
+r403 | user | 2013-02-20 03:26:12 -0500 (Wed, 20 Feb 2013) | 1 line
  Changed paths:
     A /calc/branches/new-calc-feature-branch (from /calc/trunk:402)

@@ -1991,7 +1988,7 @@
          <screen>
  $ svn log ^/calc/trunk -r413 -v
  ------------------------------------------------------------------------
-r413 | sally | 2013-02-22 14:07:21 -0500 (Fri, 22 Feb 2013) | 3 lines
+r413 | sally | 2013-02-21 01:57:51 -0500 (Thu, 21 Feb 2013) | 3 lines
  Changed paths:
     M /calc/trunk/src/main.c

@@ -2650,7 +2647,7 @@
          <screen>
  $ svn log -v -r465 ^/paint/trunk
  ------------------------------------------------------------------------
-r465 | joe | 2013-02-25 14:26:17 -0500 (Mon, 25 Feb 2013) | 1 line
+r465 | joe | 2013-02-25 14:05:12 -0500 (Mon, 25 Feb 2013) | 1 line
  Changed paths:
     M /paint/trunk
     A /paint/trunk/python (from  
/paint/branches/paint-python-wrapper/python:464)
@@ -2804,19 +2801,19 @@

  $ svn log -q
  ------------------------------------------------------------------------
-r461 | user | 2013-02-25 13:53:32 -0500 (Mon, 25 Feb 2013)
+r461 | user | 2013-02-25 05:57:48 -0500 (Mon, 25 Feb 2013)
  ------------------------------------------------------------------------
-r379 | user | 2013-02-20 18:36:52 -0500 (Wed, 20 Feb 2013)
+r379 | user | 2013-02-18 10:56:35 -0500 (Mon, 18 Feb 2013)
  ------------------------------------------------------------------------
-r378 | user | 2013-02-20 18:35:40 -0500 (Wed, 20 Feb 2013)
+r378 | user | 2013-02-18 09:48:28 -0500 (Mon, 18 Feb 2013)
  ------------------------------------------------------------------------
  …
  ------------------------------------------------------------------------
-r8 | sally | 2013-01-05 11:43:27 -0500 (Sat, 05 Jan 2013)
+r8 | sally | 2013-01-17 16:55:36 -0500 (Thu, 17 Jan 2013)
  ------------------------------------------------------------------------
-r7 | bill | 2013-01-04 11:32:20 -0500 (Fri, 04 Jan 2013)
+r7 | bill | 2013-01-17 16:49:36 -0500 (Thu, 17 Jan 2013)
  ------------------------------------------------------------------------
-r3 | bill | 2013-01-03 16:36:11 -0500 (Thu, 03 Jan 2013)
+r3 | bill | 2013-01-17 09:07:04 -0500 (Thu, 17 Jan 2013)
  ------------------------------------------------------------------------
  </screen>
        </informalexample>
@@ -2832,7 +2829,7 @@
          <screen>
  $ svn log ^/calc/branches/my-calc-branch -r352 -v
  ------------------------------------------------------------------------
-r352 | user | 2013-02-20 13:36:02 -0500 (Wed, 20 Feb 2013) | 1 line
+r352 | user | 2013-02-16 09:35:18 -0500 (Sat, 16 Feb 2013) | 1 line
  Changed paths:
     M /calc/branches/my-calc-branch
     M /calc/branches/my-calc-branch/Makefile
@@ -2856,7 +2853,7 @@
          <screen>
  $ svn log ^/calc/branches/my-calc-branch -r352 -v -g
  ------------------------------------------------------------------------
-r352 | user | 2013-02-20 13:36:02 -0500 (Wed, 20 Feb 2013) | 1 line
+r352 | user | 2013-02-16 09:35:18 -0500 (Sat, 16 Feb 2013) | 1 line
  Changed paths:
     M /calc/branches/my-calc-branch
     M /calc/branches/my-calc-branch/Makefile
@@ -2866,7 +2863,7 @@

  Sync latest trunk changes to my-calc-branch.
  ------------------------------------------------------------------------
-r351 | sally | 2013-02-20 10:49:41 -0500 (Wed, 20 Feb 2013) | 2 lines
+r351 | sally | 2013-02-16 08:04:22 -0500 (Sat, 16 Feb 2013) | 2 lines
  Changed paths:
     M /calc/trunk/src/real.c
  Merged via: r352
@@ -2875,7 +2872,7 @@
  ------------------------------------------------------------------------
  …
  ------------------------------------------------------------------------
-r345 | sally | 2013-02-20 10:48:58 -0500 (Wed, 20 Feb 2013) | 2 lines
+r345 | sally | 2013-02-15 16:51:17 -0500 (Fri, 15 Feb 2013) | 2 lines
  Changed paths:
     M /calc/trunk/Makefile
     M /calc/trunk/src/integer.c
@@ -2883,7 +2880,7 @@

  Trunk work on calc project.
  ------------------------------------------------------------------------
-r344 | sally | 2013-02-08 10:45:20 -0500 (Fri, 08 Feb 2013) | 1 line
+r344 | sally | 2013-02-15 16:44:44 -0500 (Fri, 15 Feb 2013) | 1 line
  Changed paths:
     M /calc/trunk/src/integer.c
  Merged via: r352
@@ -3101,7 +3098,7 @@
          <screen>
  $ svn log -v -r472 ^/calc/trunk
  ------------------------------------------------------------------------
-r472 | sally | 2013-02-26 12:59:54 -0500 (Tue, 26 Feb 2013) | 1 line
+r472 | sally | 2013-02-26 07:05:18 -0500 (Tue, 26 Feb 2013) | 1 line
  Changed paths:
     M /calc/trunk/src/integer.c





More information about the svnbook-dev mailing list