Mercurial > hgbook
changeset 301:828f5606faf0
started branch.tex
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Fri, 08 Feb 2008 19:44:10 +0900 |
parents | e5d4fca73f97 |
children | 6a31e428ba3b |
files | ja/branch.tex |
diffstat | 1 files changed, 93 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/ja/branch.tex Fri Feb 08 19:14:09 2008 +0900 +++ b/ja/branch.tex Fri Feb 08 19:44:10 2008 +0900 @@ -2,65 +2,115 @@ \chapter{$B%j%j!<%9$H%V%i%s%A3+H/$N4IM}(B} \label{chap:branch} -Mercurial provides several mechanisms for you to manage a project that -is making progress on multiple fronts at once. To understand these -mechanisms, let's first take a brief look at a fairly normal software -project structure. +%Mercurial provides several mechanisms for you to manage a project that +%is making progress on multiple fronts at once. To understand these +%mechanisms, let's first take a brief look at a fairly normal software +%project structure. + +Mercurial$B$OF1;~$KJ#?t$N6ILL$G?J9T$7$F$$$/%W%m%8%'%/%H$r4IM}$9$k$N$KLrN)(B +$B$D5!G=$r;}$C$F$$$k!%$3$l$i$N5!G=$rM}2r$9$k$?$a!$$^$:DL>o$N%=%U%H%&%'%"%W(B +$B%m%8%'%/%H$N9=B$$r9M$($k!%(B -Many software projects issue periodic ``major'' releases that contain -substantial new features. In parallel, they may issue ``minor'' -releases. These are usually identical to the major releases off which -they're based, but with a few bugs fixed. +%Many software projects issue periodic ``major'' releases that contain +%substantial new features. In parallel, they may issue ``minor'' +%releases. These are usually identical to the major releases off which +%they're based, but with a few bugs fixed. + +$BB?$/$N%=%U%H%&%'%"%W%m%8%'%/%H$G$O!$?75!G=$r;}$D%a%8%c!<%j%j!<%9$rDj4|E*(B +$B$K%j%j!<%9$9$k!%JB9T$7$FB??t$N%^%$%J!<%j%j!<%9$b9T$J$o$l$k!%$3$l$i$O%a(B +$B%8%c!<%j%j!<%9$N%P%0$r=$@5$7$?$b$N$G$"$k!%(B -In this chapter, we'll start by talking about how to keep records of -project milestones such as releases. We'll then continue on to talk -about the flow of work between different phases of a project, and how -Mercurial can help you to isolate and manage this work. +%In this chapter, we'll start by talking about how to keep records of +%project milestones such as releases. We'll then continue on to talk +%about the flow of work between different phases of a project, and how +%Mercurial can help you to isolate and manage this work. + +$B$3$N>O$G$O$^$:%j%j!<%9$N$h$&$J%W%m%8%'%/%H$N%^%$%k%9%H!<%s$K8@5Z$9$k!%<!$$(B +$B$G%W%m%8%'%/%H$N3F%U%'!<%:$G$NN.$l$r@bL@$7!$(BMercurial$B$G$I$N$h$&$K6hJ,$1(B +$B$7!$4IM}$G$-$k$N$+$r@bL@$9$k!%(B %\section{Giving a persistent name to a revision} \section{$B%j%S%8%g%s$K1JB3E*$JL>A0$rIU$1$k(B} -Once you decide that you'd like to call a particular revision a -``release'', it's a good idea to record the identity of that revision. -This will let you reproduce that release at a later date, for whatever -purpose you might need at the time (reproducing a bug, porting to a -new platform, etc). +%Once you decide that you'd like to call a particular revision a +%``release'', it's a good idea to record the identity of that revision. +%This will let you reproduce that release at a later date, for whatever +%purpose you might need at the time (reproducing a bug, porting to a +%new platform, etc). +%\interaction{tag.init} + +$B$"$k%j%S%8%g%s$r%j%j!<%9$H7h$a$?;~$K!$$3$l$r5-O?$7$F$*$/$N$ONI$$9M$($G$"(B +$B$k!%$3$l$O8eF|!$%P%0$N:F8=$d%=%U%H%&%'%"$N0\?"$J$I$NL\E*$G%j%j!<%9$r:F8=(B +$B$9$k$N$KLrN)$D!%(B \interaction{tag.init} -Mercurial lets you give a permanent name to any revision using the -\hgcmd{tag} command. Not surprisingly, these names are called -``tags''. +%Mercurial lets you give a permanent name to any revision using the +%\hgcmd{tag} command. Not surprisingly, these names are called +%``tags''. +%\interaction{tag.tag} + +$BFCDj$N%j%S%8%g%s$K(BMercurial$B$G1JB3E*$JL>A0$rIU$1$k$3$H$,$G$-$k!%$3$NL>A0(B +$B$O%?%0$H8F$P$l$k!%(B \interaction{tag.tag} -A tag is nothing more than a ``symbolic name'' for a revision. Tags -exist purely for your convenience, so that you have a handy permanent -way to refer to a revision; Mercurial doesn't interpret the tag names -you use in any way. Neither does Mercurial place any restrictions on -the name of a tag, beyond a few that are necessary to ensure that a -tag can be parsed unambiguously. A tag name cannot contain any of the -following characters: +%A tag is nothing more than a ``symbolic name'' for a revision. Tags +%exist purely for your convenience, so that you have a handy permanent +%way to refer to a revision; Mercurial doesn't interpret the tag names +%you use in any way. +%Neither does Mercurial place any restrictions on +%the name of a tag, beyond a few that are necessary to ensure that a +%tag can be parsed unambiguously. A tag name cannot contain any of the +%following characters: +%\begin{itemize} +%\item Colon (ASCII 58, ``\texttt{:}'') +%\item Carriage return (ASCII 13, ``\Verb+\r+'') +%\item Newline (ASCII 10, ``\Verb+\n+'') +%\end{itemize} + +$B%?%0$O<B$N$H$3$m%j%S%8%g%s$KIU$1$i$l$?%7%s%\%j%C%/%M!<%`$KB>$J$i$J$$!%%?(B +$B%0$OC1$K%f!<%6$NJX59$N$?$a$KIU$1$i$l$k!%%?%0$OFCDj$N%j%S%8%g%s$r;2>H$9$k(B +$B$?$a$N<j7Z$G1JB3E*$JJ}K!$G!$(BMercurial$B$O%?%0$rK]Lu$7$J$$!%%?%0$NL>A0$K$O!$(B +$BL@3N$K%Q!<%9$9$k$?$a$N$$$/$D$+$N$b$N0J30$N@)8B$O$J$$!%%?%0%M!<%`$O0J2<$N(B +$BJ8;z$r4^$`$3$H$O$G$-$J$$!%(B \begin{itemize} -\item Colon (ASCII 58, ``\texttt{:}'') -\item Carriage return (ASCII 13, ``\Verb+\r+'') -\item Newline (ASCII 10, ``\Verb+\n+'') +\item $B%3%m%s(B (ASCII 58, ``\texttt{:}'') +\item $BI|5"J8;z(B (ASCII 13, ``\Verb+\r+'') +\item $B2~9TJ8;z(B (ASCII 10, ``\Verb+\n+'') \end{itemize} -You can use the \hgcmd{tags} command to display the tags present in -your repository. In the output, each tagged revision is identified -first by its name, then by revision number, and finally by the unique -hash of the revision. + +%You can use the \hgcmd{tags} command to display the tags present in +%your repository. In the output, each tagged revision is identified +%first by its name, then by revision number, and finally by the unique +%hash of the revision. +%\interaction{tag.tags} +%Notice that \texttt{tip} is listed in the output of \hgcmd{tags}. The +%\texttt{tip} tag is a special ``floating'' tag, which always +%identifies the newest revision in the repository. + +\hgcmd{tags}$B%3%^%s%I$G%j%]%8%H%j$KB8:_$9$k%?%0$rI=<($9$k$3$H$,$G$-$k!%=P(B +$BNO$G$O!$%?%0IU$1$5$l$?%j%S%8%g%s$OL>A0!$%j%S%8%g%sHV9f!$8GM-$N%O%C%7%eCM(B +$B$N=g$K6hJL$5$l$k!%(B \interaction{tag.tags} -Notice that \texttt{tip} is listed in the output of \hgcmd{tags}. The -\texttt{tip} tag is a special ``floating'' tag, which always -identifies the newest revision in the repository. +\hgcmd{tags}$B$N=PNO$K(B\texttt{tip}$B$,4^$^$l$F$$$k$3$H$KCm0U!%(B\texttt{tip}$B%?(B +$B%0$O!$%j%]%8%H%j$NCf$G>o$K:G?7$N%j%S%8%g%s$KIU$1$i$l$F$$$kFCJL$J%U%m!<%F%#(B +$B%s%0%?%0$G$"$k!%(B + +%In the output of the \hgcmd{tags} command, tags are listed in reverse +%order, by revision number. This usually means that recent tags are +%listed before older tags. It also means that \texttt{tip} is always +%going to be the first tag listed in the output of \hgcmd{tags}. -In the output of the \hgcmd{tags} command, tags are listed in reverse -order, by revision number. This usually means that recent tags are -listed before older tags. It also means that \texttt{tip} is always -going to be the first tag listed in the output of \hgcmd{tags}. +\hgcmd{tags}$B%3%^%s%I$N=PNO$K$*$$$F!$%?%0$O%j%S%8%g%sHV9f$K$h$C$F5U=g$GI=(B +$B<($5$l$F$$$k!%$3$l$K$h$C$F!$DL>o!$?7$7$$%?%0$,8E$$%?%0$h$j$bA0$KI=<($5$l(B +$B$k!%(B\texttt{tip}$B%?%0$O(B\hgcmd{tags}$B%3%^%s%I$N=PNO$N0lHV@hF,$KI=<($5$l$k!%(B -When you run \hgcmd{log}, if it displays a revision that has tags -associated with it, it will print those tags. +%When you run \hgcmd{log}, if it displays a revision that has tags +%associated with it, it will print those tags. +%\interaction{tag.log} + +\hgcmd{log}$B%3%^%s%I$O%?%0$N7k$S$D$1$i$l$?%j%S%8%g%s$rI=<($9$k:]$K%?%0$b(B +$BI=<($9$k!%(B \interaction{tag.log} Any time you need to provide a revision~ID to a Mercurial command, the