1.1 --- a/en/daily.tex	Wed Nov 15 12:12:36 2006 -0800
     1.2 +++ b/en/daily.tex	Tue Dec 26 16:56:00 2006 -0800
     1.3 @@ -165,6 +165,8 @@
     1.4  file.  It treats these copied files specially when you merge your work
     1.5  with someone else's.
     1.6  
     1.7 +\subsection{The results of copying during a merge}
     1.8 +
     1.9  What happens during a merge is that changes ``follow'' a copy.  To
    1.10  best illustrate what this means, let's create an example.  We'll start
    1.11  with the usual tiny repository that contains a single file.
    1.12 @@ -307,6 +309,13 @@
    1.13  something you might expect to ``simply work,'' but not all revision
    1.14  control systems actually do this.)
    1.15  
    1.16 +Whereas having changes follow a copy is a feature where you can
    1.17 +perhaps nod and say ``yes, that might be useful,'' it should be clear
    1.18 +that having them follow a rename is definitely important.  Without
    1.19 +this facility, it would simply be too easy for changes to become
    1.20 +orphaned when files are renamed.
    1.21 +
    1.22 +
    1.23  %%% Local Variables: 
    1.24  %%% mode: latex
    1.25  %%% TeX-master: "00book"