hgbook
diff en/mq.tex @ 260:ec6a3bb10986
HTML: replace Unicode ligatures with plain ASCII.
Thanks to Johannes Hoff for spotting this.
Thanks to Johannes Hoff for spotting this.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun Jun 17 11:09:13 2007 -0700 (2007-06-17) |
parents | 09d5897ad935 |
children | 7a6bd93174bd |
line diff
1.1 --- a/en/mq.tex Sun May 27 09:57:17 2007 -0700 1.2 +++ b/en/mq.tex Sun Jun 17 11:09:13 2007 -0700 1.3 @@ -591,10 +591,11 @@ 1.4 vigorous than \command{patch} in its attempts to make a patch apply. 1.5 1.6 Another Linux kernel hacker, Chris Mason (the author of Mercurial 1.7 -Queues), wrote a similar tool called \command{rej}~\cite{web:rej}, 1.8 -which takes a simple approach to automating the application of hunks 1.9 -rejected by \command{patch}. \command{rej} can help with four common 1.10 -reasons that a hunk may be rejected: 1.11 +Queues), wrote a similar tool called 1.12 +\command{mpatch}~\cite{web:mpatch}, which takes a simple approach to 1.13 +automating the application of hunks rejected by \command{patch}. The 1.14 +\command{mpatch} command can help with four common reasons that a hunk 1.15 +may be rejected: 1.16 1.17 \begin{itemize} 1.18 \item The context in the middle of a hunk has changed. 1.19 @@ -605,9 +606,9 @@ 1.20 currently present in the file. 1.21 \end{itemize} 1.22 1.23 -If you use \command{wiggle} or \command{rej}, you should be doubly 1.24 +If you use \command{wiggle} or \command{mpatch}, you should be doubly 1.25 careful to check your results when you're done. In fact, 1.26 -\command{rej} enforces this method of double-checking the tool's 1.27 +\command{mpatch} enforces this method of double-checking the tool's 1.28 output, by automatically dropping you into a merge program when it has 1.29 done its job, so that you can verify its work and finish off any 1.30 remaining merges.