hgbook
diff en/tour-basic.tex @ 99:06383f9e46e4
More graphics.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Oct 16 14:54:37 2006 -0700 (2006-10-16) |
parents | 659fa1a2c628 |
children | 321732566ac1 |
line diff
1.1 --- a/en/tour-basic.tex Fri Oct 13 15:48:44 2006 -0700 1.2 +++ b/en/tour-basic.tex Mon Oct 16 14:54:37 2006 -0700 1.3 @@ -182,7 +182,7 @@ 1.4 The default output printed by \hgcmd{log} is purely a summary; it is 1.5 missing a lot of detail. 1.6 1.7 -Figure~\ref{fig:tour:history} provides a graphical representation of 1.8 +Figure~\ref{fig:tour-basic:history} provides a graphical representation of 1.9 the history of the \dirname{hello} repository, to make it a little 1.10 easier to see which direction history is ``flowing'' in. We'll be 1.11 returning to this figure several times in this chapter and the chapter 1.12 @@ -192,19 +192,19 @@ 1.13 \centering 1.14 \grafix{tour-history} 1.15 \caption{Graphical history of the \dirname{hello} repository} 1.16 - \label{fig:tour:history} 1.17 + \label{fig:tour-basic:history} 1.18 \end{figure} 1.19 1.20 \subsection{Changesets, revisions, and talking to other 1.21 people} 1.22 1.23 As English is a notoriously sloppy language, and computer science has 1.24 -a history of terminological confusion, revision control has a variety 1.25 -of terms that have the same meaning. If you are talking about 1.26 -Mercurial history with other people, you will find that the word 1.27 -``changeset'' is often compressed to ``change'' or (when written) 1.28 -``cset'', and sometimes a changeset is referred to as a ``revision'' 1.29 -or a ``rev''. 1.30 +a hallowed history of terminological confusion (why use one term when 1.31 +four will do?), revision control has a variety of words and phrases 1.32 +that mean the same thing. If you are talking about Mercurial history 1.33 +with other people, you will find that the word ``changeset'' is often 1.34 +compressed to ``change'' or (when written) ``cset'', and sometimes a 1.35 +changeset is referred to as a ``revision'' or a ``rev''. 1.36 1.37 While it doesn't matter what \emph{word} you use to refer to the 1.38 concept of ``a~changeset'', the \emph{identifier} that you use to