changeset 794:41bb6ec2ca27

Propagate c36a6f534b99 Fix named branching book section. 'hg update -C branchname' is no longer required to jump from one named branch to another one; this can also be done simply using 'hg update branchname'.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 18 Jun 2009 16:23:58 +0900
parents fa1c3715254d
children 4eb02bea1666
files ja/branch.tex
diffstat 1 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ja/branch.tex	Thu Jun 18 16:23:58 2009 +0900
+++ b/ja/branch.tex	Thu Jun 18 16:23:58 2009 +0900
@@ -609,17 +609,9 @@
 %Committing a new change on the \texttt{foo} branch introduces a new
 %head.
 %\interaction{branch-named.foo-commit}
-%We can no longer update from \texttt{foo} to \texttt{bar} without
-%going ``sideways'' in history, so Mercurial forces us to provide the
-%\hgopt{update}{-C} option to \hgcmd{update}.
-%\interaction{branch-named.update-bar}
 
 $B?7$7$$JQ99$r(B\texttt{foo}$B$K%3%_%C%H$9$k$H!$?7$7$$(Bhead$B$,:n$i$l$k!%(B
 \interaction{branch-named.foo-commit}
-$B$b$O$d(B\texttt{foo}$B$+$i(B\texttt{bar}$B$X$O!$OFF;$K0o$l$k$3$H$J$/99?7$9$k$3$H(B
-$B$O$G$-$J$$!%$=$3$G!$(B\hgopt{update}{-C}$B%*%W%7%g%s$r;H$C$F(B\hgcmd{update}$B$r(B
-$B<B9T$9$k$3$H$,I,MW$K$J$k!%(B
-\interaction{branch-named.update-bar}
 
 %\section{Branch names and merging}
 \section{$B%V%i%s%AL>$H%^!<%8(B}