diff en/daily.tex @ 121:9094c9fda8ec

Start chapter on error recovery.

--- a/en/daily.tex	Wed Nov 15 13:10:30 2006 -0800
+++ b/en/daily.tex	Wed Nov 15 15:59:41 2006 -0800
@@ -165,6 +165,8 @@
 file.  It treats these copied files specially when you merge your work
 with someone else's.
 
+\subsection{The results of copying during a merge}
+
 What happens during a merge is that changes ``follow'' a copy.  To
 best illustrate what this means, let's create an example.  We'll start
 with the usual tiny repository that contains a single file.
@@ -307,6 +309,13 @@
 something you might expect to ``simply work,'' but not all revision
 control systems actually do this.)
 
+Whereas having changes follow a copy is a feature where you can
+perhaps nod and say ``yes, that might be useful,'' it should be clear
+that having them follow a rename is definitely important.  Without
+this facility, it would simply be too easy for changes to become
+orphaned when files are renamed.
+
+
 %%% Local Variables: 
 %%% mode: latex
 %%% TeX-master: "00book"