Mercurial > hgbook
annotate es/mq-ref.tex @ 592:26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
author | Igor Támara <igor@tamarapatino.org> |
---|---|
date | Wed, 07 Jan 2009 23:47:09 -0500 |
parents | 419853691d11 |
children | 3e176d56ab84 |
rev | line source |
---|---|
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
1 \chapter{Referencia de las Colas de Mercurial} |
435 | 2 \label{chap:mqref} |
3 | |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
4 \section{Referencia de órdenes MQ} |
435 | 5 \label{sec:mqref:cmdref} |
6 | |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
7 Si desea dar un vistazo a las órdenes que ofrece MQ, use la orden |
435 | 8 \hgcmdargs{help}{mq}. |
9 | |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
10 \subsection{\hgxcmd{mq}{qapplied}---imprimir los parches aplicados} |
435 | 11 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
12 La orden \hgxcmd{mq}{qapplied} imprime la pila actual de parches |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
13 aplicados. Los parches se imprimen en orden de antigüedad, primero |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
14 los más antiguos y después los más recientes, por lo tanto el último |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
15 parche de la lista es el que está en el ``tope''. |
435 | 16 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
17 \subsection{\hgxcmd{mq}{qcommit}---consignar cambios en la cola del repositorio} |
435 | 18 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
19 La orden \hgxcmd{mq}{qcommit} consigna cualquier cambio sobresaliente |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
20 en el repositorio \sdirname{.hg/patches}. Esta orden solamente |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
21 funciona si el directorio \sdirname{.hg/patches} es un repositorio, |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
22 p.e.~usted creó el directorio con |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
23 \hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}} o ejecutó |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
24 \hgcmd{init} en el directorio después de correr \hgxcmd{mq}{qinit}. |
435 | 25 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
26 Esta orden es un atajo para \hgcmdargs{commit}{--cwd .hg/patches}. |
435 | 27 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
28 \subsection{\hgxcmd{mq}{qdelete}---eliminar un parche del fichero |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
29 \sfilename{series}} |
435 | 30 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
31 La orden \hgxcmd{mq}{qdelete} elimina la entrada del fichero |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
32 \sfilename{series} para el parche en el directorio |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
33 \sdirname{.hg/patches}. No sca el parche si ha sido aplicado. De |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
34 forma predeterminada no borra el fichero del parche; use la opción |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
35 \hgxopt{mq}{qdel}{-f} para hacerlo. |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
36 |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
37 Opciones: |
435 | 38 \begin{itemize} |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
39 \item[\hgxopt{mq}{qdel}{-f}] Elimina el fichero del parche. |
435 | 40 \end{itemize} |
41 | |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
42 \subsection{\hgxcmd{mq}{qdiff}---imprimir la diferencia del último |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
43 parche aplicado} |
435 | 44 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
45 La orden \hgxcmd{mq}{qdiff} imprime un diff del parche más |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
46 recientemente aplicado. Es equivalente a \hgcmdargs{diff}{-r-2:-1}. |
435 | 47 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
48 \subsection{\hgxcmd{mq}{qfold}---fusionar (``integrar'') varios parches en |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
49 uno solo} |
435 | 50 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
51 La orden \hgxcmd{mq}{qfold} fusiona muchos parches en el último parche |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
52 aplicado, de tal forma que el último parche aplicado es la unión de |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
53 todos los cambios de los parches en cuestión. |
435 | 54 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
55 Los parches a fusionar no deben haber sido aplicados; |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
56 \hgxcmd{mq}{qfold} saldrá indicando un error si alguno ha sido |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
57 aplicado. El orden en el cual los parches se pliegan es |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
58 significativo; \hgcmdargs{qfold}{a b} significa ``aplique el parche |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
59 más reciente, seguido de \texttt{a}, y seguido de \texttt{b}''. |
435 | 60 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
61 Los comentarios de los parches integrados se colocan al final de los |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
62 comentarios del parche destino, con cada bloque de comentarios |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
63 separado con tres asteriscos(``\texttt{*}''). Se usa la opción |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
64 \hgxopt{mq}{qfold}{-e} para editar el mensaje de consignación para el |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
65 conjunto de cambios/parches después de completarse el pliegue. |
435 | 66 |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
67 Opciones: |
435 | 68 \begin{itemize} |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
69 \item[\hgxopt{mq}{qfold}{-e}] Edita el mensaje de consignación y la |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
70 descripción del parche del parche que se ha integrado. |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
71 \item[\hgxopt{mq}{qfold}{-l}] Usa los contenidos del fichero dado como |
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
72 el nuevo mensaje de consignación y descripción del parche para el |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
73 parche a integrar. |
586
f8614aad2cbb
chapter taken to translate to spanish
Igor Támara <igor@tamarapatino.org>
parents:
435
diff
changeset
|
74 \item[\hgxopt{mq}{qfold}{-m}] Usa el texto dado como el mensaje de |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
75 consignación y descripción del parche para el parche integrado. |
435 | 76 \end{itemize} |
77 | |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
78 \subsection{\hgxcmd{mq}{qheader}---desplegar el encabezado/descripción |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
79 de un parche} |
435 | 80 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
81 La orden \hgxcmd{mq}{qheader} imprime el encabezado o descripción de |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
82 un parche. De forma predeterminada, imprime el encabezado del último |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
83 parche aplicado. Si se da un argumento, imprime el encabezado del |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
84 parche referenciado. |
435 | 85 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
86 \subsection{\hgxcmd{mq}{qimport}---importar el parche de un tercero en |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
87 la cola} |
435 | 88 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
89 La orden \hgxcmd{mq}{qimport} añade una entrada de un parche externo |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
90 al fichero \sfilename{series} y copia el parche en el directorio |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
91 \sdirname{.hg/patches}. Añade la entrada inmediatamente después del |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
92 último parche aplicado, pero no introduce el parche. |
435 | 93 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
94 Si el directorio \sdirname{.hg/patches} es un repositorio, |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
95 \hgxcmd{mq}{qimport} automáticamente hace un \hgcmd{add} del parche |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
96 importado. |
435 | 97 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
98 \subsection{\hgxcmd{mq}{qinit}---preparar un repositorio para trabajar |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
99 con MQ} |
435 | 100 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
101 La orden \hgxcmd{mq}{qinit} prepara un repositorio para trabajar con |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
102 MQ. Crea un directorio llamado \sdirname{.hg/patches}. |
435 | 103 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
104 Opciones: |
435 | 105 \begin{itemize} |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
106 \item[\hgxopt{mq}{qinit}{-c}] Crea \sdirname{.hg/patches} como un |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
107 repositorio por sí mismo. También crea un fichero |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
108 \sfilename{.hgignore} que ignorará el fichero \sfilename{status}. |
435 | 109 \end{itemize} |
110 | |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
111 Cuando el directorio \sdirname{.hg/patches} es un repositorio, las órdenes |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
112 \hgxcmd{mq}{qimport} y \hgxcmd{mq}{qnew} hacen \hgcmd{add} |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
113 automáticamente a los parches nuevos. |
435 | 114 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
115 \subsection{\hgxcmd{mq}{qnew}---crear un parche nuevo} |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
116 |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
117 La orden \hgxcmd{mq}{qnew} crea un parche nuevo. Exige un argumento, |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
118 el nombre que se usará para tal parche. El parche recién creado está |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
119 vacío inicialmente. Se añade al fichero \sfilename{series} después |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
120 del último parche aplicado, y se introduce en el tope de ese parche. |
435 | 121 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
122 Si \hgxcmd{mq}{qnew} encuentra ficheros modificados en el directorio |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
123 de trabajo, rehusará crear un parche nuevo a meos que se emplee |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
124 \hgxopt{mq}{qnew}{-f} la opción(ver más adelante). Este |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
125 comportamiento le permite hacer \hgxcmd{mq}{qrefresh} al último parche |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
126 aplicado antes de aplicar un parche nuevo encima de este. |
435 | 127 |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
128 Opciones: |
435 | 129 \begin{itemize} |
587
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
130 \item[\hgxopt{mq}{qnew}{-f}] Crea un parche nuevo si los contenidos |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
131 del directorio actual han sido modificados. Cualquier modificación |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
132 significativa se añade al parche recientemente creado, de tal forma |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
133 que al finalizar la orden, el directorio de trabajo no lucirá |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
134 modificado. |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
135 \item[\hgxopt{mq}{qnew}{-m}] Usa el texto dado como el mensaje de |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
136 consignación. Este texto se almacenará al principio del fichero del |
419853691d11
Translated some paragraphs fixed term fold
Igor Támara <igor@tamarapatino.org>
parents:
586
diff
changeset
|
137 parche, antes de los datos del parche. |
435 | 138 \end{itemize} |
139 | |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
140 \subsection{\hgxcmd{mq}{qnext}---imprimir el nombre del próximo parche} |
435 | 141 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
142 La orden \hgxcmd{mq}{qnext} imprime el nombre del siguiente parche en |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
143 el fichero \sfilename{series} a continuación del último parche |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
144 aplicado. Este parche sería el próximo parche a aplicar si se |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
145 ejecutara la orden \hgxcmd{mq}{qpush}. |
435 | 146 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
147 \subsection{\hgxcmd{mq}{qpop}---sustraer parches de la pila} |
435 | 148 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
149 La orden \hgxcmd{mq}{qpop} elimina los parches aplicados del tope de |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
150 la pila de parches aplicados. De forma predeterminada solamente |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
151 remueve un parche. |
435 | 152 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
153 Esta orden elimina los conjuntos de cambios que representan los |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
154 parches sustraídos del repositorio, y actualiza el directorio de |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
155 trabajo para deshacer los efectos de los parches. |
435 | 156 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
157 Esta orden toma un argumento opcional, que usa como el nombre o el |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
158 índice del parche que desea sustraer. Si se da el nombre, sustraerá |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
159 los parches hasta que el parche nombrado sea el último parche |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
160 aplicado. Si se da un número, \hgxcmd{mq}{qpop} lo trata como un |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
161 índice dentro del fichero \sfilename{series}, contando desde |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
162 cero(no cuenta las líneas vacías o aquellas que sean únicamente |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
163 comentarios). Sustrae los parches hasta que el parche identificado |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
164 por el índice sea el último parche aplicado. |
435 | 165 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
166 La orden \hgxcmd{mq}{qpop} no lee o escribe parches en el fichero |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
167 \sfilename{series}. \hgxcmd{mq}{qpop} se constituye por tanto en una |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
168 forma segura de sustraer un parche del fichero \sfilename{series} o un |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
169 parche que ha eliminado o renombrado completamente. En los dos |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
170 últimos casos, use el nombre del parche tal como lo hizo cuando lo |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
171 aplicó. |
435 | 172 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
173 De forma predeterminada, la orden \hgxcmd{mq}{qpop} no sustraerá |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
174 parche alguno si el directorio de trabajo ha sido modificado. Puede |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
175 modificar este comportamiento con la opción \hgxopt{mq}{qpop}{-f}, que |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
176 revierte todas las modificaciones del directorio de trabajo. |
435 | 177 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
178 Opciones: |
435 | 179 \begin{itemize} |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
180 \item[\hgxopt{mq}{qpop}{-a}] Sustrae todos los parches aplicados. |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
181 Restaura el repositorio al estado antes de haber aplicado parche alguno. |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
182 \item[\hgxopt{mq}{qpop}{-f}] Revertir forzadamente cualquier |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
183 modificación del directorio de trabajo cuando se hace sustracciones. |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
184 \item[\hgxopt{mq}{qpop}{-n}] Sustraer un parche de la cola dado un nombre. |
435 | 185 \end{itemize} |
186 | |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
187 La orden \hgxcmd{mq}{qpop} elimina una línea del final del fichero |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
188 \sfilename{status} por cada parche que se sustrae. |
435 | 189 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
190 \subsection{\hgxcmd{mq}{qprev}---imprimir el nombre del parche anterior} |
435 | 191 |
592
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
192 La orden \hgxcmd{mq}{qprev} imprime el nombre del parche en el fichero |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
193 \sfilename{series} que está antes del último parche aplicado. Este |
26fb9b724588
translated some paragraphs to spanish from mq-ref.tex
Igor Támara <igor@tamarapatino.org>
parents:
587
diff
changeset
|
194 se volverá el último parche aplicado si ejecuta \hgxcmd{mq}{qpop}. |
435 | 195 |
196 \subsection{\hgxcmd{mq}{qpush}---push patches onto the stack} | |
197 \label{sec:mqref:cmd:qpush} | |
198 | |
199 The \hgxcmd{mq}{qpush} command adds patches onto the applied stack. By | |
200 default, it adds only one patch. | |
201 | |
202 This command creates a new changeset to represent each applied patch, | |
203 and updates the working directory to apply the effects of the patches. | |
204 | |
205 The default data used when creating a changeset are as follows: | |
206 \begin{itemize} | |
207 \item The commit date and time zone are the current date and time | |
208 zone. Because these data are used to compute the identity of a | |
209 changeset, this means that if you \hgxcmd{mq}{qpop} a patch and | |
210 \hgxcmd{mq}{qpush} it again, the changeset that you push will have a | |
211 different identity than the changeset you popped. | |
212 \item The author is the same as the default used by the \hgcmd{commit} | |
213 command. | |
214 \item The commit message is any text from the patch file that comes | |
215 before the first diff header. If there is no such text, a default | |
216 commit message is used that identifies the name of the patch. | |
217 \end{itemize} | |
218 If a patch contains a Mercurial patch header (XXX add link), the | |
219 information in the patch header overrides these defaults. | |
220 | |
221 Options: | |
222 \begin{itemize} | |
223 \item[\hgxopt{mq}{qpush}{-a}] Push all unapplied patches from the | |
224 \sfilename{series} file until there are none left to push. | |
225 \item[\hgxopt{mq}{qpush}{-l}] Add the name of the patch to the end | |
226 of the commit message. | |
227 \item[\hgxopt{mq}{qpush}{-m}] If a patch fails to apply cleanly, use the | |
228 entry for the patch in another saved queue to compute the parameters | |
229 for a three-way merge, and perform a three-way merge using the | |
230 normal Mercurial merge machinery. Use the resolution of the merge | |
231 as the new patch content. | |
232 \item[\hgxopt{mq}{qpush}{-n}] Use the named queue if merging while pushing. | |
233 \end{itemize} | |
234 | |
235 The \hgxcmd{mq}{qpush} command reads, but does not modify, the | |
236 \sfilename{series} file. It appends one line to the \hgcmd{status} | |
237 file for each patch that it pushes. | |
238 | |
239 \subsection{\hgxcmd{mq}{qrefresh}---update the topmost applied patch} | |
240 | |
241 The \hgxcmd{mq}{qrefresh} command updates the topmost applied patch. It | |
242 modifies the patch, removes the old changeset that represented the | |
243 patch, and creates a new changeset to represent the modified patch. | |
244 | |
245 The \hgxcmd{mq}{qrefresh} command looks for the following modifications: | |
246 \begin{itemize} | |
247 \item Changes to the commit message, i.e.~the text before the first | |
248 diff header in the patch file, are reflected in the new changeset | |
249 that represents the patch. | |
250 \item Modifications to tracked files in the working directory are | |
251 added to the patch. | |
252 \item Changes to the files tracked using \hgcmd{add}, \hgcmd{copy}, | |
253 \hgcmd{remove}, or \hgcmd{rename}. Added files and copy and rename | |
254 destinations are added to the patch, while removed files and rename | |
255 sources are removed. | |
256 \end{itemize} | |
257 | |
258 Even if \hgxcmd{mq}{qrefresh} detects no changes, it still recreates the | |
259 changeset that represents the patch. This causes the identity of the | |
260 changeset to differ from the previous changeset that identified the | |
261 patch. | |
262 | |
263 Options: | |
264 \begin{itemize} | |
265 \item[\hgxopt{mq}{qrefresh}{-e}] Modify the commit and patch description, | |
266 using the preferred text editor. | |
267 \item[\hgxopt{mq}{qrefresh}{-m}] Modify the commit message and patch | |
268 description, using the given text. | |
269 \item[\hgxopt{mq}{qrefresh}{-l}] Modify the commit message and patch | |
270 description, using text from the given file. | |
271 \end{itemize} | |
272 | |
273 \subsection{\hgxcmd{mq}{qrename}---rename a patch} | |
274 | |
275 The \hgxcmd{mq}{qrename} command renames a patch, and changes the entry for | |
276 the patch in the \sfilename{series} file. | |
277 | |
278 With a single argument, \hgxcmd{mq}{qrename} renames the topmost applied | |
279 patch. With two arguments, it renames its first argument to its | |
280 second. | |
281 | |
282 \subsection{\hgxcmd{mq}{qrestore}---restore saved queue state} | |
283 | |
284 XXX No idea what this does. | |
285 | |
286 \subsection{\hgxcmd{mq}{qsave}---save current queue state} | |
287 | |
288 XXX Likewise. | |
289 | |
290 \subsection{\hgxcmd{mq}{qseries}---print the entire patch series} | |
291 | |
292 The \hgxcmd{mq}{qseries} command prints the entire patch series from the | |
293 \sfilename{series} file. It prints only patch names, not empty lines | |
294 or comments. It prints in order from first to be applied to last. | |
295 | |
296 \subsection{\hgxcmd{mq}{qtop}---print the name of the current patch} | |
297 | |
298 The \hgxcmd{mq}{qtop} prints the name of the topmost currently applied | |
299 patch. | |
300 | |
301 \subsection{\hgxcmd{mq}{qunapplied}---print patches not yet applied} | |
302 | |
303 The \hgxcmd{mq}{qunapplied} command prints the names of patches from the | |
304 \sfilename{series} file that are not yet applied. It prints them in | |
305 order from the next patch that will be pushed to the last. | |
306 | |
307 \subsection{\hgcmd{strip}---remove a revision and descendants} | |
308 | |
309 The \hgcmd{strip} command removes a revision, and all of its | |
310 descendants, from the repository. It undoes the effects of the | |
311 removed revisions from the repository, and updates the working | |
312 directory to the first parent of the removed revision. | |
313 | |
314 The \hgcmd{strip} command saves a backup of the removed changesets in | |
315 a bundle, so that they can be reapplied if removed in error. | |
316 | |
317 Options: | |
318 \begin{itemize} | |
319 \item[\hgopt{strip}{-b}] Save unrelated changesets that are intermixed | |
320 with the stripped changesets in the backup bundle. | |
321 \item[\hgopt{strip}{-f}] If a branch has multiple heads, remove all | |
322 heads. XXX This should be renamed, and use \texttt{-f} to strip revs | |
323 when there are pending changes. | |
324 \item[\hgopt{strip}{-n}] Do not save a backup bundle. | |
325 \end{itemize} | |
326 | |
327 \section{MQ file reference} | |
328 | |
329 \subsection{The \sfilename{series} file} | |
330 | |
331 The \sfilename{series} file contains a list of the names of all | |
332 patches that MQ can apply. It is represented as a list of names, with | |
333 one name saved per line. Leading and trailing white space in each | |
334 line are ignored. | |
335 | |
336 Lines may contain comments. A comment begins with the ``\texttt{\#}'' | |
337 character, and extends to the end of the line. Empty lines, and lines | |
338 that contain only comments, are ignored. | |
339 | |
340 You will often need to edit the \sfilename{series} file by hand, hence | |
341 the support for comments and empty lines noted above. For example, | |
342 you can comment out a patch temporarily, and \hgxcmd{mq}{qpush} will skip | |
343 over that patch when applying patches. You can also change the order | |
344 in which patches are applied by reordering their entries in the | |
345 \sfilename{series} file. | |
346 | |
347 Placing the \sfilename{series} file under revision control is also | |
348 supported; it is a good idea to place all of the patches that it | |
349 refers to under revision control, as well. If you create a patch | |
350 directory using the \hgxopt{mq}{qinit}{-c} option to \hgxcmd{mq}{qinit}, this | |
351 will be done for you automatically. | |
352 | |
353 \subsection{The \sfilename{status} file} | |
354 | |
355 The \sfilename{status} file contains the names and changeset hashes of | |
356 all patches that MQ currently has applied. Unlike the | |
357 \sfilename{series} file, this file is not intended for editing. You | |
358 should not place this file under revision control, or modify it in any | |
359 way. It is used by MQ strictly for internal book-keeping. | |
360 | |
361 %%% Local Variables: | |
362 %%% mode: latex | |
363 %%% TeX-master: "00book" | |
364 %%% End: |