Mercurial > hgbook
changeset 53:0c998750744f
Update mq chapter to cover new commands and options.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 01 Aug 2006 12:38:13 -0700 |
parents | 3e8c9b32b03c |
children | e94202d88199 |
files | en/mq.tex |
diffstat | 1 files changed, 35 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/en/mq.tex Thu Jul 27 15:10:58 2006 -0700 +++ b/en/mq.tex Tue Aug 01 12:38:13 2006 -0700 @@ -1043,14 +1043,26 @@ The \hgcmd{qdelete} command removes the entry for a patch from the \sfilename{series} file in the \sdirname{.hg/patches} directory. It -does not delete the patch file, nor does it pop the patch if the patch -is already applied. +does not pop the patch if the patch is already applied. By default, +it does not delete the patch file; use the \hgopt{qdel}{-f} option to +do that. + +Options: +\begin{itemize} +\item[\hgopt{qdel}{-f}] Delete the patch file. +\end{itemize} \subsection{\hgcmd{qdiff}---print a diff of the topmost applied patch} The \hgcmd{qdiff} command prints a diff of the topmost applied patch. It is equivalent to \hgcmdargs{diff}{-r-2:-1}. +\subsection{\hgcmd{qheader}---display the header/description of a patch} + +The \hgcmd{qheader} command prints the header, or description, of a +patch. By default, it prints the header of the topmost applied patch. +Given an argument, it prints the header of the named patch. + \subsection{\hgcmd{qimport}---import a third-party patch into the queue} The \hgcmd{qimport} command adds an entry for an external patch to the @@ -1221,6 +1233,25 @@ changeset to differ from the previous changeset that identified the patch. +Options: +\begin{itemize} +\item[\hgopt{qrefresh}{-e}] Modify the commit and patch description, + using the preferred text editor. +\item[\hgopt{qrefresh}{-m}] Modify the commit message and patch + description, using the given text. +\item[\hgopt{qrefresh}{-l}] Modify the commit message and patch + description, using text from the given file. +\end{itemize} + +\subsection{\hgcmd{qrename}---rename a patch} + +The \hgcmd{qrename} command renames a patch, and changes the entry for +the patch in the \sfilename{series} file. + +With a single argument, \hgcmd{qrename} renames the topmost applied +patch. With two arguments, it renames its first argument to its +second. + \subsection{\hgcmd{qrestore}---restore saved queue state} XXX No idea what this does. @@ -1269,9 +1300,9 @@ when there are pending changes. \item[\hgopt{strip}{-n}] Do not save a backup bundle. \end{itemize} + \section{MQ file reference} - \subsection{The \sfilename{series} file} The \sfilename{series} file contains a list of the names of all @@ -1295,6 +1326,7 @@ refers to under revision control, as well. If you create a patch directory using the \hgopt{qinit}{-c} option to \hgcmd{qinit}, this will be done for you automatically. + \subsection{The \sfilename{status} file} The \sfilename{status} file contains the names and changeset hashes of