Mercurial > hgbook
annotate es/daily.tex @ 458:854a70fc05c6
Translated copy section of daily.tex
author | Igor TAmara <igor@tamarapatino.org> |
---|---|
date | Sat, 25 Oct 2008 17:27:51 -0500 |
parents | 11d7896cd2ac |
children | fabba3555d29 48584345e451 |
rev | line source |
---|---|
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
1 \chapter{Mercurial día a día} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
2 \label{chap:daily} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
3 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
4 \section{Cómo indicarle a Mercurial qué ficheros seguir} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
5 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
6 Mercurial no trabaja con ficheros en su repositorio a menos que usted |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
7 explícitamente se lo indique. La orden \hgcmd{status} le mostrará |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
8 cuáles ficheros son desconocidos para Mercurial; emplea un |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
9 ``\texttt{?}'' para mostrar tales ficheros. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
10 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
11 Para indicarle a Mercurial que tenga en cuenta un fichero, emplee la |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
12 orden \hgcmd{add}. Una vez que haya adicionado el fichero, la línea |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
13 referente al fichero al aplicar la orden \hgcmd{status} para tal |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
14 fichero cambia de ``\texttt{?}'' a ``\texttt{A}''. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
15 \interaction{daily.files.add} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
16 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
17 Después de invocar \hgcmd{commit}, los ficheros que haya adicionado |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
18 antes de consignar no se listarán en la salida de \hgcmd{status}. La |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
19 razón para esto es que \hgcmd{status} solamente le muestra aquellos |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
20 ficheros ``interesantes''---los que usted haya modificado o a aquellos |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
21 sobre los que usted haya indicado a Mercurial hacerles algo---de forma |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
22 predeterminada. Si tiene un repositorio que contiene miles de |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
23 ficheros, inusualmente deseará saber cuáles de ellos están siendo |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
24 seguidos por Mercurial, pero que no han cambiado. (De todas maneras, |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
25 puede obtener tal información; más adelante hablaremos de ello.) |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
26 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
27 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
28 Cuando usted añade un fichero, Mercurial no hace nada con el inmediatamente. |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
29 A cambio, tomará una instantánea del estado del fichero la próxima vez |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
30 que usted consigne. Continuará haciendo seguimiento a los cambios que |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
31 haga sobre el fichero cada vez que consigne, hasta que usted lo elimine. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
32 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
33 \subsection{Nombramiento explicíto e implícito de ficheros} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
34 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
35 Mercurial tiene un comportamiento útil en el cual si a una orden, |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
36 le pasa el nombre de un directorio, todas las órdenes lo tratarán como |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
37 ``Deseo operar en cada fichero de este directorio y sus |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
38 subdirectorios''. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
39 \interaction{daily.files.add-dir} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
40 Tenga en cuenta que en este ejemplo Mercurial imprimió los nombres de |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
41 los ficheros que se adicionaron, mientras que no lo hizo en el ejemplo |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
42 anterior cuando adicionamos el fichero con nombre \filename{a}. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
43 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
44 En el último caso hicimos explícito el nombre del fichero que |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
45 deseábamos adicionar en la línea de órdenes, y Mercurial asume en |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
46 tales casos que usted sabe lo que está haciendo y no imprime |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
47 información alguna. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
48 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
49 Cuando hacemos \emph{implícitos} los nombres de los ficheros dando el |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
50 nombre de un directorio, Mercurial efectua un paso extra al imprimir |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
51 el nombre de cada fichero con el que va a hacer algo. Esto para |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
52 aclarar lo que está sucediendo, y reducir en lo posible una sorpresa |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
53 silenciosa pero fatal. Este comportamiento es común a la mayoría de |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
54 órdenes en Mercurial. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
55 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
56 \subsection{Nota al margen:Mercurial trata ficheros, no directorios} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
57 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
58 Mercurial no da seguimiento a la información de los directorios. En |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
59 lugar de eso tiene en cuenta las rutas de los ficheros. Antes de |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
60 crear un fichero, primero crea todos los directorios que hagan falta |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
61 para completar la ruta del fichero. Después de borrar un fichero, |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
62 borra todos los directorios vacíos que estuvieran en la ruta del |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
63 fichero borrado. Suena como una diferencia trivial, pero tiene una |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
64 consecuencia práctica menor: no es posible representar un directorio |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
65 completamente vacío en Mercurial. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
66 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
67 Los directorios vacíos son inusualmente útiles, hay soluciones |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
68 alternativas no intrusivas que puede emplear para obtener el efecto |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
69 apropiado. Los desarrolladores de Mercurial pensaron que la |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
70 complejidad necesaria para administrar directorios vacíos no valía la |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
71 pena frente al beneficio limitado que esta característica podría traer. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
72 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
73 Si necesita un directorio vacío en su repositorio, hay algunas formas |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
74 de lograrlo. Una es crear un directorio, después hacer \hgcmd{add} a |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
75 un fichero ``escondido'' dentro de ese directorio. En sistemas tipo |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
76 Unix, cualquier fichero cuyo nombre comience con un punto |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
77 (``\texttt{.}'') se trata como escondido por la mayoría de |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
78 herramientas GUI. Esta aproximación se ilustra en la figura~\ref{ex:daily:hidden}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
79 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
80 \begin{figure}[ht] |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
81 \interaction{daily.files.hidden} |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
82 \caption{Simular un directorio vacío con un fichero escondido} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
83 \label{ex:daily:hidden} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
84 \end{figure} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
85 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
86 Otra forma de abordar la necesidad de un fichero vacío es crear |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
87 simplemente uno en sus guiones de construcción antes de ser necesarios. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
88 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
89 \section{Cómo dejar de hacer seguimiento a un fichero} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
90 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
91 Si decide que un fichero no pertenece a su repositorio, use la orden |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
92 \hgcmd{remove}; se borrará el fichero y le indicará a Mercurial que |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
93 deje de hacerle seguimiento. Los ficheros eliminados se representan |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
94 con ``\texttt{R}'' al usar \hgcmd{status}. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
95 \interaction{daily.files.remove} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
96 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
97 Después de hacer \hgcmd{remove} a un fichero, Mercurial dejará de |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
98 hacer seguimiento al mismo, incluso si recrea el fichero con el mismo |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
99 nombre en su directorio de trabajo. Si decide recrear un fichero con |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
100 el mismo nombre y desea que Mercurial le haga seguimiento, basta con |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
101 hacerle \hgcmd{add}. Mercurial sabrá que el fichero recientemente |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
102 adicionado no está relacionado con el fichero anterior que tenía el |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
103 mismo nombre. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
104 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
105 \subsection{Al eliminar un fichero no se afecta su historia} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
106 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
107 Es preciso tener en cuenta que al eliminar un fichero se tiene |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
108 dos efectos solamente. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
109 \begin{itemize} |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
110 \item Se elimina la versión actual del fichero del directorio de |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
111 trabajo. |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
112 \item Mercurial deja de hacer seguimiento a los cambios del fichero |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
113 desde la próxima consignación. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
114 \end{itemize} |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
115 Al eliminar un fichero \emph{no} se altera de ninguna manera la |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
116 \emph{historia} del mismo. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
117 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
118 Si actualiza su directorio de trabajo a un conjunto de cambios en el |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
119 cual esl fichero que eliminó aún era tenido en cuenta, reaparecerá en |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
120 el directorio de trabajo, con los contenidos que este tenía cuando se |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
121 consignó tal conjunto de cambios. Si usted actualiza el directorio de |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
122 trabajo a un conjunto de cambios posterior en el cual el fichero había |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
123 sido eliminado, Mercurial lo eliminará de nuevo del directorio de |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
124 trabajo. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
125 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
126 \subsection{Ficheros perdidos} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
127 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
128 Mercurial considera como \emph{perdido} un fichero que usted borró, |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
129 pero para el que no se usó \hgcmd{remove}. Los ficheros perdidos se |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
130 representan con ``\texttt{!}'' al visualizar \hgcmd{status}. |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
131 Las órdenes de Mercurial generalmente no harán nada con los ficheros |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
132 perdidos. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
133 \interaction{daily.files.missing} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
134 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
135 Si su repositorio contiene un fichero que \hgcmd{status} reporta como |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
136 perdido, y desea que el mismo se vaya, se puede usar |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
137 \hgcmdargs{remove}{\hgopt{remove}{--after}} posteriormente para |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
138 indicarle a Mercurial que usted deseaba borrar tal fichero. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
139 \interaction{daily.files.remove-after} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
140 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
141 Por otro lado, si borró un fichero perdido por accidente, puede usar |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
142 \hgcmdargs{revert}{\emph{nombre de fichero}} para recuperar el |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
143 fichero. Reaparecerá sin modificaciones. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
144 \interaction{daily.files.recover-missing} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
145 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
146 \subsection{Nota al margen: ¿Por qué decirle explícitamente a Mercurial |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
147 que elimine un fichero?} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
148 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
149 Es posible que se haya preguntado por qué Mercurial exige que usted le |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
150 indique explícitamente que está borrando un fichero. Al principio del |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
151 desarrollo de Mercurial, este permitía que usted borrara el fichero |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
152 sin más; Mercurial se daría cuanta de la ausencia del fichero |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
153 automáticamente después de la ejecución de \hgcmd{commit}, y dejaba de |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
154 hacer seguimiento al fichero. En la práctica, resultaba muy sencillo |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
155 borrar un fichero accidentalmente sin darse cuenta. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
156 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
157 \subsection{Atajo útil---agregar y eliminar ficheros en un solo paso} |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
158 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
159 Mercurial ofrece una orden combinada, \hgcmd{addremove}, que agrega |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
160 los ficheros que no tienen seguimiento y marca los ficheros faltantes |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
161 como eliminados. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
162 \interaction{daily.files.addremove} |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
163 La orden \hgcmd{commit} su puede usar con la opción \hgopt{commit}{-A} |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
164 que aplica el agregar-eliminar, seguido inmediatamente de una |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
165 consignación. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
166 \interaction{daily.files.commit-addremove} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
167 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
168 \section{Copiar ficheros} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
169 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
170 Mercurial ofrece la orden \hgcmd{copy} para hacer una nueva copia de |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
171 un archivo. Cuando se copia un archivo con esta orden, Mercurial |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
172 lleva un registro indicando que el nuevo archivo es una copia del |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
173 fichero original. Trata de forma especial los archivos copiados cuando |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
174 usted hace una fusión con el trabajo de alguien más. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
175 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
176 \subsection{Resultados de copiar un archivo durante una fusión} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
177 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
178 Durante una fusión lols cambios ``siguen'' una copia. Para ilustrar |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
179 lo que esto significa, haremos un ejemplo. Comenzaremos con el mini |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
180 repositorio usual que contiene un solo archivo |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
181 \interaction{daily.copy.init} |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
182 Debemos trabajar algo en paralelo, de forma que tengamos algo para |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
183 fusionar. Aquí clonamos el repositorio. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
184 \interaction{daily.copy.clone} |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
185 De vuelta en el repositorio, usemos la orden \hgcmd{copy} para hacer |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
186 una copia del primer archivo que creamos. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
187 \interaction{daily.copy.copy} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
188 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
189 Si vemos la salida de la orden \hgcmd{status}, el archivo copiado luce |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
190 como un archivo que se ha añadido normalmente. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
191 \interaction{daily.copy.status} |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
192 Si usamos la opción \hgopt{status}{-C} de la orden \hgcmd{status}, |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
193 imprimirá otra línea: Ela archivo of output: this is the file that our newly-added |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
194 file was copied \emph{from}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
195 \interaction{daily.copy.status-copy} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
196 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
197 Ahora, en el repositorio que clonamos, hagamos un cambio en |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
198 paralelo. Adicionaremos una línea de contenido al archivo original que |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
199 creamos. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
200 \interaction{daily.copy.other} |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
201 Hemos modificado el fichero \filename{file} en este |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
202 repositorio. Cuando jalemos los cambios del primer repositorio y |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
203 fusionemos las dos cabezas, Mercurial propagará los cambios que hemos |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
204 hecho localmente en \filename{file} a su copia, \filename{new-file}. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
205 \interaction{daily.copy.merge} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
206 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
207 \subsection{¿Por qué los cambios se reflejan en las copias?} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
208 \label{sec:daily:why-copy} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
209 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
210 Este comportamiento de cambios en ficheros que se propagan a las |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
211 copias de los ficheros parecería esotérico, pero en la mayoría de |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
212 casos es absolutamente deseable. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
213 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
214 Es indispensable recordar que esta propagación \emph{solamente} sucede |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
215 cuando fusionamos. Por lo tanto si sobre un archivo se usa |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
216 \hgcmd{copy}, y se modifica el fichero original durante el curso |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
217 normal de su trabajo, nada pasará. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
218 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
219 Lo segundo a tener en cuenta es que las modificaciones solamente se |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
220 propagarán en las copias únicamente si los repositorios de los cuales |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
221 está jalando los cambios \emph{no saben} de la copia. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
222 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
223 Explicaremos a continuación la razón de este comportamiento de |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
224 Mercurial. Digamos que yo he aplicado un arreglo de un fallo importante a un |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
225 archivo fuente y consigné los cambios. Por otro lado, usted decidió hacer |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
226 \hgcmd{copy} sobre el fichero en su repositorio, sin saber acerca del |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
227 fallo o sin ver el arreglo, y ha comenzado a trabajar sobre su copia |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
228 del archivo. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
229 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
230 Si jala y fusiona mis cambios y Mercurial \emph{no hubiera} propagado |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
231 los cambios en las copias, su fichero fuente tendría el fallo, a menos |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
232 que usted haya recordado propagar el arreglo del fallo a mano, el |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
233 mismo \emph{permanecería} en su copia del archivo. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
234 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
235 Mercurial previene esta clase de problemas, gracias a la propagación |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
236 automática del cambio que arregló el fallo del fichero original. Hasta |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
237 donde sé, Mercurial es el \emph{único} sistema de control de |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
238 revisiones que propaga los cambios en las copias de esta forma. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
239 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
240 Cuando su historial de cambios tiene un registro de la copia y la |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
241 subsecuente fusión, usualmente no es necesario propagar los cambios el |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
242 fichero oficinal a las copias del mismo, y por esta razón Mercurial |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
243 propaga únicamente los cambios en las copias hasta este punto y no más |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
244 allá. |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
245 |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
246 |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
247 \subsection{Cómo hacer que los cambios \emph{no} sigan a la copia?} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
248 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
249 Si por algún motivo usted decide que esta característica de |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
250 propagación automática de cambios en las copias no es para usted, use |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
251 la orden usual de sus sistema para copiar ficheros (En sistemas tipo |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
252 Unix, es \command{cp}), posteriormente use \hgcmd{add} sobre la nueva |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
253 copia hecha a mano. Antes de hacerlo, de todas maneras, relea la |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
254 sección~\ref{sec:daily:why-copy}, y tome una decisión asegurándose que |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
255 este comportamiento no es el apropiado para su caso específico. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
256 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
257 \subsection{Comportamiento de la orden \hgcmd{copy}} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
258 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
259 Cuando usa la orden \hgcmd{copy}, Mercurial hace una copia de cada |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
260 archivo fuente del directorio actual. Esto significa que si usted hace |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
261 modificaciones a un fichero, y le aplica \hgcmd{copy} sin haber |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
262 consignado primero los cambios, la nueva copia contendrá también las |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
263 modificaciones que haya hecho hasta ese punto. (Este comportamiento me |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
264 parece poco intuitivo, y por tal motivo lo menciono.) |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
265 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
266 La orden \hgcmd{copy} actua de forma parecida a la orden \command{cp} |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
267 de Unix(puede usar el alias \hgcmd{cp} si le es más cómodo). El |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
268 último argumento es el \emph{destino}, y todos los argumentos previos |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
269 son las \emph{fuentes}. Si solamente indica un fichero como la |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
270 fuente, y el destino no existe, se crea un fichero nuevo con ese nombre. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
271 \interaction{daily.copy.simple} |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
272 Si el destino es un directorio, Mercurial copia las fuentes en este. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
273 \interaction{daily.copy.dir-dest} |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
274 La copia de un directorio es recursiva, y preserva la estructura del |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
275 directorio fuente. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
276 \interaction{daily.copy.dir-src} |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
277 Si tanto la fuente como el destino son directorios, la estructura de |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
278 la fuente se recrea en el directorio destino. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
279 \interaction{daily.copy.dir-src-dest} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
280 |
458
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
281 De la misma forma como la orden \hgcmd{rename}, si copia un fichero |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
282 manualmente y desea que Mercurial sepa que ha copiado un fichero, |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
283 basta con aplicar la opción \hgopt{copy}{--after} a la orden |
854a70fc05c6
Translated copy section of daily.tex
Igor TAmara <igor@tamarapatino.org>
parents:
453
diff
changeset
|
284 \hgcmd{copy}. |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
285 \interaction{daily.copy.after} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
286 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
287 \section{Renaming files} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
288 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
289 It's rather more common to need to rename a file than to make a copy |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
290 of it. The reason I discussed the \hgcmd{copy} command before talking |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
291 about renaming files is that Mercurial treats a rename in essentially |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
292 the same way as a copy. Therefore, knowing what Mercurial does when |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
293 you copy a file tells you what to expect when you rename a file. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
294 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
295 When you use the \hgcmd{rename} command, Mercurial makes a copy of |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
296 each source file, then deletes it and marks the file as removed. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
297 \interaction{daily.rename.rename} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
298 The \hgcmd{status} command shows the newly copied file as added, and |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
299 the copied-from file as removed. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
300 \interaction{daily.rename.status} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
301 As with the results of a \hgcmd{copy}, we must use the |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
302 \hgopt{status}{-C} option to \hgcmd{status} to see that the added file |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
303 is really being tracked by Mercurial as a copy of the original, now |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
304 removed, file. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
305 \interaction{daily.rename.status-copy} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
306 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
307 As with \hgcmd{remove} and \hgcmd{copy}, you can tell Mercurial about |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
308 a rename after the fact using the \hgopt{rename}{--after} option. In |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
309 most other respects, the behaviour of the \hgcmd{rename} command, and |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
310 the options it accepts, are similar to the \hgcmd{copy} command. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
311 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
312 \subsection{Renaming files and merging changes} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
313 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
314 Since Mercurial's rename is implemented as copy-and-remove, the same |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
315 propagation of changes happens when you merge after a rename as after |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
316 a copy. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
317 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
318 If I modify a file, and you rename it to a new name, and then we merge |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
319 our respective changes, my modifications to the file under its |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
320 original name will be propagated into the file under its new name. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
321 (This is something you might expect to ``simply work,'' but not all |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
322 revision control systems actually do this.) |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
323 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
324 Whereas having changes follow a copy is a feature where you can |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
325 perhaps nod and say ``yes, that might be useful,'' it should be clear |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
326 that having them follow a rename is definitely important. Without |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
327 this facility, it would simply be too easy for changes to become |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
328 orphaned when files are renamed. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
329 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
330 \subsection{Divergent renames and merging} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
331 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
332 The case of diverging names occurs when two developers start with a |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
333 file---let's call it \filename{foo}---in their respective |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
334 repositories. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
335 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
336 \interaction{rename.divergent.clone} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
337 Anne renames the file to \filename{bar}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
338 \interaction{rename.divergent.rename.anne} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
339 Meanwhile, Bob renames it to \filename{quux}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
340 \interaction{rename.divergent.rename.bob} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
341 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
342 I like to think of this as a conflict because each developer has |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
343 expressed different intentions about what the file ought to be named. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
344 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
345 What do you think should happen when they merge their work? |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
346 Mercurial's actual behaviour is that it always preserves \emph{both} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
347 names when it merges changesets that contain divergent renames. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
348 \interaction{rename.divergent.merge} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
349 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
350 Notice that Mercurial does warn about the divergent renames, but it |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
351 leaves it up to you to do something about the divergence after the merge. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
352 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
353 \subsection{Convergent renames and merging} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
354 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
355 Another kind of rename conflict occurs when two people choose to |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
356 rename different \emph{source} files to the same \emph{destination}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
357 In this case, Mercurial runs its normal merge machinery, and lets you |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
358 guide it to a suitable resolution. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
359 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
360 \subsection{Other name-related corner cases} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
361 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
362 Mercurial has a longstanding bug in which it fails to handle a merge |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
363 where one side has a file with a given name, while another has a |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
364 directory with the same name. This is documented as~\bug{29}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
365 \interaction{issue29.go} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
366 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
367 \section{Recovering from mistakes} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
368 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
369 Mercurial has some useful commands that will help you to recover from |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
370 some common mistakes. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
371 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
372 The \hgcmd{revert} command lets you undo changes that you have made to |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
373 your working directory. For example, if you \hgcmd{add} a file by |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
374 accident, just run \hgcmd{revert} with the name of the file you added, |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
375 and while the file won't be touched in any way, it won't be tracked |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
376 for adding by Mercurial any longer, either. You can also use |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
377 \hgcmd{revert} to get rid of erroneous changes to a file. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
378 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
379 It's useful to remember that the \hgcmd{revert} command is useful for |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
380 changes that you have not yet committed. Once you've committed a |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
381 change, if you decide it was a mistake, you can still do something |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
382 about it, though your options may be more limited. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
383 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
384 For more information about the \hgcmd{revert} command, and details |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
385 about how to deal with changes you have already committed, see |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
386 chapter~\ref{chap:undo}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
387 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
388 %%% Local Variables: |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
389 %%% mode: latex |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
390 %%% TeX-master: "00book" |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
391 %%% End: |