# HG changeset patch # User Yoshiki Yazawa # Date 1202467450 -32400 # Node ID 828f5606faf0b460d92d938fbd8e77b2b8195830 # Parent e5d4fca73f97dba36daee857cad1dc3a723516bf started branch.tex diff -r e5d4fca73f97 -r 828f5606faf0 ja/branch.tex --- 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{リリースとブランチ開発の管理} \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は同時に複数の局面で進行していくプロジェクトを管理するのに役立 +つ機能を持っている．これらの機能を理解するため，まず通常のソフトウェアプ +ロジェクトの構造を考える． -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. + +多くのソフトウェアプロジェクトでは，新機能を持つメジャーリリースを定期的 +にリリースする．並行して多数のマイナーリリースも行なわれる．これらはメ +ジャーリリースのバグを修正したものである． -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. + +この章ではまずリリースのようなプロジェクトのマイルストーンに言及する．次い +でプロジェクトの各フェーズでの流れを説明し，Mercurialでどのように区分け +し，管理できるのかを説明する． %\section{Giving a persistent name to a revision} \section{リビジョンに永続的な名前を付ける} -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} + +あるリビジョンをリリースと決めた時に，これを記録しておくのは良い考えであ +る．これは後日，バグの再現やソフトウェアの移植などの目的でリリースを再現 +するのに役立つ． \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} + +特定のリビジョンにMercurialで永続的な名前を付けることができる．この名前 +はタグと呼ばれる． \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} + +タグは実のところリビジョンに付けられたシンボリックネームに他ならない．タ +グは単にユーザの便宜のために付けられる．タグは特定のリビジョンを参照する +ための手軽で永続的な方法で，Mercurialはタグを翻訳しない．タグの名前には， +明確にパースするためのいくつかのもの以外の制限はない．タグネームは以下の +文字を含むことはできない． \begin{itemize} -\item Colon (ASCII 58, ``\texttt{:}'') -\item Carriage return (ASCII 13, ``\Verb+\r+'') -\item Newline (ASCII 10, ``\Verb+\n+'') +\item コロン (ASCII 58, ``\texttt{:}'') +\item 復帰文字 (ASCII 13, ``\Verb+\r+'') +\item 改行文字 (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}コマンドでリポジトリに存在するタグを表示することができる．出 +力では，タグ付けされたリビジョンは名前，リビジョン番号，固有のハッシュ値 +の順に区別される． \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}の出力に\texttt{tip}が含まれていることに注意．\texttt{tip}タ +グは，リポジトリの中で常に最新のリビジョンに付けられている特別なフローティ +ングタグである． + +%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}コマンドの出力において，タグはリビジョン番号によって逆順で表 +示されている．これによって，通常，新しいタグが古いタグよりも前に表示され +る．\texttt{tip}タグは\hgcmd{tags}コマンドの出力の一番先頭に表示される． -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}コマンドはタグの結びつけられたリビジョンを表示する際にタグも +表示する． \interaction{tag.log} Any time you need to provide a revision~ID to a Mercurial command, the