# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1203284939 -32400
# Node ID 2052bee9f07491cc63f9fbf3c18c94830e634559
# Parent  8666e23fd2db970fc6bfd8c07572a514cd616bdf
more branch.tex

diff -r 8666e23fd2db -r 2052bee9f074 ja/branch.tex
--- a/ja/branch.tex	Mon Feb 18 03:56:43 2008 +0900
+++ b/ja/branch.tex	Mon Feb 18 06:48:59 2008 +0900
@@ -197,26 +197,46 @@
 %\subsection{Handling tag conflicts during a merge}
 \subsection{マージの際にタグのコンフリクトを解決する}
 
-You won't often need to care about the \sfilename{.hgtags} file, but
-it sometimes makes its presence known during a merge.  The format of
-the file is simple: it consists of a series of lines.  Each line
-starts with a changeset hash, followed by a space, followed by the
-name of a tag.
+%You won't often need to care about the \sfilename{.hgtags} file, but
+%it sometimes makes its presence known during a merge.  The format of
+%the file is simple: it consists of a series of lines.  Each line
+%starts with a changeset hash, followed by a space, followed by the
+%name of a tag.
+
+\sfilename{.hgtags}を気にしなければならないことは多くないが，マージの際に
+は存在を明らかにする．ファイルフォーマットはシンプルで，一連の行を含むだ
+けである．それぞれの行はチェンジセットのハッシュで始まり，1つのスペース
+が続き，タグの名称が続く．
+
+%If you're resolving a conflict in the \sfilename{.hgtags} file during
+%a merge, there's one twist to modifying the \sfilename{.hgtags} file:
+%when Mercurial is parsing the tags in a repository, it \emph{never}
+%reads the working copy of the \sfilename{.hgtags} file.  Instead, it
+%reads the \emph{most recently committed} revision of the file.
 
-If you're resolving a conflict in the \sfilename{.hgtags} file during
-a merge, there's one twist to modifying the \sfilename{.hgtags} file:
-when Mercurial is parsing the tags in a repository, it \emph{never}
-reads the working copy of the \sfilename{.hgtags} file.  Instead, it
-reads the \emph{most recently committed} revision of the file.
+マージ中に\sfilename{.hgtags}ファイル内のコンフリクトを解決している場合，
+\sfilename{.hgtags}を変更する一捻りがある．Mercurialがリポジトリ中のタグ
+をパースする時，Mercurialは\sfilename{.hgtags}のワーキングコピーを
+\emph{決して}読まない．その代わり\emph{最も新しくコミットされた}リビジョ
+ンを読む．
 
-An unfortunate consequence of this design is that you can't actually
-verify that your merged \sfilename{.hgtags} file is correct until
-\emph{after} you've committed a change.  So if you find yourself
-resolving a conflict on \sfilename{.hgtags} during a merge, be sure to
-run \hgcmd{tags} after you commit.  If it finds an error in the
-\sfilename{.hgtags} file, it will report the location of the error,
-which you can then fix and commit.  You should then run \hgcmd{tags}
-again, just to be sure that your fix is correct.
+%An unfortunate consequence of this design is that you can't actually
+%verify that your merged \sfilename{.hgtags} file is correct until
+%\emph{after} you've committed a change.  So if you find yourself
+%resolving a conflict on \sfilename{.hgtags} during a merge, be sure to
+%run \hgcmd{tags} after you commit.If it finds an error in the
+%\sfilename{.hgtags} file, it will report the location of the error,
+%which you can then fix and commit.  You should then run \hgcmd{tags}
+%again, just to be sure that your fix is correct.
+
+この設計の不幸な結果は，変更をコミットした\emph{後}でないとマージした
+\sfilename{.hgtags}ファイルを実際にはベリファイできないことである．
+そのため，マージ中に\sfilename{.hgtags}のコンフリクト解決をしている場合
+は，コミット後に忘れず\hgcmd{tags}を実行する必要がある．
+\sfilename{.hgtags}にエラーが見つかった場合，エラーのある場所を報告する．
+それを見て修正し，コミットすることができる．そこで\hgcmd{tags}を再び走ら
+せ，修正が正しいことを確認すべきである．
+
 
 %\subsection{Tags and cloning}
 \subsection{タグとクローン}
@@ -241,6 +261,11 @@
 is that you'll get exactly the right subset of the project's history
 in the new repository, but \emph{not} the tag you might have expected.
 
+
+
+
+
+
 %\subsection{When permanent tags are too much}
 \subsection{永久タグが必要でない場合}