Mercurial > hgbook
comparison en/ch04-concepts.tex @ 650:f72b7e6cbe90
Snapshot.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 05 Feb 2009 00:01:16 -0800 |
parents | 5cd47f721686 |
children |
comparison
equal
deleted
inserted
replaced
649:5cd47f721686 | 650:f72b7e6cbe90 |
---|---|
37 figure~\ref{fig:concepts:filelog}. | 37 figure~\ref{fig:concepts:filelog}. |
38 | 38 |
39 \begin{figure}[ht] | 39 \begin{figure}[ht] |
40 \centering | 40 \centering |
41 \grafix{filelog} | 41 \grafix{filelog} |
42 \caption{Relationships between files in working directory and | 42 \caption{Relationships between files in working directory and filelogs in repository} |
43 filelogs in repository} | |
44 \label{fig:concepts:filelog} | 43 \label{fig:concepts:filelog} |
45 \end{figure} | 44 \end{figure} |
46 | 45 |
47 \subsection{Managing tracked files} | 46 \subsection{Managing tracked files} |
48 | 47 |
203 error or system bug, it's often possible to reconstruct some or most | 202 error or system bug, it's often possible to reconstruct some or most |
204 revisions from the uncorrupted sections of the revlog, both before and | 203 revisions from the uncorrupted sections of the revlog, both before and |
205 after the corrupted section. This would not be possible with a | 204 after the corrupted section. This would not be possible with a |
206 delta-only storage model. | 205 delta-only storage model. |
207 | 206 |
208 \section{Revision history, branching, | 207 \section{Revision history, branching, and merging} |
209 and merging} | |
210 | 208 |
211 Every entry in a Mercurial revlog knows the identity of its immediate | 209 Every entry in a Mercurial revlog knows the identity of its immediate |
212 ancestor revision, usually referred to as its \emph{parent}. In fact, | 210 ancestor revision, usually referred to as its \emph{parent}. In fact, |
213 a revision contains room for not one parent, but two. Mercurial uses | 211 a revision contains room for not one parent, but two. Mercurial uses |
214 a special hash, called the ``null ID'', to represent the idea ``there | 212 a special hash, called the ``null ID'', to represent the idea ``there |
263 what the parents of the dirstate are. | 261 what the parents of the dirstate are. |
264 | 262 |
265 \subsection{What happens when you commit} | 263 \subsection{What happens when you commit} |
266 | 264 |
267 The dirstate stores parent information for more than just book-keeping | 265 The dirstate stores parent information for more than just book-keeping |
268 purposes. Mercurial uses the parents of the dirstate as \emph{the | 266 purposes. Mercurial uses the parents of the dirstate as \emph{the parents of a new changeset} when you perform a commit. |
269 parents of a new changeset} when you perform a commit. | |
270 | 267 |
271 \begin{figure}[ht] | 268 \begin{figure}[ht] |
272 \centering | 269 \centering |
273 \grafix{wdir} | 270 \grafix{wdir} |
274 \caption{The working directory can have two parents} | 271 \caption{The working directory can have two parents} |