# HG changeset patch # User Yoshiki Yazawa # Date 1245309838 -32400 # Node ID 41bb6ec2ca27f298b8a17f5d3020e994ee6b0714 # Parent fa1c3715254dfb287541f2dad9c113b228a9dba6 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'. diff -r fa1c3715254d -r 41bb6ec2ca27 ja/branch.tex --- 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} 新しい変更を\texttt{foo}にコミットすると,新しいheadが作られる. \interaction{branch-named.foo-commit} -もはや\texttt{foo}から\texttt{bar}へは,脇道に逸れることなく更新すること -はできない.そこで,\hgopt{update}{-C}オプションを使って\hgcmd{update}を -実行することが必要になる. -\interaction{branch-named.update-bar} %\section{Branch names and merging} \section{ブランチ名とマージ}