[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
developers/cvs-repos/branch.xml: 1.3 -> 1.4
以下のページの更新をしました。ツッコミをお願いします。
developers/cvs-repos/branch.xml: 1.3 -> 1.4
> revision 1.4
> date: 2007/11/06 17:34:49; author: hubertf; state: Exp; lines: +3 -3
> Add a word when to delete a branch tag, from joerg@
木曜日までに異議がなければ、 commit します。
以下、訳と原文それぞれの新旧の差分です。
--- developers/cvs-repos/branch.xml.orig 2007-11-07 05:39:22.000000000 +0900
+++ developers/cvs-repos/branch.xml 2007-11-07 05:39:22.000000000 +0900
@@ -5,10 +5,10 @@
<webpage id="ja-developers-cvs-repos-branch">
<config param="desc" value="CVS ブランチにまつわる作業"/>
-<config param="cvstag" value="$NetBSD: branch.xml,v 1.3 2007/04/09 16:24:17 kano Exp $"/>
+<config param="cvstag" value="$NetBSD: branch.xml,v 1.4 2007/11/06 17:34:49 hubertf Exp $"/>
<!-- Based on english version: -->
-<!-- NetBSD: branch.xml,v 1.3 2007/04/09 16:24:17 kano Exp -->
-<config param="rcsdate" value="$Date: 2007/04/09 16:24:17 $"/>
+<!-- NetBSD: branch.xml,v 1.4 2007/11/06 17:34:49 hubertf Exp -->
+<config param="rcsdate" value="$Date: 2007/11/06 17:34:49 $"/>
<head>
@@ -118,7 +118,7 @@
<listitem>
<para>
- (打ち直した base と重複するようになった) 新ベースのタグを削除します:
+ HEAD との定期的な同期をするつもりがなければ、新ベースのタグを削除します:
</para>
<screen>cvs rtag -d ${b}-nbase ${m}</screen>
</listitem>
Index: developers/cvs-repos/branch.xml
===================================================================
RCS file: /cvsroot/htdocs/developers/cvs-repos/branch.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- developers/cvs-repos/branch.xml 9 Apr 2007 16:24:17 -0000 1.3
+++ developers/cvs-repos/branch.xml 6 Nov 2007 17:34:49 -0000 1.4
@@ -5,8 +5,8 @@
<webpage id="developers-cvs-repos-branch">
<config param="desc" value="Working with CVS branches"/>
-<config param="cvstag" value="$NetBSD: branch.xml,v 1.3 2007/04/09 16:24:17 kano Exp $"/>
-<config param="rcsdate" value="$Date: 2007/04/09 16:24:17 $"/>
+<config param="cvstag" value="$NetBSD: branch.xml,v 1.4 2007/11/06 17:34:49 hubertf Exp $"/>
+<config param="rcsdate" value="$Date: 2007/11/06 17:34:49 $"/>
<head>
@@ -116,7 +116,7 @@
<listitem>
<para>
- Delete the new base tags (now redundant):
+ If no regular syncs with HEAD are expected, delete the new base tags:
</para>
<screen>cvs rtag -d ${b}-nbase ${m}</screen>
</listitem>