comparison en/mq.tex @ 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 8b0d389cf6e0
children 3f0176046fdc
comparison
equal deleted inserted replaced
52:3e8c9b32b03c 53:0c998750744f
1041 \subsection{\hgcmd{qdelete}---delete a patch from the 1041 \subsection{\hgcmd{qdelete}---delete a patch from the
1042 \sfilename{series} file} 1042 \sfilename{series} file}
1043 1043
1044 The \hgcmd{qdelete} command removes the entry for a patch from the 1044 The \hgcmd{qdelete} command removes the entry for a patch from the
1045 \sfilename{series} file in the \sdirname{.hg/patches} directory. It 1045 \sfilename{series} file in the \sdirname{.hg/patches} directory. It
1046 does not delete the patch file, nor does it pop the patch if the patch 1046 does not pop the patch if the patch is already applied. By default,
1047 is already applied. 1047 it does not delete the patch file; use the \hgopt{qdel}{-f} option to
1048 do that.
1049
1050 Options:
1051 \begin{itemize}
1052 \item[\hgopt{qdel}{-f}] Delete the patch file.
1053 \end{itemize}
1048 1054
1049 \subsection{\hgcmd{qdiff}---print a diff of the topmost applied patch} 1055 \subsection{\hgcmd{qdiff}---print a diff of the topmost applied patch}
1050 1056
1051 The \hgcmd{qdiff} command prints a diff of the topmost applied patch. 1057 The \hgcmd{qdiff} command prints a diff of the topmost applied patch.
1052 It is equivalent to \hgcmdargs{diff}{-r-2:-1}. 1058 It is equivalent to \hgcmdargs{diff}{-r-2:-1}.
1059
1060 \subsection{\hgcmd{qheader}---display the header/description of a patch}
1061
1062 The \hgcmd{qheader} command prints the header, or description, of a
1063 patch. By default, it prints the header of the topmost applied patch.
1064 Given an argument, it prints the header of the named patch.
1053 1065
1054 \subsection{\hgcmd{qimport}---import a third-party patch into the queue} 1066 \subsection{\hgcmd{qimport}---import a third-party patch into the queue}
1055 1067
1056 The \hgcmd{qimport} command adds an entry for an external patch to the 1068 The \hgcmd{qimport} command adds an entry for an external patch to the
1057 \sfilename{series} file, and copies the patch into the 1069 \sfilename{series} file, and copies the patch into the
1219 Even if \hgcmd{qrefresh} detects no changes, it still recreates the 1231 Even if \hgcmd{qrefresh} detects no changes, it still recreates the
1220 changeset that represents the patch. This causes the identity of the 1232 changeset that represents the patch. This causes the identity of the
1221 changeset to differ from the previous changeset that identified the 1233 changeset to differ from the previous changeset that identified the
1222 patch. 1234 patch.
1223 1235
1236 Options:
1237 \begin{itemize}
1238 \item[\hgopt{qrefresh}{-e}] Modify the commit and patch description,
1239 using the preferred text editor.
1240 \item[\hgopt{qrefresh}{-m}] Modify the commit message and patch
1241 description, using the given text.
1242 \item[\hgopt{qrefresh}{-l}] Modify the commit message and patch
1243 description, using text from the given file.
1244 \end{itemize}
1245
1246 \subsection{\hgcmd{qrename}---rename a patch}
1247
1248 The \hgcmd{qrename} command renames a patch, and changes the entry for
1249 the patch in the \sfilename{series} file.
1250
1251 With a single argument, \hgcmd{qrename} renames the topmost applied
1252 patch. With two arguments, it renames its first argument to its
1253 second.
1254
1224 \subsection{\hgcmd{qrestore}---restore saved queue state} 1255 \subsection{\hgcmd{qrestore}---restore saved queue state}
1225 1256
1226 XXX No idea what this does. 1257 XXX No idea what this does.
1227 1258
1228 \subsection{\hgcmd{qsave}---save current queue state} 1259 \subsection{\hgcmd{qsave}---save current queue state}
1267 \item[\hgopt{strip}{-f}] If a branch has multiple heads, remove all 1298 \item[\hgopt{strip}{-f}] If a branch has multiple heads, remove all
1268 heads. XXX This should be renamed, and use \texttt{-f} to strip revs 1299 heads. XXX This should be renamed, and use \texttt{-f} to strip revs
1269 when there are pending changes. 1300 when there are pending changes.
1270 \item[\hgopt{strip}{-n}] Do not save a backup bundle. 1301 \item[\hgopt{strip}{-n}] Do not save a backup bundle.
1271 \end{itemize} 1302 \end{itemize}
1303
1272 \section{MQ file reference} 1304 \section{MQ file reference}
1273
1274 1305
1275 \subsection{The \sfilename{series} file} 1306 \subsection{The \sfilename{series} file}
1276 1307
1277 The \sfilename{series} file contains a list of the names of all 1308 The \sfilename{series} file contains a list of the names of all
1278 patches that MQ can apply. It is represented as a list of names, with 1309 patches that MQ can apply. It is represented as a list of names, with
1293 Placing the \sfilename{series} file under revision control is also 1324 Placing the \sfilename{series} file under revision control is also
1294 supported; it is a good idea to place all of the patches that it 1325 supported; it is a good idea to place all of the patches that it
1295 refers to under revision control, as well. If you create a patch 1326 refers to under revision control, as well. If you create a patch
1296 directory using the \hgopt{qinit}{-c} option to \hgcmd{qinit}, this 1327 directory using the \hgopt{qinit}{-c} option to \hgcmd{qinit}, this
1297 will be done for you automatically. 1328 will be done for you automatically.
1329
1298 \subsection{The \sfilename{status} file} 1330 \subsection{The \sfilename{status} file}
1299 1331
1300 The \sfilename{status} file contains the names and changeset hashes of 1332 The \sfilename{status} file contains the names and changeset hashes of
1301 all patches that MQ currently has applied. Unlike the 1333 all patches that MQ currently has applied. Unlike the
1302 \sfilename{series} file, this file is not intended for editing. You 1334 \sfilename{series} file, this file is not intended for editing. You