Mercurial > hgbook
comparison ja/undo.tex @ 348:32d33b238b7e
made changes to the source files to be compiled at any rate.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Tue, 19 Aug 2008 16:03:33 +0900 |
parents | aa132d5e2b32 |
children | 8a3041e6f3cb |
comparison
equal
deleted
inserted
replaced
347:b3e736000aef | 348:32d33b238b7e |
---|---|
97 $B$/$3$H$,$G$-$k!%(B | 97 $B$/$3$H$,$G$-$k!%(B |
98 \interaction{rollback.rollback} | 98 \interaction{rollback.rollback} |
99 $B%A%'%s%8%;%C%H$O$j$]$8$H$j$NMzNr$K$b$O$dB8:_$;$:!$%o!<%-%s%0%G%#%l%/%H%j(B | 99 $B%A%'%s%8%;%C%H$O$j$]$8$H$j$NMzNr$K$b$O$dB8:_$;$:!$%o!<%-%s%0%G%#%l%/%H%j(B |
100 $B$N(B\filename{a}$B$OJQ99$5$l$?$HG'<1$5$l$k!%%3%_%C%H$7$F%m!<%k%P%C%/$9$k$H!$(B | 100 $B$N(B\filename{a}$B$OJQ99$5$l$?$HG'<1$5$l$k!%%3%_%C%H$7$F%m!<%k%P%C%/$9$k$H!$(B |
101 $B%o!<%-%s%0%G%#%l%/%H%j$O40A4$K%3%_%C%HA0$N>uBV$K$J$j!$%A%'%s%8%;%C%H$O40(B | 101 $B%o!<%-%s%0%G%#%l%/%H%j$O40A4$K%3%_%C%HA0$N>uBV$K$J$j!$%A%'%s%8%;%C%H$O40(B |
102 $BA4$K>C5n$5$l$k!%$3$N>uBV$G0BA4$K(B\hdcmd{add} \filename{b}$B$7!$$b$&0lEY(B | 102 $BA4$K>C5n$5$l$k!%$3$N>uBV$G0BA4$K(B\hgcmd{add} \filename{b}$B$7!$$b$&0lEY(B |
103 commit$B$9$k$3$H$,$G$-$k!%(B | 103 commit$B$9$k$3$H$,$G$-$k!%(B |
104 \interaction{rollback.rollback} | 104 \interaction{rollback.rollback} |
105 | 105 |
106 %\subsection{The erroneous pull} | 106 %\subsection{The erroneous pull} |
107 \subsection{$B8m$C$?%W%k(B} | 107 \subsection{$B8m$C$?%W%k(B} |
702 %directory. This sounds much simpler, but it would not work nearly as | 702 %directory. This sounds much simpler, but it would not work nearly as |
703 %well. | 703 %well. |
704 | 704 |
705 \hgcmd{backout}$B%3%^%s%I$r<BAu$9$kJL$NJ}K!$H$7$F!$(B\hgcmd{export}$B$G%P%C%/%"(B | 705 \hgcmd{backout}$B%3%^%s%I$r<BAu$9$kJL$NJ}K!$H$7$F!$(B\hgcmd{export}$B$G%P%C%/%"(B |
706 $B%&%H$5$l$k$Y$-%A%'%s%8%;%C%H$r(Bdiff$B$H$7$F=PNO$7!$(B | 706 $B%&%H$5$l$k$Y$-%A%'%s%8%;%C%H$r(Bdiff$B$H$7$F=PNO$7!$(B |
707 \command{patch}$B$r(B}\cmdopt{patch}{--reverse}$B%*%W%7%g%sIU$-$G8F$S!$%o!<%-%s(B | 707 \command{patch}$B$r(B\cmdopt{patch}{--reverse}$B%*%W%7%g%sIU$-$G8F$S!$%o!<%-%s(B |
708 $B%0%G%#%l%/%H%j$NA`:n$r>JN,$7$F%j%P!<%9%Q%C%A$9$kJ}K!$,9M$($i$l$k!%(B | 708 $B%0%G%#%l%/%H%j$NA`:n$r>JN,$7$F%j%P!<%9%Q%C%A$9$kJ}K!$,9M$($i$l$k!%(B |
709 $B$3$NJ}K!$O$:$C$HC1=c$@$,!$$[$H$s$I$&$^$/F0$+$J$$!%(B | 709 $B$3$NJ}K!$O$:$C$HC1=c$@$,!$$[$H$s$I$&$^$/F0$+$J$$!%(B |
710 | 710 |
711 %The reason that \hgcmd{backout} does an update, a commit, a merge, and | 711 %The reason that \hgcmd{backout} does an update, a commit, a merge, and |
712 %another commit is to give the merge machinery the best chance to do a | 712 %another commit is to give the merge machinery the best chance to do a |