1.1 --- a/es/tour-merge-merge.svg	Fri Oct 31 00:19:04 2008 -0500
     1.2 +++ b/es/tour-merge-merge.svg	Sun Nov 02 13:54:42 2008 -0500
     1.3 @@ -66,10 +66,10 @@
     1.4       inkscape:cy="790.24518"
     1.5       inkscape:document-units="px"
     1.6       inkscape:current-layer="layer1"
     1.7 -     inkscape:window-width="906"
     1.8 -     inkscape:window-height="659"
     1.9 -     inkscape:window-x="38"
    1.10 -     inkscape:window-y="95"
    1.11 +     inkscape:window-width="1278"
    1.12 +     inkscape:window-height="756"
    1.13 +     inkscape:window-x="0"
    1.14 +     inkscape:window-y="0"
    1.15       showgrid="false" />
    1.16    <metadata
    1.17       id="metadata7">
    1.18 @@ -185,25 +185,24 @@
    1.19         inkscape:connection-start="#rect2830" />
    1.20      <text
    1.21         xml:space="preserve"
    1.22 -       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
    1.23 +       style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"
    1.24         x="295.28571"
    1.25         y="217.56711"
    1.26 -       id="text2871"><tspan
    1.27 -         sodipodi:role="line"
    1.28 -         id="tspan2873"
    1.29 -         x="295.28571"
    1.30 -         y="217.56711">tip (and head)</tspan></text>
    1.31 -    <text
    1.32 -       xml:space="preserve"
    1.33 -       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
    1.34 -       x="76"
    1.35 -       y="264.91769"
    1.36 -       id="text2875"><tspan
    1.37 -         sodipodi:role="line"
    1.38 -         id="tspan2877"
    1.39 -         x="76"
    1.40 -         y="264.91769"
    1.41 -         style="text-align:end;text-anchor:end">principal</tspan></text>
    1.42 +       id="text2871"
    1.43 +       sodipodi:linespacing="125%"><tspan
    1.44 +         sodipodi:role="line"
    1.45 +         id="tspan2441">punta (y frente)</tspan></text>
    1.46 +    <text
    1.47 +       xml:space="preserve"
    1.48 +       style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
    1.49 +       x="57.817253"
    1.50 +       y="263.90753"
    1.51 +       id="text2875"
    1.52 +       sodipodi:linespacing="125%"><tspan
    1.53 +         sodipodi:role="line"
    1.54 +         id="tspan2439"
    1.55 +         x="57.817253"
    1.56 +         y="263.90753">frente</tspan></text>
    1.57      <rect
    1.58         style="fill:#c8aaa5;fill-opacity:1;stroke:#a07163;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1"
    1.59         id="rect1913"
    1.60 @@ -329,14 +328,15 @@
    1.61         inkscape:connector-type="polyline" />
    1.62      <text
    1.63         xml:space="preserve"
    1.64 -       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
    1.65 -       x="463.11224"
    1.66 -       y="169.78796"
    1.67 -       id="text2846"><tspan
    1.68 -         sodipodi:role="line"
    1.69 -         id="tspan2848"
    1.70 -         x="463.11224"
    1.71 -         y="169.78796">tip</tspan></text>
    1.72 +       style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
    1.73 +       x="452.00058"
    1.74 +       y="167.76765"
    1.75 +       id="text2846"
    1.76 +       sodipodi:linespacing="125%"><tspan
    1.77 +         sodipodi:role="line"
    1.78 +         id="tspan2443"
    1.79 +         x="452.00058"
    1.80 +         y="167.76765">punta</tspan></text>
    1.81      <path
    1.82         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
    1.83         d="M 489.37034,249.47656 L 524.65575,178.26229"

     2.1 --- a/es/tour-merge.tex	Fri Oct 31 00:19:04 2008 -0500
     2.2 +++ b/es/tour-merge.tex	Sun Nov 02 13:54:42 2008 -0500
     2.3 @@ -77,31 +77,33 @@
     2.4  repositorio usando el comando \hgcmd{heads}\ndt{Frentes.}.
     2.5  \interaction{tour.merge.heads}
     2.6  
     2.7 -\subsection{Performing the merge}
     2.8 -
     2.9 -What happens if we try to use the normal \hgcmd{update} command to
    2.10 -update to the new tip?
    2.11 +\subsection{Hacer la fusión}
    2.12 +
    2.13 +% TODO poner interrogante de apertura
    2.14 +Qué pasa si tratamos de usar el comando usual, \hgcmd{update}, para
    2.15 +actualizar el nuevo frente?
    2.16  \interaction{tour.merge.update}
    2.17 -Mercurial is telling us that the \hgcmd{update} command won't do a
    2.18 -merge; it won't update the working directory when it thinks we might
    2.19 -be wanting to do a merge, unless we force it to do so.  Instead, we
    2.20 -use the \hgcmd{merge} command to merge the two heads.
    2.21 +Mercurial nos indica que el comando \hgcmd{update} no hará la fusión;
    2.22 +no actualizará el directorio de trabajo cuando considera que lo que
    2.23 +deseamos hacer es una fusión, a menos que lo obliguemos a hacerlo.
    2.24 +En vez de \hgcmd{update}, usamos el comando \hgcmd{merge} para hacer
    2.25 +la fusión entre los dos frentes.
    2.26  \interaction{tour.merge.merge}
    2.27  
    2.28  \begin{figure}[ht]
    2.29    \centering
    2.30    \grafix{tour-merge-merge}
    2.31 -  \caption{Working directory and repository during merge, and
    2.32 -    following commit}
    2.33 +  \caption{Directorio de trabajo y repositorio durante la fusión, y
    2.34 +  consignación consecuente}
    2.35    \label{fig:tour-merge:merge}
    2.36  \end{figure}
    2.37  
    2.38 -This updates the working directory so that it contains changes from
    2.39 -\emph{both} heads, which is reflected in both the output of
    2.40 -\hgcmd{parents} and the contents of \filename{hello.c}.
    2.41 +Esto actualiza el directorio de trabajo, de tal forma que contenga los
    2.42 +cambios de \emph{ambos} frentes, lo que se ve reflejado tanto en la
    2.43 +salida de \hgcmd{parents} como en los contenidos de \filename{hello.c}.
    2.44  \interaction{tour.merge.parents}
    2.45  
    2.46 -\subsection{Committing the results of the merge}
    2.47 +\subsection{Consignar los resultados de la fusión}
    2.48  
    2.49  Whenever we've done a merge, \hgcmd{parents} will display two parents
    2.50  until we \hgcmd{commit} the results of the merge.