Bryan O'Sullivan avatar Bryan O'Sullivan committed 3217325

A few bits of terminological clarification.

Comments (0)

Files changed (3)

en/tour-basic.tex

 To find out what revision the working directory is at, use the
 \hgcmd{parents} command.
 \interaction{tour.parents}
+If you look back at figure~\ref{fig:tour-basic:history}, you'll see
+arrows connecting each changeset.  The node that the arrow leads
+\emph{from} in each case is a parent, and the node that the arrow
+leads \emph{to} is its child.  The working directory has a parent in
+just the same way; this is the changeset that the working directory
+currently contains.
+
 To update the working directory to a particular revision, give a
 revision number or changeset~ID to the \hgcmd{update} command.
 \interaction{tour.older}
Add a comment to this file

en/tour-merge-merge.svg

Old
Old image
New
New image
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.44.1"
-   sodipodi:docname="tour-merge-merge.svg"
-   sodipodi:docbase="/home/bos/hg/hgbook/en">
+   sodipodi:docname="tour-merge-merge.svg">
   <defs
      id="defs4">
     <marker

en/tour-merge.tex

 our former heads as its parents.  These are the same revisions that
 were previously displayed by \hgcmd{parents}.
 \interaction{tour.merge.tip}
+In figure~\ref{fig:tour-merge:merge}, you can see a representation of
+what happens to the working directory during the merge, and how this
+affects the repository when the commit happens.  During the merge, the
+working directory has two parent changesets, and these become the
+parents of the new changeset.
 
 %%% Local Variables: 
 %%% mode: latex
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.