From 8feed2572df0185d8a3d22cea1ca70b748b07ee8 Mon Sep 17 00:00:00 2001
From: Heiko Voigt <hvoigt@hvoigt.net>
Date: Mon, 6 Apr 2009 20:40:41 +0200
Subject: [PATCH] test issues of members added to HEAD branch after creation of
 a daughter branch

originally by: Michael Haggerty <mhagger@alum.mit.edu>
---
 .../t2002-revision-after-branch-creation/a.txt,v   | 45 ++++++++++++++++++++++
 .../t2002-revision-after-branch-creation/b.txt,v   | 25 ++++++++++++
 t/t2002-revision-after-branch-creation/README      | 14 +++++++
 t/t2002-revision-after-branch-creation/expect      | 36 +++++++++++++++++
 .../known_to_fail                                  |  0
 5 files changed, 120 insertions(+)
 create mode 100644 t/cvsroot/t2002-revision-after-branch-creation/a.txt,v
 create mode 100644 t/cvsroot/t2002-revision-after-branch-creation/b.txt,v
 create mode 100644 t/t2002-revision-after-branch-creation/README
 create mode 100644 t/t2002-revision-after-branch-creation/expect
 create mode 100644 t/t2002-revision-after-branch-creation/known_to_fail

diff --git a/t/cvsroot/t2002-revision-after-branch-creation/a.txt,v b/t/cvsroot/t2002-revision-after-branch-creation/a.txt,v
new file mode 100644
index 0000000..6ca54ff
--- /dev/null
+++ b/t/cvsroot/t2002-revision-after-branch-creation/a.txt,v
@@ -0,0 +1,45 @@
+head	1.1;
+access;
+symbols
+	BRANCH:1.1.0.2;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2009.04.06.18.28.33;	author hvoigt;	state Exp;
+branches
+	1.1.2.1;
+next	;
+commitid	jdByr5NLtMq7cZIt;
+
+1.1.2.1
+date	2009.04.06.18.28.35;	author hvoigt;	state Exp;
+branches;
+next	;
+commitid	K6fkoebtfF78cZIt;
+
+
+desc
+@@
+
+
+1.1
+log
+@Add a.txt
+@
+text
+@1.1
+@
+
+
+1.1.2.1
+log
+@Revision 1.1.2.1
+@
+text
+@d1 1
+a1 1
+1.1.2.1
+@
+
diff --git a/t/cvsroot/t2002-revision-after-branch-creation/b.txt,v b/t/cvsroot/t2002-revision-after-branch-creation/b.txt,v
new file mode 100644
index 0000000..d1e3a87
--- /dev/null
+++ b/t/cvsroot/t2002-revision-after-branch-creation/b.txt,v
@@ -0,0 +1,25 @@
+head	1.1;
+access;
+symbols;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2009.04.06.18.28.34;	author hvoigt;	state Exp;
+branches;
+next	;
+commitid	oi8o7opDypU7cZIt;
+
+
+desc
+@@
+
+
+1.1
+log
+@Add b.txt
+@
+text
+@1.1
+@
diff --git a/t/t2002-revision-after-branch-creation/README b/t/t2002-revision-after-branch-creation/README
new file mode 100644
index 0000000..446b2e5
--- /dev/null
+++ b/t/t2002-revision-after-branch-creation/README
@@ -0,0 +1,14 @@
+The cvs repository was created using the following commands:
+
+    echo '1.1' >a.txt
+    cvs add a.txt
+    cvs commit -m 'Add a.txt'
+    cvs tag -b BRANCH
+    echo '1.1' >b.txt
+    cvs add b.txt
+    cvs commit -m 'Add b.txt'
+    # We have to make a commit on BRANCH so that the branch is not
+    # entirely ignored by cvsimport:
+    cvs up -r BRANCH
+    echo '1.1.2.1' >a.txt
+    cvs commit -m 'Revision 1.1.2.1'
diff --git a/t/t2002-revision-after-branch-creation/expect b/t/t2002-revision-after-branch-creation/expect
new file mode 100644
index 0000000..217e546
--- /dev/null
+++ b/t/t2002-revision-after-branch-creation/expect
@@ -0,0 +1,36 @@
+---------------------
+PatchSet 1 
+Date: 2009/04/06 22:28:33
+Author: hvoigt
+Branch: HEAD
+Tag: (none) 
+Log:
+Add a.txt
+
+Members: 
+	a.txt:INITIAL->1.1 
+
+---------------------
+PatchSet 2 
+Date: 2009/04/06 22:28:35
+Author: hvoigt
+Branch: BRANCH
+Tag: (none) 
+Log:
+Revision 1.1.2.1
+
+Members: 
+	a.txt:1.1->1.1.2.1 
+
+---------------------
+PatchSet 3 
+Date: 2009/04/06 22:28:34
+Author: hvoigt
+Branch: HEAD
+Tag: (none) 
+Log:
+Add b.txt
+
+Members: 
+	b.txt:INITIAL->1.1 
+
diff --git a/t/t2002-revision-after-branch-creation/known_to_fail b/t/t2002-revision-after-branch-creation/known_to_fail
new file mode 100644
index 0000000..e69de29
-- 
2.11.4.GIT