Mercurial > hgbook
comparison ja/tour-merge.tex @ 835:8a3041e6f3cb
reflect comments by Hiroshi Someya.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 11 Jul 2009 19:25:35 +0900 |
parents | 7107b79427a3 |
children |
comparison
equal
deleted
inserted
replaced
834:896ab6eaf1c6 | 835:8a3041e6f3cb |
---|---|
82 | 82 |
83 %A head is a change that has no descendants, or children, as they're | 83 %A head is a change that has no descendants, or children, as they're |
84 %also known. The tip revision is thus a head, because the newest | 84 %also known. The tip revision is thus a head, because the newest |
85 %revision in a repository doesn't have any children, but a repository | 85 %revision in a repository doesn't have any children, but a repository |
86 %can contain more than one head. | 86 %can contain more than one head. |
87 head$B$O;RB9$d;R$r;}$?$J$$JQ99$G$"$k!%%j%]%8%H%j$N:G?7$N%j%S%8%g%s$O;R$r;}(B | 87 head$B$O;R$d$=$N;RB9$r;}$?$J$$JQ99$G$"$k!%%j%]%8%H%j$N:G?7$N%j%S%8%g%s$O;R(B |
88 $B$?$J$$$?$a!$(Btip$B%j%S%8%g%s$O$9$J$o$A(Bhead$B$G$"$k!%0lJ}$G%j%]%8%H%j$OJ#?t$N(B | 88 $B$r;}$?$J$$$?$a!$(Btip$B%j%S%8%g%s$O$9$J$o$A(Bhead$B$G$"$k!%0lJ}$G%j%]%8%H%j$OJ#?t(B |
89 head$B$r;}$AF@$k!%(B | 89 $B$N(Bhead$B$r;}$AF@$k!%(B |
90 | 90 |
91 \begin{figure}[ht] | 91 \begin{figure}[ht] |
92 \centering | 92 \centering |
93 \grafix{tour-merge-pull} | 93 \grafix{tour-merge-pull} |
94 % \caption{Repository contents after pulling from \dirname{my-hello} into | 94 % \caption{Repository contents after pulling from \dirname{my-hello} into |
155 | 155 |
156 %Whenever we've done a merge, \hgcmd{parents} will display two parents | 156 %Whenever we've done a merge, \hgcmd{parents} will display two parents |
157 %until we \hgcmd{commit} the results of the merge. | 157 %until we \hgcmd{commit} the results of the merge. |
158 %\interaction{tour.merge.commit} | 158 %\interaction{tour.merge.commit} |
159 | 159 |
160 $B%^!<%8$r9T$&$H!$%^!<%8$N7k2L$r(B\hgcmd{commit}$B$9$k$^$G!$(B\hgcmd{parents}$B$O(B2 | 160 $B%^!<%8$r9T$&$H!$%^!<%8$N7k2L$r(B\hgcmd{commit}$B$9$k$^$G!$(B\hgcmd{parents}$B$O(B |
161 $B$D$N%Z%"%l%s%H$rI=<($9$k!%(B | 161 $B?F(B2$B$D$rI=<($9$k!%(B |
162 \interaction{tour.merge.commit} | 162 \interaction{tour.merge.commit} |
163 | 163 |
164 %We now have a new tip revision; notice that it has \emph{both} of | 164 %We now have a new tip revision; notice that it has \emph{both} of |
165 %our former heads as its parents. These are the same revisions that | 165 %our former heads as its parents. These are the same revisions that |
166 %were previously displayed by \hgcmd{parents}. | 166 %were previously displayed by \hgcmd{parents}. |
281 \begin{itemize} | 281 \begin{itemize} |
282 %\item At the left is the \emph{base} version of the file, i.e.~the | 282 %\item At the left is the \emph{base} version of the file, i.e.~the |
283 % most recent version from which the two versions we're trying to | 283 % most recent version from which the two versions we're trying to |
284 % merge are descended. | 284 % merge are descended. |
285 \item $B:8$K$"$k$N$O%U%!%$%k$N(B\emph{$B%Y!<%9(B}$B%P!<%8%g%s$G$"$k!%$3$l$O$3$l$+(B | 285 \item $B:8$K$"$k$N$O%U%!%$%k$N(B\emph{$B%Y!<%9(B}$B%P!<%8%g%s$G$"$k!%$3$l$O$3$l$+(B |
286 $B$i%^!<%8$7$h$&$H$9$k(B2$B$D$N%P!<%8%g%s$N?F$H$J$k:G$b:G6a$N%P!<%8%g%s(B | 286 $B$i%^!<%8$7$h$&$H$9$k(B2$B$D$N%P!<%8%g%s$N?F$H$J$k:G$b?7$7$$%P!<%8%g%s(B |
287 $B$G$"$k!%(B | 287 $B$G$"$k!%(B |
288 | 288 |
289 %\item In the middle is ``our'' version of the file, with the contents | 289 %\item In the middle is ``our'' version of the file, with the contents |
290 % that we modified. | 290 % that we modified. |
291 \item $BCf1{$K$"$k$N$O2f!9$,JQ99$r2C$($?%P!<%8%g%s$G$"$k!%(B | 291 \item $BCf1{$K$"$k$N$O2f!9$,JQ99$r2C$($?%P!<%8%g%s$G$"$k!%(B |
434 %extend its functionality, while keeping the core of Mercurial small | 434 %extend its functionality, while keeping the core of Mercurial small |
435 %and easy to deal with. Some extensions add new commands that you can | 435 %and easy to deal with. Some extensions add new commands that you can |
436 %use from the command line, while others work ``behind the scenes,'' | 436 %use from the command line, while others work ``behind the scenes,'' |
437 %for example adding capabilities to the server. | 437 %for example adding capabilities to the server. |
438 | 438 |
439 Mercurial$B$O%3%"$r>.$5$/!$07$$$d$9$/J]$C$?$^$^5!G=$r3HD%$G$-$k=@Fp$J%(%96e(B | 439 Mercurial$B$O%3%"$r>.$5$/!$07$$$d$9$/J]$C$?$^$^5!G=$r3HD%$G$-$k=@Fp$J%(%/%9(B |
440 $B%F%s%7%g%s%a%+%K%:%`$rDs6!$7$F$$$k!%%3%^%s%I%i%$%s$+$iMxMQ$G$-$k?7$7$$%3(B | 440 $B%F%s%7%g%s%a%+%K%:%`$rDs6!$7$F$$$k!%%3%^%s%I%i%$%s$+$iMxMQ$G$-$k?7$7$$%3(B |
441 $B%^%s%I$rDI2C$9$k$h$&$J%(%/%9%F%s%7%g%s$b$"$l$P!$L\$K8+$($J$$$H$3$m$GNc$((B | 441 $B%^%s%I$rDI2C$9$k$h$&$J%(%/%9%F%s%7%g%s$b$"$l$P!$L\$K8+$($J$$$H$3$m$GNc$((B |
442 $B$P%5!<%P$K5!G=$rDI2C$9$k$h$&$J$b$N$b$"$k!%(B | 442 $B$P%5!<%P$K5!G=$rDI2C$9$k$h$&$J$b$N$b$"$k!%(B |
443 | 443 |
444 %The \hgext{fetch} extension adds a new command called, not | 444 %The \hgext{fetch} extension adds a new command called, not |