Mercurial > hgbook

--- 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{$B%^!<%8$N:]$K%?%0$N%3%s%U%j%/%H$r2r7h$9$k(B}

-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}$B$r5$$K$7$J$1$l$P$J$i$J$$$3$H$OB?$/$J$$$,!$%^!<%8$N:]$K(B
+$B$OB8:_$rL@$i$+$K$9$k!%%U%!%$%k%U%)!<%^%C%H$O%7%s%W%k$G!$0lO"$N9T$r4^$`$@(B
+$B$1$G$"$k!%$=$l$>$l$N9T$O%A%'%s%8%;%C%H$N%O%C%7%e$G;O$^$j!$(B1$B$D$N%9%Z!<%9(B
+$B$,B3$-!$%?%0$NL>>N$,B3$/!%(B
+
+%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.
+$B%^!<%8Cf$K(B\sfilename{.hgtags}$B%U%!%$%kFb$N%3%s%U%j%/%H$r2r7h$7$F$$$k>l9g!$(B
+\sfilename{.hgtags}$B$rJQ99$9$k0lG1$j$,$"$k!%(BMercurial$B$,%j%]%8%H%jCf$N%?%0(B
+$B$r%Q!<%9$9$k;~!$(BMercurial$B$O(B\sfilename{.hgtags}$B$N%o!<%-%s%0%3%T!<$r(B
+\emph{$B7h$7$F(B}$BFI$^$J$$!%$=$NBe$o$j(B\emph{$B:G$b?7$7$/%3%_%C%H$5$l$?(B}$B%j%S%8%g(B
+$B%s$rFI$`!%(B

-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.
+
+$B$3$N@_7W$NIT9,$J7k2L$O!$JQ99$r%3%_%C%H$7$?(B\emph{$B8e(B}$B$G$J$$$H%^!<%8$7$?(B
+\sfilename{.hgtags}$B%U%!%$%k$r<B:]$K$O%Y%j%U%!%$$G$-$J$$$3$H$G$"$k!%(B
+$B$=$N$?$a!$%^!<%8Cf$K(B\sfilename{.hgtags}$B$N%3%s%U%j%/%H2r7h$r$7$F$$$k>l9g(B
+$B$O!$%3%_%C%H8e$KK:$l$:(B\hgcmd{tags}$B$r<B9T$9$kI,MW$,$"$k!%(B
+\sfilename{.hgtags}$B$K%(%i!<$,8+$D$+$C$?>l9g!$%(%i!<$N$"$k>l=j$rJs9p$9$k!%(B
+$B$=$l$r8+$F=$@5$7!$%3%_%C%H$9$k$3$H$,$G$-$k!%$=$3$G(B\hgcmd{tags}$B$r:F$SAv$i(B
+$B$;!$=$@5$,@5$7$$$3$H$r3NG'$9$Y$-$G$"$k!%(B
+

 %\subsection{Tags and cloning}
 \subsection{$B%?%0$H%/%m!<%s(B}
@@ -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{$B1J5W%?%0$,I,MW$G$J$$>l9g(B}