========= Foreword ========= Replace the second to last paragraph with this content: During the entire time they wrote this book, Ben, Mike, and Brian haunted the Subversion mailing lists and chat rooms incessantly, carefully noting the problems users were having in real-life situations. Monitoring such feedback is part of their job descriptions at CollabNet anyway, and it gave them a huge advantage when they set out to document Subversion. The book they produced is grounded firmly in the bedrock of experience, not in the shifting sands of wishful thinking; it combines the best aspects of user manual and FAQ sheet. This duality might not be noticeable on a first reading. Taken in order, front to back, the book is simply a straightforward description of a piece of software. There's the overview, the obligatory guided tour, the chapter on administrative configuration, some advanced topics, and of course a command reference and troubleshooting guide. Only when you come back to it later, seeking the solution to some specific problem, does its authenticity shine out: the telling details that can only result from encounters with the unexpected, the examples honed from genuine use cases, and most of all the sensitivity to the user's needs and the user's point of view. ======= Preface ======= Page xiii, para 3: "version 1.0.1" becomes "the 1.0 series" Page xiii, para 3: "We have made attempt to be thorough" -> "We have made every attempt to be thorough" Page xvi, Chapter 1: Add a sentence to the end of this description: "Also includes a quick-start guide." Page xv: Is it correct that tips and notes have the same icon? We took time to discern between the two. Page xvii, "This book is free section": "### Insert boilerplate.": O'Reilly needs to insert their boilerplate contact info. ========= Chapter 1 ========= Page 4, Figure 1.1: This figure is missing. You should get the latest figures from Jessamyn Reed. Page 6, append new section to the end of the chapter. ### See separate document for this section ========= Chapter 2 ========= Page 7, 3rd paragraph: "... information from others." becomes "... information from others. Figure 2-1 illustrates this." Page 8, 4th paragraph: "Consider the scenario:" becomes "Consider the scenario shown in Figure 2.2." Then capitalize "Suppose" Page 8, 5th paragraph: "Many version control systems use a lock-modify-unlock model to address this problem, which is a very simple solution." becomes "Many version control systems use a lock-modify-unlock model to address this problem." Page 8, 5th paragraph, at the end, add: "Figure 2-3 demonstrates this simple solution." Page 10, last paragraph, at the end, add: "Figure 2-4 and Figure 2-5 show this process." Page 12, caption of figure 2-5: "...the copy-modify-merge solution continued" becomes "The copy-modify-merge solution (continued)" Page 13, 3rd full paragraph: "For example, suppose you have a repository that contains two software projects. In other words, the repository's root directory has two subdirectories: paint and calc." becomes "For example, suppose you have a repository that contains two software projects, paint and calc. Each project lives in its own top-level subdirectory, as shown in Figure 2-6." Page 14, red text "TABLE GOES HERE": Is the table going to be moved to this place by you guys? Page 14, inside sidebar, 1st paragraph: "The URL schema indicates the access method:" becomes "Table 2-1 describes how different URL schemas map to the available access methods." Page 16, paragraph 5: "A nice way to visualize the repository is as a series of trees." becomes "Figure 2-7 illustrates a nice way to visualize the repository." ========= Chapter 3 ========= Page 21, inside NOTE: "Each directory in your working copy contains an .svn administrative area." becomes "Each directory in your working copy contains an administrative subdirectory called .svn." Page 22, right after the list of keywords (PREV is the last one), please add a new NOTE: "PREV, BASE, and COMMITTED can be used to refer to local paths, but not URLs." (PREV, BASE, and COMMITTED are all 'literals'). Page 27, last paragraph: copy-history should not have a hyphen. Page 27, last paragraph, add to end: "svn copy does not create intermediate directories." ('svn copy' is a 'command') Page 28, first paragraph, add to end: "svn move does not create intermediate directories." ('svn move' is a 'command') Page 32, footnote: "svn diff --diff-cmd /usr/bin/diff --extensions -bc foo.c" should be in 'command' tags, not 'quote' tags. Page 35, last paragraph: "Let's say that, due to a miscommunication between you and your collaborator, Sally, both of you edit the file named sandwich.txt at the same time." becomes "Due to a miscommunication, you and Sally, your collaborator, both edit the file sandwich.txt at the same time." Page 44, first paragraph under 'svn import': "The svn import command is a quick way to copy an unversioned tree of files into a repository." becomes "The svn import command is a quick way to copy an unversioned tree of files into a repository, creating intermediate directories as necessary." Page 44, svn import, first screen bit: $ svn import mytree file:///usr/local/svn/newrepos/fooproject becomes: $ svn import mytree file:///usr/local/svn/newrepos/some/project Page 44, svn import, next paragraph, 'fooproject' becomes 'some/project' Page 44, svn import, second screen bit: /fooproject/foo.c /fooproject/bar.c /fooproject/subdir /fooproject/subdir/quux.h becomes $ svn ls file:///usr/local/svn/newrepos/some/project bar.c foo.c subdir/ ========= Chapter 4 ========= Page 46, last paragraph: "A branch always begins life as a copy of something, and moves on from there, generating its own history." becomes "A branch always begins life as a copy of something, and moves on from there, generating its own history (See Figure 4-1)." Page 47, 3rd paragraph: "Notice, however, that" becomes "Notice that in Figure 4-2, however, Page 49, last paragraph: "copoy" becomes "copy" Page 49, last paragraph: "There's really no difference between these two methods. Both procedures create a new directory in revision 341, and the new directory is a copy of /calc/trunk." becomes "There's really no difference between these two methods. Both procedures create a new directory in revision 341, and the new directory is a copy of /calc/trunk. This is shown in Figure 4-3." Page 51, "There are now two independent lines of development happening on integer.c:" becomes "There are now two independent lines of development, shown in Figure 4-4, happening on integer.c: Page 53, "The Key Concept Behinds Branches" should be "The Key Concepts Behind Branches". Page 58, Right before "Common Use-Cases for Merging" is the new section titled "Noticing or Ignoring Ancestry" ### See separate document for this section Page 58, at the end, insert the big TIP Page 59, last paragraph: "...merged to the trunk, you" becomes "...merged to the trunk as revision 406, you" Page 59, last paragraph: Change the colon to an mdash. Page 60, screen output: $ cd calc/trunk $ svn update At revision 480. $ svn merge -r 406:480 http://svn.example.com/repos/calc/branches/my-calc-branch U integer.c U button.c U Makefile becomes $ cd calc/trunk $ svn update At revision 480. # We notice that HEAD is currently 480, so we use it to do the merge: $ svn merge -r 406:480 http://svn.example.com/repos/calc/branches/my-calc-branch U integer.c U button.c U Makefile Page 62, 3rd paragraph under the example: "affect" becomes "effect". ========= Chapter 5 ========= Page 70, "Repository Basics" has a new introductory paragraph: "Before jumping into the broader topic of repository administration, let's further define what a repository is. How does it look? How does it feel? Does it take its tea hot or iced, sweetened, and with lemon? As an administrator, you'll be expected to understand the composition of a repository both from a logical perspective--dealing with how data is represented inside the repository--and from a physical nuts-and-bolts perspective--how a repository looks and acts with respect to non-Subversion tools. The following section covers some of these basic concepts at a very high level." Page 78, "Repository Maintenance" has a new introductory paragraph: "Maintaining a Subversion repository can be a daunting task, mostly due to the complexities inherent in systems which have a database backend. Doing the task well is all about knowing the tools--what they are, when to use them, and how to use them. This section will introduce you to the repository administration tools provided by Subversion, and how to wield them to accomplish tasks such as repository migrations, upgrades, backups and cleanups." Page 83, first paragraph, "administrators need an more manageable" becomes "administrators need a more manageable" Page 102, right after the big 'screen' bit, new piece ----------- You can verify the results of the import by running the svn list command: $ svn list --verbose file:///path/to/repos 1 harry May 08 21:48 projectA/ 1 harry May 08 21:48 projectB/ … $ ----------- ========= Chapter 6 ========= Page 105, paragraph 6, "Caching passwords on disk? That s terrible! You should never do that!" needs to be placed in quotes. Page 112, line 2, 'harry' should be "Harry" Page 123, 2nd to last paragraph, harry should be a 'literal'. Page 123, last paragraph, 'sally' should be capitalized. Page 124, first paragraph, 'sally' should be capitalized. Page 124, third paragraph, 'harry' should be capitalized. Page 126, title of the sidebar may not have capitalization consistent with other sidebar titles. ========= Chapter 7 ========= Page 129, paragraph 4, "you'll be a Subversion poweruser or we ll refund your money!" becomes "you'll be a Subversion poweruser!" Page 129, delete the footnote. Page 136, paragraph 4, 'REGEX' should be 'PATTERN' (both of them!) Page 141, bottom, the section "Special properties" should have "Properties" capitalizated. Page 143, 'several' should be 'some'. Page 143, 2nd to last paragraph: ("Subversion assists...the property") Delete this paragraph. Page 143, last paragraph: "Finally," should be "Also,". Page 149, last paragraph: "...contains a file with a svn:eol-style property..." should be "...contains a file with an svn:eol-style property...". Page 150, right before the "Externals Definitions" section, is a new section titled "Automatic Properties" ### See separate document for this section Page 150, last paragraph: "This property may be set on any versioned directory," becomes "You can create or modify this property using svn propset or svn propedit (see xref svn-ch-7-sect-2.1)." ('svn propset' and 'svn propedit' are 'commands'). Page 151, last paragraph: Delete this paragraph, replace it with new paragraph: The support that exists for externals definitions in Subversion today can be a little misleading, though. The working copies created via the externals definition support are still disconnected from the primary working copy (on whose versioned directories the svn:externals property was actually set). And Subversion still only truly operates on non-disjoint working copies. So, for example, if you want to commit changes that you've made in one or more of those external working copies, you must run svn commit explicitly on those working copies—committing on the primary working copy will not recurse into any external ones. Page 153: General Vendor Branch Management Procedure section has been rewritten (pages 153-155) will be replaced with a new section ### See separate document for this section ========= Chapter 8 ========= Page 161: There are 2 figures in Chapter 8. The captions are correct, but the images themselves are incorrect. Please talk to Jessamyn Reed to get the latest figures. Page 171, 2nd paragraph: "As you know, only a human can botch up the input to a programas well as they do, and the scripting-type language simply handle that misinformation more gracefully." becomes "As you know, humans are proficient at botching up input to a program, and scripting languages tend to handle that misinformation more gracefully." Page 181, 2nd footnote: "neighborhook" should be "neighborhood". ========= Chapter 9 ========= Page 226, right before 'svnadmin dump': New section, "svnadmin deltify" ### See separate document for this section ========= Copyright ========= Replace "CollabNet" with "Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael Pilato". ========== Appendix A ========== Page 143, second paragraph under "Distinction Between Status and Update": Replace "to quickly see their mods. Of course," with "or cvs up -n to quickly see their mods. If users forget to use the -n option" ('cvs up -n' is a 'command', and '-n' is an 'option'). ========== Appendix C ========== Page 260, first line: "Actually quite difficult" should be "Actually be quite difficult"