hgbook
changeset 13:5c3966f6991b
Add a parapgraph.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Jul 03 12:35:44 2006 -0700 (2006-07-03) |
parents | 1f692024d438 |
children | e2aa527bafa0 |
files | en/mq.tex |
line diff
1.1 --- a/en/mq.tex Thu Jun 29 08:36:53 2006 -0700 1.2 +++ b/en/mq.tex Mon Jul 03 12:35:44 2006 -0700 1.3 @@ -214,7 +214,7 @@ 1.4 \end{figure} 1.5 1.6 You can run \hgcmd{qrefresh} as often as you like, so it's a good way 1.7 -to ``checkpoint'' your work. Reefresh your patch at an opportune 1.8 +to ``checkpoint'' your work. Refresh your patch at an opportune 1.9 time; try an experiment; and if the experiment doesn't work out, 1.10 \hgcmd{revert} your modifications back to the last time you refreshed. 1.11 1.12 @@ -300,6 +300,25 @@ 1.13 no patches, all of them, or any number in between applied at some 1.14 point in time. 1.15 1.16 +\subsection{Working on several patches at once} 1.17 + 1.18 +The \hgcmd{qrefresh} command always refreshes the \emph{topmost} 1.19 +applied patch. This means that you can suspend work on one patch (by 1.20 +refreshing it), pop or push to make a different patch the top, and 1.21 +work on \emph{that} patch for a while. 1.22 + 1.23 +Here's an example that illustrates how you can use this ability. 1.24 +Let's say you're developing a new feature as two patches. The first 1.25 +is a change to the core of your software, and the second--layered on 1.26 +top of the first--changes the user interface to use the code you just 1.27 +added to the core. If you notice a bug in the core while you're 1.28 +working on the UI patch, it's easy to fix the core. Simply 1.29 +\hgcmd{qrefresh} the UI patch to save your in-progress changes, and 1.30 +\hgcmd{qpop} down to the core patch. Fix the core bug, 1.31 +\hgcmd{qrefresh} the core patch, and \hgcmd{qpush} back to the UI 1.32 +patch to continue where you left off. 1.33 + 1.34 + 1.35 %%% Local Variables: 1.36 %%% mode: latex 1.37 %%% TeX-master: "00book"