1.1 --- a/en/tour-basic.tex	Wed Oct 18 12:06:56 2006 -0700
     1.2 +++ b/en/tour-basic.tex	Wed Oct 18 14:11:51 2006 -0700
     1.3 @@ -491,6 +491,13 @@
     1.4  To find out what revision the working directory is at, use the
     1.5  \hgcmd{parents} command.
     1.6  \interaction{tour.parents}
     1.7 +If you look back at figure~\ref{fig:tour-basic:history}, you'll see
     1.8 +arrows connecting each changeset.  The node that the arrow leads
     1.9 +\emph{from} in each case is a parent, and the node that the arrow
    1.10 +leads \emph{to} is its child.  The working directory has a parent in
    1.11 +just the same way; this is the changeset that the working directory
    1.12 +currently contains.
    1.13 +
    1.14  To update the working directory to a particular revision, give a
    1.15  revision number or changeset~ID to the \hgcmd{update} command.
    1.16  \interaction{tour.older}

     2.1 --- a/en/tour-merge-merge.svg	Wed Oct 18 12:06:56 2006 -0700
     2.2 +++ b/en/tour-merge-merge.svg	Wed Oct 18 14:11:51 2006 -0700
     2.3 @@ -13,8 +13,7 @@
     2.4     id="svg2"
     2.5     sodipodi:version="0.32"
     2.6     inkscape:version="0.44.1"
     2.7 -   sodipodi:docname="tour-merge-merge.svg"
     2.8 -   sodipodi:docbase="/home/bos/hg/hgbook/en">
     2.9 +   sodipodi:docname="tour-merge-merge.svg">
    2.10    <defs
    2.11       id="defs4">
    2.12      <marker

     3.1 --- a/en/tour-merge.tex	Wed Oct 18 12:06:56 2006 -0700
     3.2 +++ b/en/tour-merge.tex	Wed Oct 18 14:11:51 2006 -0700
     3.3 @@ -96,6 +96,11 @@
     3.4  our former heads as its parents.  These are the same revisions that
     3.5  were previously displayed by \hgcmd{parents}.
     3.6  \interaction{tour.merge.tip}
     3.7 +In figure~\ref{fig:tour-merge:merge}, you can see a representation of
     3.8 +what happens to the working directory during the merge, and how this
     3.9 +affects the repository when the commit happens.  During the merge, the
    3.10 +working directory has two parent changesets, and these become the
    3.11 +parents of the new changeset.
    3.12  
    3.13  %%% Local Variables: 
    3.14  %%% mode: latex