Mercurial > hgbook
changeset 291:504f23b4f625
started japanese translation
| author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
|---|---|
| date | Thu, 07 Feb 2008 15:52:15 +0900 |
| parents | b0db5adf11c1 |
| children | f72e4be6dd37 |
| files | ja/cmdref.tex ja/undo.tex |
| diffstat | 2 files changed, 240 insertions(+), 112 deletions(-) [+] |
line wrap: on
line diff
--- a/ja/cmdref.tex Wed Feb 06 17:43:11 2008 +0900 +++ b/ja/cmdref.tex Thu Feb 07 15:52:15 2008 +0900 @@ -1,60 +1,92 @@ -\chapter{Command reference} +%\chapter{Command reference} +\chapter{$B%3%^%s%I%j%U%!%l%s%9(B} \label{cmdref} -\cmdref{add}{add files at the next commit} +\cmdref{add}{$B<!2s$N%3%_%C%H$G%U%!%$%k$rDI2C(B} \optref{add}{I}{include} \optref{add}{X}{exclude} \optref{add}{n}{dry-run} -\cmdref{diff}{print changes in history or working directory} +\cmdref{diff}{$B%R%9%H%j$^$?$O%o!<%-%s%0%G%#%l%/%H%jFb$NJQ99$rI=<((B} -Show differences between revisions for the specified files or -directories, using the unified diff format. For a description of the -unified diff format, see section~\ref{sec:mq:patch}. +%Show differences between revisions for the specified files or +%directories, using the unified diff format. For a description of the +%unified diff format, see section~\ref{sec:mq:patch}. + +$B;XDj$7$?%U%!%$%k!"%G%#%l%/%H%j$K$D$$$F%j%S%8%g%s4V$G$N:9J,$rI=<($9$k!#(B +$BI=<($K$O(Bunified diff$B%U%)!<%^%C%H$,MQ$$$i$l$k!#(Bunified diff$B%U%)!<%^%C%H(B +$B$K$D$$$F$N@bL@$O(B\ref{sec:mq:patch}$B$r;2>H$N$3$H!#(B -By default, this command does not print diffs for files that Mercurial -considers to contain binary data. To control this behaviour, see the -\hgopt{diff}{-a} and \hgopt{diff}{--git} options. +%By default, this command does not print diffs for files that Mercurial +%considers to contain binary data. To control this behaviour, see the +%\hgopt{diff}{-a} and \hgopt{diff}{--git} options. -\subsection{Options} +$B%G%U%)%k%H$G$O%P%$%J%j%G!<%?$H9M$($i$l$k%U%!%$%k$N:9J,$O=PNO$7$J$$!%$3$N(B +$B5sF0$O(B\hgopt{diff}{-a} $B$H(B \hgopt{diff}{--git}$B$K$h$C$FJQ99$G$-$k!%(B + + +\subsection{$B%*%W%7%g%s(B} \loptref{diff}{nodates} -Omit date and time information when printing diff headers. +%Omit date and time information when printing diff headers. + +diff$B%X%C%@$+$iF|IU$H;~4V>pJs$r>JN,$9$k!%(B \optref{diff}{B}{ignore-blank-lines} -Do not print changes that only insert or delete blank lines. A line -that contains only whitespace is not considered blank. +%Do not print changes that only insert or delete blank lines. A line +%that contains only whitespace is not considered blank. + +$B6u9T$NA^F~$^$?$O:o=|$@$1$NJQ99$rI=<($7$J$$!%6uGrJ8;z$,4^$^$l$k9T$O6u9T$H(B +$B$O8+$J$5$l$J$$!%(B \optref{diff}{I}{include} -Include files and directories whose names match the given patterns. +%Include files and directories whose names match the given patterns. + +$B;XDj$7$?%Q%?!<%s$H%^%C%A$9$k%U%!%$%k$^$?$O%G%#%l%/%H%j$rBP>]$K2C$($k(B \optref{diff}{X}{exclude} -Exclude files and directories whose names match the given patterns. +%Exclude files and directories whose names match the given patterns. + +$B;XDj$7$?%Q%?!<%s$H%^%C%A$9$k%U%!%$%k$^$?$O%G%#%l%/%H%j$rBP>]$+$i=|30$9$k(B \optref{diff}{a}{text} -If this option is not specified, \hgcmd{diff} will refuse to print -diffs for files that it detects as binary. Specifying \hgopt{diff}{-a} -forces \hgcmd{diff} to treat all files as text, and generate diffs for -all of them. +%If this option is not specified, \hgcmd{diff} will refuse to print +%diffs for files that it detects as binary. Specifying \hgopt{diff}{-a} +%forces \hgcmd{diff} to treat all files as text, and generate diffs for +%all of them. -This option is useful for files that are ``mostly text'' but have a -few embedded NUL characters. If you use it on files that contain a -lot of binary data, its output will be incomprehensible. +$B$3$N%*%W%7%g%s$,;XDj$5$l$J$1$l$P(B\hgcmd{diff}$B$O%P%$%J%j$HH=Dj$5$l$?%U%!%$(B +$B%k$KBP$9$k(Bdiff$B$N@8@.$r9T$J$o$J$$!%(B\hgopt{diff}{-a}$B$r;XDj$9$k$H(B +\hgcmd{diff}$B$OA4$F$N%U%!%$%k$r%F%-%9%H$H$7$F07$$!$A4$F$N%U%!%$%k$KBP$7$F(B +diff$B$r@8@.$9$k!%(B + +%This option is useful for files that are ``mostly text'' but have a +%few embedded NUL characters. If you use it on files that contain a +%lot of binary data, its output will be incomprehensible. + +$B$3$N%*%W%7%g%s$O!$$[$\A4$F$,%F%-%9%H$@$,0lIt$K(BNUL$BJ8;z$r4^$s$G$$$k$h$&$J%U%!(B +$B%$%k$KBP$7$FM-MQ$G$"$k!%$3$N%*%W%7%g%s$r%P%$%J%j%G!<%?$,B?$/4^$^$l$k%U%!(B +$B%$%k$KE,MQ$9$k$HL50UL#$J=PNO$K$J$k$@$m$&!%(B \optref{diff}{b}{ignore-space-change} -Do not print a line if the only change to that line is in the amount -of white space it contains. +%Do not print a line if the only change to that line is in the amount +%of white space it contains. + +$B6uGr$NJQ99$N$_$N9T$K$D$$$F=PNO$7$J$$!%(B \optref{diff}{g}{git} -Print \command{git}-compatible diffs. XXX reference a format -description. +%Print \command{git}-compatible diffs. XXX reference a format +%description. + +\command{git}$B8_49$N(Bdiff$B$r=PNO$9$k!%(B + \optref{diff}{p}{show-function}
--- a/ja/undo.tex Wed Feb 06 17:43:11 2008 +0900 +++ b/ja/undo.tex Thu Feb 07 15:52:15 2008 +0900 @@ -1,99 +1,178 @@ -\chapter{Finding and fixing your mistakes} +%\chapter{Finding and fixing your mistakes} +\chapter{$B%_%9$NH/8+$H=$@5(B} \label{chap:undo} -To err might be human, but to really handle the consequences well -takes a top-notch revision control system. In this chapter, we'll -discuss some of the techniques you can use when you find that a -problem has crept into your project. Mercurial has some highly -capable features that will help you to isolate the sources of -problems, and to handle them appropriately. +%To err might be human, but to really handle the consequences well +%takes a top-notch revision control system. In this chapter, we'll +%discuss some of the techniques you can use when you find that a +%problem has crept into your project. Mercurial has some highly +%capable features that will help you to isolate the sources of +%problems, and to handle them appropriately. -\section{Erasing local history} +$B%j%S%8%g%s%3%s%H%m!<%k%7%9%F%`$K$O?M$NHH$7$?4V0c$$$r$&$^$/=hM}$9$k5!G=$,(B +$B5a$a$i$l$F$$$k!%$3$N>O$G$O!$%W%m%8%'%/%H$K5/$3$jF@$kLdBj$N2r7h$KMxMQ2DG=(B +$B$J%F%/%K%C%/$K$D$$$F=R$Y$k!%(BMercurial$B$K$OLdBj$N$"$k%=!<%9$r@Z$jJ,$1!$=hM}(B +$B$9$k6/NO$J5!G=$,$"$k!%(B + + +%\section{Erasing local history} +\section{$B%m!<%+%k%R%9%H%j!<$r>C5n$9$k(B} -\subsection{The accidental commit} +%\subsection{The accidental commit} +\subsection{$B%"%/%7%G%s%H$K$h$k%3%_%C%H(B} + +%I have the occasional but persistent problem of typing rather more +%quickly than I can think, which sometimes results in me committing a +%changeset that is either incomplete or plain wrong. In my case, the +%usual kind of incomplete changeset is one in which I've created a new +%source file, but forgotten to \hgcmd{add} it. A ``plain wrong'' +%changeset is not as common, but no less annoying. -I have the occasional but persistent problem of typing rather more -quickly than I can think, which sometimes results in me committing a -changeset that is either incomplete or plain wrong. In my case, the -usual kind of incomplete changeset is one in which I've created a new -source file, but forgotten to \hgcmd{add} it. A ``plain wrong'' -changeset is not as common, but no less annoying. +$BI.<T$K$O%?%$%T%s%0Cf$K9M$($k$h$j$b@h$K;X$,F0$$$F$7$^$&JJ$,0JA0$+$i$"$j!$(B +$B$?$^$K$3$l$,5/$-$k$H!$IT40A4$@$C$?$j4V0c$C$?FbMF$N%A%'%s%8%;%C%H$r%3%_%C(B +$B%H$7$F$7$^$&!%I.<T$N>l9g!$IT40A4$J%A%'%s%8%;%C%H$NE57?$O?7$7$$%=!<%9%U%!(B +$B%$%k$r:n@.$7$?$N$K(B\hgcmd{add}$B$rK:$l$k$3$H$G!$(B``$B4V0c$C$?FbMF(B''$B$N%3%_%C%H(B +$B$O$"$^$j5/$-$J$$$,!$$d$O$jF1$8$h$&$KLq2p$G$"$k!%(B -\subsection{Rolling back a transaction} + +%\subsection{Rolling back a transaction} +\subsection{$B%H%i%s%6%/%7%g%s$N%m!<%k%P%C%/(B} \label{sec:undo:rollback} -In section~\ref{sec:concepts:txn}, I mentioned that Mercurial treats -each modification of a repository as a \emph{transaction}. Every time -you commit a changeset or pull changes from another repository, -Mercurial remembers what you did. You can undo, or \emph{roll back}, -exactly one of these actions using the \hgcmd{rollback} command. (See -section~\ref{sec:undo:rollback-after-push} for an important caveat -about the use of this command.) +%In section~\ref{sec:concepts:txn}, I mentioned that Mercurial treats +%each modification of a repository as a \emph{transaction}. Every time +%you commit a changeset or pull changes from another repository, +%Mercurial remembers what you did. You can undo, or \emph{roll back}, +%exactly one of these actions using the \hgcmd{rollback} command. (See +%section~\ref{sec:undo:rollback-after-push} for an important caveat +%about the use of this command.) + +\ref{sec:concepts:txn}$B@a$G!$(BMercurial$B$O%j%]%8%H%j$X$N8D!9$NJQ99$r(B\emph{$B%H(B +$B%i%s%6%/%7%g%s(B}$B$H$7$F07$&$H$$$&$3$H$r=R$Y$?!%(BMercurial$B$O!$JL$N%j%]%8%H%j(B +$B$X$N%A%'%s%8%;%C%H$N%3%_%C%H$dJQ99$N(Bpull$B$r5-21$7$F$$$k!%%f!<%6$O(Bundo$B$7$?(B +$B$j!$0l2s$K8B$j%"%/%7%g%s$r(B\hgcmd{rollback}$B%3%^%s%I$G(B\emph{$B%m!<%k%P%C%/(B}$B$9(B +$B$k$3$H$,$G$-$k!%(B($B$3$N%3%^%s%I$N=EMW$J@)Ls$K$D$$$F$O(B +\ref{sec:undo:rollback-after-push}$B$r;2>H$N$3$H!%(B) + -Here's a mistake that I often find myself making: committing a change -in which I've created a new file, but forgotten to \hgcmd{add} it. +%Here's a mistake that I often find myself making: committing a change +%in which I've created a new file, but forgotten to \hgcmd{add} it. +%\interaction{rollback.commit} +%Looking at the output of \hgcmd{status} after the commit immediately +%confirms the error. +%\interaction{rollback.status} +%The commit captured the changes to the file \filename{a}, but not the +%new file \filename{b}. If I were to push this changeset to a +%repository that I shared with a colleague, the chances are high that +%something in \filename{a} would refer to \filename{b}, which would not +%be present in their repository when they pulled my changes. I would +%thus become the object of some indignation. + +$BI.<T$,NI$/5/$3$9%_%9$O!$?7$7$$%U%!%$%k$r:n@.$7$?%A%'%s%8%;%C%H$r%3%_%C%H(B +$B$9$k;~$K(B\hgcmd{add}$B$N<B9T$rK:$l$k$b$N$G$"$k!%(B \interaction{rollback.commit} -Looking at the output of \hgcmd{status} after the commit immediately -confirms the error. +$B%3%_%C%H8e$N(B\hgcmd{status}$B$N=PNO$r8+$k$H!$D>$A$K%(%i!<$rI=<($7$F$$$k$3$H(B +$B$,$o$+$k!%(B \interaction{rollback.status} -The commit captured the changes to the file \filename{a}, but not the -new file \filename{b}. If I were to push this changeset to a -repository that I shared with a colleague, the chances are high that -something in \filename{a} would refer to \filename{b}, which would not -be present in their repository when they pulled my changes. I would -thus become the object of some indignation. +$B%3%_%C%H$O(B\filename{a}$B$X$NJQ99$r4^$s$G$$$k$,!$(B\filename{b}$B$X$NJQ99$O4^$s(B +$B$G$$$J$$!%$3$3$G;d$,F1N=$H6&M-$7$F$$$k%j%]%8%H%j$X%A%'%s%8%;%C%H$N%W%C%7%e(B +$B$r9T$J$C$?$H$7$?$i!$H`$i$,JQ99$r%W%k$7$?;~!$(B\filename{a}$B$NCf$N2?$+$,H`$i(B +$B$N%j%]%8%H%j$K4^$^$l$J$$(B\filename{b}$B$X$N;2>H$r9T$J$&2DG=@-$O9b$$!%$=$&$J$C(B +$B$?$iI.<T$OF1N=$NE\$j$rGc$&$3$H$K$J$k$@$m$&!%(B -However, luck is with me---I've caught my error before I pushed the -changeset. I use the \hgcmd{rollback} command, and Mercurial makes -that last changeset vanish. +%However, luck is with me---I've caught my error before I pushed the +%changeset. I use the \hgcmd{rollback} command, and Mercurial makes +%that last changeset vanish. +%\interaction{rollback.rollback} +%Notice that the changeset is no longer present in the repository's +%history, and the working directory once again thinks that the file +%\filename{a} is modified.The commit and rollback have left the +%working directory exactly as it was prior to the commit; the changeset +%has been completely erased. I can now safely \hgcmd{add} the file +%\filename{b}, and rerun my commit. +%\interaction{rollback.add} + +$B$7$+$79%1?$K$b%A%'%s%8%;%C%H$r%W%C%7%e$9$kA0$K%(%i!<$K5$$E$$$?>l9g!$(B +\hgcmd{rollback}$B%3%^%s%I$r;HMQ$9$k$3$H$G(BMercurial$B$+$i:G8e$N99?7$r<h$j=|(B +$B$/$3$H$,$G$-$k!%(B \interaction{rollback.rollback} -Notice that the changeset is no longer present in the repository's -history, and the working directory once again thinks that the file -\filename{a} is modified. The commit and rollback have left the -working directory exactly as it was prior to the commit; the changeset -has been completely erased. I can now safely \hgcmd{add} the file -\filename{b}, and rerun my commit. -\interaction{rollback.add} +$B%A%'%s%8%;%C%H$O$j$]$8$H$j$NMzNr$K$b$O$dB8:_$;$:!$%o!<%-%s%0%G%#%l%/%H%j(B +$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 +$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 +$BA4$K>C5n$5$l$k!%$3$N>uBV$G0BA4$K(B\hdcmd{add} \filename{b}$B$7!$$b$&0lEY(B +commit$B$9$k$3$H$,$G$-$k!%(B +\interaction{rollback.rollback} + +%\subsection{The erroneous pull} +\subsection{$B8m$C$?%W%k(Bl} -\subsection{The erroneous pull} +%It's common practice with Mercurial to maintain separate development +%branches of a project in different repositories. Your development +%team might have one shared repository for your project's ``0.9'' +%release, and another, containing different changes, for the ``1.0'' +%release. -It's common practice with Mercurial to maintain separate development -branches of a project in different repositories. Your development -team might have one shared repository for your project's ``0.9'' -release, and another, containing different changes, for the ``1.0'' -release. +Mercurial$B$r;H$C$FJL!9$N3+H/%V%i%s%A$rJL!9$N%j%]%8%H%j$G4IM}$9$k$3$H$,$h$/(B +$B$"$k!%$"$J$?$N3+H/%A!<%`$O%W%m%8%'%/%H$N%j%j!<%9(B0.9$B$N$?$a$K(B1$B$D$N6&M-%j%](B +$B%8%H%j$r;}$A!$%j%j!<%9(B1.0$B$N$?$a$K0[$J$kJQ99$r;}$C$?$b$&0l$DJL$N%j%]%8%H(B +$B%j$r$b$C$F$$$k!%(B -Given this, you can imagine that the consequences could be messy if -you had a local ``0.9'' repository, and accidentally pulled changes -from the shared ``1.0'' repository into it. At worst, you could be -paying insufficient attention, and push those changes into the shared -``0.9'' tree, confusing your entire team (but don't worry, we'll -return to this horror scenario later). However, it's more likely that -you'll notice immediately, because Mercurial will display the URL it's -pulling from, or you will see it pull a suspiciously large number of -changes into the repository. +%Given this, you can imagine that the consequences could be messy if +%you had a local ``0.9'' repository, and accidentally pulled changes +%from the shared ``1.0'' repository into it. At worst, you could be +%paying insufficient attention, and push those changes into the shared +%``0.9'' tree, confusing your entire team (but don't worry, we'll +%return to this horror scenario later). However, it's more likely that +%you'll notice immediately, because Mercurial will display the URL it's +%pulling from, or you will see it pull a suspiciously large number of +%changes into the repository. -The \hgcmd{rollback} command will work nicely to expunge all of the -changesets that you just pulled. Mercurial groups all changes from -one \hgcmd{pull} into a single transaction, so one \hgcmd{rollback} is -all you need to undo this mistake. +$B$3$3$G$"$J$?$O8m$C$F%m!<%+%k$N(B0.9$B%j%]%8%H%j$K6&M-(B1.0$B%j%]%8%H%j$+$i%W%k$7(B +$B$?$H$9$k!%:G0-$N>l9g!$==J,Cm0U$;$:!$$3$l$r6&M-$N(B0.9$B%j%]%8%H%j$K=q$-La$7$F(B +$B$7$^$$!$3+H/%A!<%`A4BN$r:.Mp$5$;$F$7$^$&$3$H$,M-$jF@$k!%!J$3$N>l9g$I$&$9(B +$B$l$P$$$$$N$+$K$D$$$F$O8e=R$9$k!%!K$7$+$7(BMercurial$B$O%W%k85$N(BURL$B$H5?$$$r;}(B +$B$D$K==J,$J5pBg$JJQ99$rI=<($9$k$?$a!$B(:B$K5$$E$/2DG=@-$,9b$$!%(B -\subsection{Rolling back is useless once you've pushed} +%The \hgcmd{rollback} command will work nicely to expunge all of the +%changesets that you just pulled. Mercurial groups all changes from +%one \hgcmd{pull} into a single transaction, so one \hgcmd{rollback} is +%all you need to undo this mistake. + +\hgcmd{rollback}$B%3%^%s%I$r<B9T$9$l$P!$:#%W%k$7$?$P$+$j$N%A%'%s%8%;%C%H$r(B +$BA4$F>C5n$9$k$3$H$,$G$-$k!%(BMercurial$B$O0l2s(B\hgcmd{pull}$B$K$h$k%H%i%s%6%/%7%g(B +$B%s$G$b$?$i$5$l$?A4$F$N%A%'%s%8%;%C%H$r%0%k!<%W2=$7$F$$$k$N$G!$(B +\hgcmd{rollback}$B$r0lEY<B9T$9$k$@$1$G!$%_%9$rA4$F$d$jD>$9$3$H$,$G$-$k!%(B + + +%\subsection{Rolling back is useless once you've pushed} +\subsection{$B0lEY%W%C%7%e$7$?8e$G$O%m!<%k%P%C%/$G$-$J$$(B} \label{sec:undo:rollback-after-push} -The value of the \hgcmd{rollback} command drops to zero once you've -pushed your changes to another repository. Rolling back a change -makes it disappear entirely, but \emph{only} in the repository in -which you perform the \hgcmd{rollback}. Because a rollback eliminates -history, there's no way for the disappearance of a change to propagate -between repositories. +%The value of the \hgcmd{rollback} command drops to zero once you've +%pushed your changes to another repository. Rolling back a change +%makes it disappear entirely, but \emph{only} in the repository in +%which you perform the \hgcmd{rollback}. Because a rollback eliminates +%history, there's no way for the disappearance of a change to propagate +%between repositories. + +$BB>$N%j%]%8%H%j$KJQ99$r%W%C%7%e$7$?8e$G$O(B\hgcmd{rollback}$B$N2ACM$O%<%m$G$"(B +$B$k!%JQ99$r%m!<%k%P%C%/$9$k$3$H$K$h$C$FJQ99$O40A4$K>CLG$9$k$,!$$=$l$O$"$J(B +$B$?$,(B\hgcmd{rollback}$B$r<B9T$7$?%j%]%8%H%j$K8B$C$F$N$3$H$G$"$k!%%m!<%k%P%C(B +$B%/$K$h$C$F!JJQ99$N!KMzNr<+BN$,$J$+$C$?$3$H$K$J$k$N$G!$JQ99$N>CLG$rB>$N%j(B +$B%]%8%H%j$KGH5Z$5$;$k<jCJ$O$J$$!%(B -If you've pushed a change to another repository---particularly if it's -a shared repository---it has essentially ``escaped into the wild,'' -and you'll have to recover from your mistake in a different way. What -will happen if you push a changeset somewhere, then roll it back, then -pull from the repository you pushed to, is that the changeset will -reappear in your repository. +%If you've pushed a change to another repository---particularly if it's a +%shared repository---it has essentially ``escaped into the wild,'' and +%you'll have to recover from your mistake in a different way. What will +%happen if you push a changeset somewhere, then roll it back, then pull +%from the repository you pushed to, is that the changeset will reappear +%in your repository. + +$B$b$7$"$J$?$,B>$N%j%]%8%H%j!JFC$K6&M-%j%]%8%H%j!K$KJQ99$r%W%C%7%e$7$F$$$k(B +$B$N$J$i!$:$$C$?;vBV$,5/$3$C$F$*$j!$JL$NJ}K!$G%_%9$+$iI|5l$9$kI,MW$,$"$k!%(B +$B%A%'%s%8%;%C%H$r$I$3$+$X%W%C%7%e$7$?8e$G%m!<%k%P%C%/$7!$%W%C%7%e@h$N%j%](B +$B%8%H%j$+$i:F$S%W%k$7$?>l9g!$%A%'%s%8%;%C%H$,%m!<%+%k%j%]%8%H%j$K:F$S8=$l(B +$B$k!%(B (If you absolutely know for sure that the change you want to roll back is the most recent change in the repository that you pushed to, @@ -104,19 +183,36 @@ you don't directly control (or have forgotten about), and come back to bite you.) -\subsection{You can only roll back once} +$B!J$b$7%m!<%k%P%C%/$7$?$$%A%'%s%8%;%C%H$,%W%C%7%e@h$N%j%]%8%H%j$G:G?7$G$"(B +$B$j!$$+$D!$C/$b$=$l$r%W%k$7$F$$$J$$$3$H$,3N<B$G$"$k>l9g$O!$%W%C%7%e@h$N%j(B +$B%]%8%H%j$G%m!<%k%P%C%/$9$k$3$H$,2DG=$@$,!$$3$NJ}K!$O3N<B$G$O$J$$$H$$$&$3(B +$B$H$r4N$KL?$8$F$*$/$Y$-$G$"$k!%$3$NJ}K!$OD>@\%3%s%H%m!<%k$G$-$J$+$C$?$j!$(B +$B$=$NJ}K!$rK:$l$F$7$^$C$?%j%]%8%H%j$X$NJQ99$N=$@5$K$O;H$($J$$!%!K(B + + +%\subsection{You can only roll back once} +\subsection{$B%m!<%k%P%C%/$O0l2s$N$_(B} -Mercurial stores exactly one transaction in its transaction log; that -transaction is the most recent one that occurred in the repository. -This means that you can only roll back one transaction. If you expect -to be able to roll back one transaction, then its predecessor, this is -not the behaviour you will get. +%Mercurial stores exactly one transaction in its transaction log; that +%transaction is the most recent one that occurred in the repository. +%This means that you can only roll back one transaction. If you expect +%to be able to roll back one transaction, then its predecessor, this is +%not the behaviour you will get. +%\interaction{rollback.twice} +%Once you've rolled back one transaction in a repository, you can't +%roll back again in that repository until you perform another commit or +%pull. + +Mercurial$B$O%H%i%s%6%/%7%g%s%m%0$K$=$N%j%]%8%H%j$K5/$3$C$?:G$b?7$7$$%H%i%s(B +$B%6%/%7%g%s0l2sJ,$N$_$r5-O?$7$F$$$k!%%m!<%k%P%C%/0l2sKh$K0l$DA0$N%j%S%8%g(B +$B%s$KLa$k$o$1$G$O$J$$!%(B \interaction{rollback.twice} -Once you've rolled back one transaction in a repository, you can't -roll back again in that repository until you perform another commit or -pull. +$B%j%]%8%H%j$J$$$G0lEY%m!<%k%P%C%/$7$?$i!$JL$N%3%_%C%H$r$9$k$+%W%k$r$9$k$^(B +$B$G%m!<%k%P%C%/$O$G$-$J$$!%(B -\section{Reverting the mistaken change} + +%\section{Reverting the mistaken change} +\section{$B4V0c$C$?JQ99$r85$KLa$9(B} If you make a modification to a file, and decide that you really didn't want to change the file at all, and you haven't yet committed @@ -758,6 +854,6 @@ \hgcmd{bisect} must perform, thanks to its logarithmic behaviour. %%% Local Variables: -%%% mode: latex +%%% mode: yatex %%% TeX-master: "00book" %%% End: