d.s at daniel.shahaf.co.il
Sat Jun 7 14:23:35 CDT 2008
Review of the "Tags" section in Chapter 4.
--- ch04-branching-and-merging.xml (revision 3109)
+++ ch04-branching-and-merging.xml (working copy)
@@ -2149,7 +2149,7 @@
<para>However, people often want to give more human-friendly names
to tags, such as <literal>release-1.0</literal>. And they want
to make snapshots of smaller subdirectories of the filesystem.
- After all, it's not so easy to remember that release-1.0 of a
+ After all, it's not so easy to remember that release 1.0 of a
piece of software is a particular subdirectory of revision
@@ -2173,9 +2173,10 @@
<para>This example assumes that a
<filename>/calc/tags</filename> directory already exists. (If
it doesn't, you can create it using <command>svn
+ ### svn mkdir --parents, svn copy --parents
mkdir</command>.) After the copy completes, the new
<filename>release-1.0</filename> directory is forever a
- snapshot of how the project looked in the
+ snapshot of how the trunk looked in the
<literal>HEAD</literal> revision at the time you made the
copy. Of course you might want to be more precise about
exactly which revision you copy, in case somebody else may
@@ -2229,6 +2230,7 @@
You can accomplish this by selectively backdating files or
directories to particular revisions (using <command>svn update
-r</command> liberally) or by switching files and directories
+ ### not just 'svn up' and 'svn sw'; also $EDITOR and 'svn add'
to particular branches (making use of <command>svn
switch</command>). When you're done, your working copy is a
hodgepodge of repository locations from different revisions.
@@ -2248,6 +2250,7 @@
$ svn copy my-working-copy http://svn.example.com/repos/calc/tags/mytag
+### need -m argument
Committed revision 940.
@@ -2255,6 +2258,7 @@
<para>Now there is a new directory in the repository,
<filename>/calc/tags/mytag</filename>, which is an exact
snapshot of your working copy—mixed revisions, URLs,
+ ### local edits, adds,
<para>Other users have found interesting uses for this feature.
@@ -2263,9 +2267,11 @@
collaborator to see them. Instead of running <command>svn
diff</command> and sending a patch file (which won't capture
tree changes, symlink changes, or changes in properties), you can
+ ### define "tree changes" ?
instead use <command>svn copy</command> to <quote>upload</quote>
your working copy to a private area of the repository. Your
collaborator can then either check out a verbatim copy of your
+ ### usually it'll be 'switch', not 'check out'
working copy or use <command>svn merge</command> to receive
your exact changes.</para>
More information about the svnbook-dev