Mercurial > hgbook

changeset 97:659fa1a2c628

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More text.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 13 Oct 2006 15:48:44 -0700
parents 7d7ddc3a57af
children 3f3dd60695cb
files en/tour-basic.tex en/tour-history.svg
diffstat 2 files changed, 98 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/en/tour-basic.tex	Fri Oct 13 15:34:54 2006 -0700
+++ b/en/tour-basic.tex	Fri Oct 13 15:48:44 2006 -0700
@@ -182,6 +182,12 @@
 The default output printed by \hgcmd{log} is purely a summary; it is
 missing a lot of detail.
 
+Figure~\ref{fig:tour:history} provides a graphical representation of
+the history of the \dirname{hello} repository, to make it a little
+easier to see which direction history is ``flowing'' in.  We'll be
+returning to this figure several times in this chapter and the chapter
+that follows.
+
 \begin{figure}[ht]
   \centering
   \grafix{tour-history}
@@ -189,24 +195,29 @@
   \label{fig:tour:history}
 \end{figure}
 
-\subsection{Changesets, revisions, and identification}
+\subsection{Changesets, revisions, and talking to other 
+  people}
 
-English being a notoriously sloppy language, we have a variety of
-terms that have the same meaning.  If you are talking about Mercurial
-history with other people, you will find that the word ``changeset''
-is often compressed to ``change'' or ``cset'', and sometimes a
-changeset is referred to as a ``revision'' or a ``rev''.
+As English is a notoriously sloppy language, and computer science has
+a history of terminological confusion, revision control has a variety
+of terms that have the same meaning.  If you are talking about
+Mercurial history with other people, you will find that the word
+``changeset'' is often compressed to ``change'' or (when written)
+``cset'', and sometimes a changeset is referred to as a ``revision''
+or a ``rev''.
 
 While it doesn't matter what \emph{word} you use to refer to the
 concept of ``a~changeset'', the \emph{identifier} that you use to
 refer to ``a~\emph{specific} changeset'' is of great importance.
 Recall that the \texttt{changeset} field in the output from
 \hgcmd{log} identifies a changeset using both a number and a
-hexadecimal string.  The number is \emph{only valid in that
-  repository}, while the hex string is the \emph{permanent, unchanging
-  identifier} that will always identify that changeset in every copy
-of the repository.
-
+hexadecimal string.
+\begin{itemize}
+\item The revision number is \emph{only valid in that repository},
+\item while the hex string is the \emph{permanent, unchanging
+    identifier} that will always identify that exact changeset in
+  \emph{every} copy of the repository.
+\end{itemize}
 This distinction is important.  If you send someone an email talking
 about ``revision~33'', there's a high likelihood that their
 revision~33 will \emph{not be the same} as yours.  The reason for this
@@ -324,10 +335,10 @@
 not been modified.  
 
 The ``\texttt{M}'' indicates that Mercurial has noticed that we
-modified \filename{hello.c}.  Notice that we didn't need to
-\emph{inform} Mercurial that we were going to modify the file before
-we started, or that we had modified the file after we were done; it
-was able to figure this out itself.
+modified \filename{hello.c}.  We didn't need to \emph{inform}
+Mercurial that we were going to modify the file before we started, or
+that we had modified the file after we were done; it was able to
+figure this out itself.
 
 It's a little bit helpful to know that we've modified
 \filename{hello.c}, but we might prefer to know exactly \emph{what}
--- a/en/tour-history.svg	Fri Oct 13 15:34:54 2006 -0700
+++ b/en/tour-history.svg	Fri Oct 13 15:48:44 2006 -0700
@@ -17,6 +17,19 @@
   <defs
      id="defs4">
     <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mstart"
+       style="overflow:visible">
+      <path
+         id="path2973"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.4) translate(10,0)" />
+    </marker>
+    <marker
        inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
@@ -42,7 +55,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="1.4"
      inkscape:cx="232.14286"
-     inkscape:cy="673.1101"
+     inkscape:cy="672.75296"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:window-width="906"
@@ -214,5 +227,63 @@
          id="tspan1908"
          x="244.60992"
          y="492.745">(oldest)</tspan></text>
+    <rect
+       style="opacity:1;fill:#d2e1e4;fill-opacity:1;stroke:#b1cbd0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1907"
+       width="94.285713"
+       height="20.714285"
+       x="309.28571"
+       y="324.86218" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier"
+       x="333.38464"
+       y="338.48334"
+       id="text1909"><tspan
+         sodipodi:role="line"
+         id="tspan1911"
+         x="333.38464"
+         y="338.48334"
+         style="font-family:Courier"><tspan
+   style="font-weight:bold"
+   id="tspan1913">4</tspan>: b57f</tspan></text>
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
+       d="M 332.14286,375.21932 L 335.71429,347.36218"
+       id="path2802" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
+       d="M 372.69968,375.21932 L 369.12825,347.36218"
+       id="path2986" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times"
+       x="335.14285"
+       y="387.21933"
+       id="text2988"><tspan
+         sodipodi:role="line"
+         x="335.14285"
+         y="387.21933"
+         id="tspan3020"
+         style="text-align:end;text-anchor:end">revision</tspan><tspan
+         sodipodi:role="line"
+         x="335.14285"
+         y="402.21933"
+         id="tspan3014"
+         style="text-align:end;text-anchor:end">number</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times"
+       x="368.71429"
+       y="387.21933"
+       id="text2994"><tspan
+         sodipodi:role="line"
+         id="tspan2996"
+         x="368.71429"
+         y="387.21933">changeset</tspan><tspan
+         sodipodi:role="line"
+         x="368.71429"
+         y="402.21933"
+         id="tspan2998">identifier</tspan></text>
   </g>
 </svg>