Mercurial > hgbook
annotate es/daily.tex @ 453:11d7896cd2ac
Merging changes from jerojasro
author | Igor TAmara <igor@tamarapatino.org> |
---|---|
date | Wed, 22 Oct 2008 01:51:33 -0500 |
parents | d8596cd12b41 |
children | 854a70fc05c6 |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
4 \section{Cómo indicarle a Mercurial qué archivos seguir} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
5 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
6 Mercurial no trabaja con archivos en su repositorio a menos que usted |
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á |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
8 cuáles archivos son desconocidos para Mercurial; emplea un |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
9 ``\texttt{?}'' para mostrar tales archivos. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
10 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
11 Para indicarle a Mercurial que tenga en cuenta un archivo, emplee la |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
12 orden \hgcmd{add}. Una vez que haya adicionado el archivo, la línea |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
13 referente al archivo al aplicar la orden \hgcmd{status} para tal |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
14 archivo cambia de ``\texttt{?}'' a ``\texttt{A}''. |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
17 Después de invocar \hgcmd{commit}, los archivos que haya adicionado |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
20 archivos ``interesantes''---los que usted haya modificado o a aquellos |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
23 archivos, inusualmente deseará saber cuáles de ellos están siendo |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
28 Cuando usted añade un archivo, Mercurial no hace nada con el inmediatamente. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
29 A cambio, tomará una instantánea del estado del archivo la próxima vez |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
31 haga sobre el archivo cada vez que consigne, hasta que usted lo elimine. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
32 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
33 \subsection{Nombramiento explicíto e implícito de archivos} |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
37 ``Deseo operar en cada archivo de este directorio y sus |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
41 los archivos que se adicionaron, mientras que no lo hizo en el ejemplo |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
42 anterior cuando adicionamos el archivo con nombre \filename{a}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
43 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
44 En el último caso hicimos explícito el nombre del archivo que |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
49 Cuando hacemos \emph{implícitos} los nombres de los archivos dando el |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
51 el nombre de cada archivo con el que va a hacer algo. Esto para |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
56 \subsection{Nota al margen:Mercurial trata archivos, no directorios} |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
59 lugar de eso tiene en cuenta las rutas de los archivos. Antes de |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
60 crear un archivo, primero crea todos los directorios que hagan falta |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
61 para completar la ruta del archivo. Después de borrar un archivo, |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
63 archivo borrado. Suena como una diferencia trivial, pero tiene una |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
75 un archivo ``escondido'' dentro de ese directorio. En sistemas tipo |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
76 Unix, cualquier archivo cuyo nombre comience con un punto |
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} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
82 \caption{Simular un directorio vacío con un archivo escondido} |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
86 Otra forma de abordar la necesidad de un archivo vacío es crear |
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 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
89 \section{Cómo dejar de hacer seguimiento a un archivo} |
444
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
90 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
91 Si decide que un archivo no pertenece a su repositorio, use la orden |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
92 \hgcmd{remove}; se borrará el archivo y le indicará a Mercurial que |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
93 deje de hacerle seguimiento. Los archivos eliminados se representan |
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 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
97 Después de hacer \hgcmd{remove} a un archivo, Mercurial dejará de |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
98 hacer seguimiento al mismo, incluso si recrea el archivo con el mismo |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
99 nombre en su directorio de trabajo. Si decide recrear un archivo con |
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 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
101 hacerle \hgcmd{add}. Mercurial sabrá que el archivo recientemente |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
102 adicionado no está relacionado con el archivo anterior que tenía el |
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 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
105 \subsection{Al eliminar un archivo 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 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
107 Es preciso tener en cuenta que al eliminar un archivo se tiene |
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 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
119 cual esl archivo que eliminó aún era tenido en cuenta, reaparecerá en |
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 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
122 trabajo a un conjunto de cambios posterior en el cual el archivo había |
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 |
453
11d7896cd2ac
Merging changes from jerojasro
Igor TAmara <igor@tamarapatino.org>
parents:
452
diff
changeset
|
126 \subsection{Archivos 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 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
128 Mercurial considera como \emph{perdido} un archivo que usted borró, |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
129 pero para el que no se usó \hgcmd{remove}. Los archivos perdidos se |
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}. |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
131 Las órdenes de Mercurial generalmente no harán nada con los archivos |
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 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
135 Si su repositorio contiene un archivo que \hgcmd{status} reporta como |
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 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
138 indicarle a Mercurial que usted deseaba borrar tal archivo. |
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 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
147 que elimine un archivo?} |
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 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
150 indique explícitamente que está borrando un archivo. Al principio del |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
151 desarrollo de Mercurial, este permitía que usted borrara el archivo |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
152 sin más; Mercurial se daría cuanta de la ausencia del archivo |
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 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
154 hacer seguimiento al archivo. En la práctica, resultaba muy sencillo |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
155 borrar un archivo 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 |
452
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
157 \subsection{Atajo útil---agregar y eliminar archivos en un solo paso} |
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 |
d8596cd12b41
Translated a few more bits of daily use translation
Igor TAmara <igor@tamarapatino.org>
parents:
444
diff
changeset
|
160 los archivos que no tienen seguimiento y marca los archivos faltantes |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
168 \section{Copying files} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
169 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
170 Mercurial provides a \hgcmd{copy} command that lets you make a new |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
171 copy of a file. When you copy a file using this command, Mercurial |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
172 makes a record of the fact that the new file is a copy of the original |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
173 file. It treats these copied files specially when you merge your work |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
174 with someone else's. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
175 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
176 \subsection{The results of copying during a merge} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
177 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
178 What happens during a merge is that changes ``follow'' a copy. To |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
179 best illustrate what this means, let's create an example. We'll start |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
180 with the usual tiny repository that contains a single file. |
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} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
182 We need to do some work in parallel, so that we'll have something to |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
183 merge. So let's clone our repository. |
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} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
185 Back in our initial repository, let's use the \hgcmd{copy} command to |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
186 make a copy of the first file we created. |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
189 If we look at the output of the \hgcmd{status} command afterwards, the |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
190 copied file looks just like a normal added file. |
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} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
192 But if we pass the \hgopt{status}{-C} option to \hgcmd{status}, it |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
193 prints another line of output: this is the file that our newly-added |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
197 Now, back in the repository we cloned, let's make a change in |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
198 parallel. We'll add a line of content to the original file that we |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
199 created. |
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} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
201 Now we have a modified \filename{file} in this repository. When we |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
202 pull the changes from the first repository, and merge the two heads, |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
203 Mercurial will propagate the changes that we made locally to |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
204 \filename{file} into its copy, \filename{new-file}. |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
207 \subsection{Why should changes follow copies?} |
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 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
210 This behaviour, of changes to a file propagating out to copies of the |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
211 file, might seem esoteric, but in most cases it's highly desirable. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
212 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
213 First of all, remember that this propagation \emph{only} happens when |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
214 you merge. So if you \hgcmd{copy} a file, and subsequently modify the |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
215 original file during the normal course of your work, nothing will |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
216 happen. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
217 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
218 The second thing to know is that modifications will only propagate |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
219 across a copy as long as the repository that you're pulling changes |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
220 from \emph{doesn't know} about the copy. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
221 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
222 The reason that Mercurial does this is as follows. Let's say I make |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
223 an important bug fix in a source file, and commit my changes. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
224 Meanwhile, you've decided to \hgcmd{copy} the file in your repository, |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
225 without knowing about the bug or having seen the fix, and you have |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
226 started hacking on your copy of the file. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
227 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
228 If you pulled and merged my changes, and Mercurial \emph{didn't} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
229 propagate changes across copies, your source file would now contain |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
230 the bug, and unless you remembered to propagate the bug fix by hand, |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
231 the bug would \emph{remain} in your copy of the file. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
232 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
233 By automatically propagating the change that fixed the bug from the |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
234 original file to the copy, Mercurial prevents this class of problem. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
235 To my knowledge, Mercurial is the \emph{only} revision control system |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
236 that propagates changes across copies like this. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
237 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
238 Once your change history has a record that the copy and subsequent |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
239 merge occurred, there's usually no further need to propagate changes |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
240 from the original file to the copied file, and that's why Mercurial |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
241 only propagates changes across copies until this point, and no |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
242 further. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
243 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
244 \subsection{How to make changes \emph{not} follow a copy} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
245 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
246 If, for some reason, you decide that this business of automatically |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
247 propagating changes across copies is not for you, simply use your |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
248 system's normal file copy command (on Unix-like systems, that's |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
249 \command{cp}) to make a copy of a file, then \hgcmd{add} the new copy |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
250 by hand. Before you do so, though, please do reread |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
251 section~\ref{sec:daily:why-copy}, and make an informed decision that |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
252 this behaviour is not appropriate to your specific case. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
253 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
254 \subsection{Behaviour of 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
|
255 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
256 When you use the \hgcmd{copy} command, Mercurial makes a copy of each |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
257 source file as it currently stands in the working directory. This |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
258 means that if you make some modifications to a file, then \hgcmd{copy} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
259 it without first having committed those changes, the new copy will |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
260 also contain the modifications you have made up until that point. (I |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
261 find this behaviour a little counterintuitive, which is why I mention |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
262 it here.) |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
263 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
264 The \hgcmd{copy} command acts similarly to the Unix \command{cp} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
265 command (you can use the \hgcmd{cp} alias if you prefer). The last |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
266 argument is the \emph{destination}, and all prior arguments are |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
267 \emph{sources}. If you pass it a single file as the source, and the |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
268 destination does not exist, it creates a new file with that name. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
269 \interaction{daily.copy.simple} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
270 If the destination is a directory, Mercurial copies its sources into |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
271 that directory. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
272 \interaction{daily.copy.dir-dest} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
273 Copying a directory is recursive, and preserves the directory |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
274 structure of the source. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
275 \interaction{daily.copy.dir-src} |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
276 If the source and destination are both directories, the source tree is |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
277 recreated in the destination directory. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
278 \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
|
279 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
280 As with the \hgcmd{rename} command, if you copy a file manually and |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
281 then want Mercurial to know that you've copied the file, simply use |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
282 the \hgopt{copy}{--after} option to \hgcmd{copy}. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
283 \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
|
284 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
285 \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
|
286 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
287 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
|
288 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
|
289 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
|
290 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
|
291 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
|
292 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
293 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
|
294 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
|
295 \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
|
296 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
|
297 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
|
298 \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
|
299 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
|
300 \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
|
301 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
|
302 removed, file. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
303 \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
|
304 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
305 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
|
306 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
|
307 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
|
308 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
|
309 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
310 \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
|
311 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
312 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
|
313 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
|
314 a copy. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
315 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
316 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
|
317 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
|
318 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
|
319 (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
|
320 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
|
321 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
322 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
|
323 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
|
324 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
|
325 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
|
326 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
|
327 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
328 \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
|
329 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
330 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
|
331 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
|
332 repositories. |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
333 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
334 \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
|
335 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
|
336 \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
|
337 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
|
338 \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
|
339 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
340 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
|
341 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
|
342 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
343 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
|
344 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
|
345 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
|
346 \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
|
347 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
348 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
|
349 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
|
350 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
351 \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
|
352 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
353 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
|
354 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
|
355 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
|
356 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
|
357 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
358 \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
|
359 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
360 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
|
361 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
|
362 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
|
363 \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
|
364 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
365 \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
|
366 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
367 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
|
368 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
|
369 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
370 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
|
371 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
|
372 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
|
373 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
|
374 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
|
375 \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
|
376 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
377 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
|
378 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
|
379 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
|
380 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
|
381 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
382 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
|
383 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
|
384 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
|
385 |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
386 %%% Local Variables: |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
387 %%% mode: latex |
6595729623f9
Instructions on contribute start daily.tex translation. Added words to Leame.1st
Igor TAmara <igor@tamarapatino.org>
parents:
432
diff
changeset
|
388 %%% 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
|
389 %%% End: |