[svnbook commit] r1215 - in trunk/src/nb: . book
sunny256
svnbook-dev at red-bean.com
Sun Apr 17 12:14:20 CDT 2005
Author: sunny256
Date: Sun Apr 17 12:14:19 2005
New Revision: 1215
Modified:
trunk/src/nb/LAST_UPDATED
trunk/src/nb/TODO
trunk/src/nb/book/ch09.xml
Log:
Merge changes between -r1211:1214 from the English svnbook into the
Norwegian version.
* src/nb/TODO
* src/nb/book/ch09.xml
Merged r1213.
* src/nb/LAST_UPDATED
Updated by make sync.
Modified: trunk/src/nb/LAST_UPDATED
==============================================================================
--- trunk/src/nb/LAST_UPDATED (original)
+++ trunk/src/nb/LAST_UPDATED Sun Apr 17 12:14:19 2005
@@ -1 +1 @@
-1211
+1214
Modified: trunk/src/nb/TODO
==============================================================================
--- trunk/src/nb/TODO (original)
+++ trunk/src/nb/TODO Sun Apr 17 12:14:19 2005
@@ -61,8 +61,19 @@
To be fixed by sussman:
+
+ch03:
+
+ - "magic rule" of working copy management: you must *always* use
+ 'svn' to manipulate files and dirs (cp, mv, add, rm, etc.),
+ *except* for editing. Editing can be done without telling svn;
+ it notices this later on.
+
ch04:
+ - "magic rule" of the merge command: "diff and apply". explain the
+ 2 URLs + 1 WC arguments. compare URLs, apply diff to wc.
+
- need a giant warning-box about how our lack of 'true renames' can
be really irritating when doing merges. The classic case is when
branchA moves things around, and branch B just changes file text.
Modified: trunk/src/nb/book/ch09.xml
==============================================================================
--- trunk/src/nb/book/ch09.xml (original)
+++ trunk/src/nb/book/ch09.xml Sun Apr 17 12:14:19 2005
@@ -3602,21 +3602,21 @@
copy.</para>
</tip>
- <para>Sometimes an administrator might change the <quote>base
- location</quote> of your repository—in other words, the
- contents of the repository doesn't change, but the main
- URL used to reach the root of the repository does. For
- example, the hostname may change, or the URL schema, or
- perhaps just the path which leads to the repository.
- Rather than checkout a new working copy, you can have the
- <command>svn switch</command> command <quote>rewrite</quote> the
- beginnings of all the URLs in your working copy. Use the
- <option>--relocate</option> command to do the
- substitution. No file contents are changed, nor is the
- repository contacted. It's similar to running a Perl
- script over your working copy <filename>.svn/</filename>
- directories which runs
- <command>s/OldRoot/NewRoot/</command>.</para>
+ <para>Sometimes an administrator might change the
+ <quote>base location</quote> of your repository—in
+ other words, the contents of the repository doesn't
+ change, but the main URL used to reach the root of the
+ repository does. For example, the hostname may change,
+ the URL scheme, or any part of the URL which leads to the
+ repository itself. Rather than checkout a new working
+ copy, you can have the <command>svn switch</command>
+ command <quote>rewrite</quote> the beginnings of all the
+ URLs in your working copy. Use the
+ <option>--relocate</option> option to do the substitution.
+ No file contents are changed, nor is the repository
+ contacted. It's similar to running a Perl script over
+ your working copy <filename>.svn/</filename> directories
+ which runs <command>s/OldRoot/NewRoot/</command>.</para>
<screen>
$ svn checkout file:///tmp/repos test
@@ -3636,6 +3636,29 @@
At revision 3.
</screen>
+ <warning>
+ <para>Be careful when using the
+ <option>--relocate</option> option. If you mistype the
+ argument, you might end up creating nonsensical URLs
+ within your working copy that render the whole workspace
+ unusable and tricky to fix. It's also important to
+ understand exactly when one should or shouldn't use
+ <option>--relocate</option>. Here's the rule of
+ thumb:</para>
+
+ <itemizedlist>
+ <listitem><para>If the working copy needs to reflect a
+ new directory <emphasis>within</emphasis> the
+ repository, then use just <command>svn
+ switch</command>.</para></listitem>
+
+ <listitem><para>If the working copy still reflects the
+ same repository directory, but the location of the
+ repository itself has changed, then use <command>svn
+ switch --relocate</command>.</para></listitem>
+ </itemizedlist>
+ </warning>
+
</refsect1>
</refentry>
More information about the svnbook-dev
mailing list