aboutsummaryrefslogtreecommitdiff
path: root/t/t9603
diff options
context:
space:
mode:
authorHeiko Voigt <git-list@hvoigt.net>2009-03-18 18:33:41 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-20 23:41:01 -0700
commit3867906b376638cdba6be86755db1d1268ab89c9 (patch)
tree83d8ec36ad89442403fb328013dce403ee51d67a /t/t9603
parent9291ccfd27e1e1958b50df7f408996ac22c0776a (diff)
downloadgit-3867906b376638cdba6be86755db1d1268ab89c9.tar.gz
git-3867906b376638cdba6be86755db1d1268ab89c9.tar.xz
cvsimport: extend testcase about patchset order to contain branches
This makes sure that timestamps and ordering on branches is not influenced by a fix for cvsps. The test extension does not deal which patchset correction on branches it only verifes that branches are basically handled as before. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9603')
-rw-r--r--t/t9603/cvsroot/.gitattributes1
-rw-r--r--t/t9603/cvsroot/module/a,v38
-rw-r--r--t/t9603/cvsroot/module/b,v58
3 files changed, 91 insertions, 6 deletions
diff --git a/t/t9603/cvsroot/.gitattributes b/t/t9603/cvsroot/.gitattributes
new file mode 100644
index 000000000..562b12e16
--- /dev/null
+++ b/t/t9603/cvsroot/.gitattributes
@@ -0,0 +1 @@
+* -whitespace
diff --git a/t/t9603/cvsroot/module/a,v b/t/t9603/cvsroot/module/a,v
index e86adfc10..ba8fd5af2 100644
--- a/t/t9603/cvsroot/module/a,v
+++ b/t/t9603/cvsroot/module/a,v
@@ -1,13 +1,15 @@
head 1.2;
access;
-symbols;
+symbols
+ A:1.2.0.2;
locks; strict;
comment @# @;
1.2
date 2009.02.21.18.11.14; author tester; state Exp;
-branches;
+branches
+ 1.2.2.1;
next 1.1;
1.1
@@ -15,6 +17,16 @@ date 2009.02.21.18.11.43; author tester; state Exp;
branches;
next ;
+1.2.2.1
+date 2009.03.11.19.03.52; author tester; state Exp;
+branches;
+next 1.2.2.2;
+
+1.2.2.2
+date 2009.03.11.19.09.10; author tester; state Exp;
+branches;
+next ;
+
desc
@@
@@ -29,6 +41,28 @@ text
@
+1.2.2.1
+log
+@Rev 4 Branch A
+@
+text
+@d1 1
+a1 1
+1.2.2.1
+@
+
+
+1.2.2.2
+log
+@Rev 5 Branch A
+@
+text
+@d1 1
+a1 1
+1.2.2.2
+@
+
+
1.1
log
@Rev 1
diff --git a/t/t9603/cvsroot/module/b,v b/t/t9603/cvsroot/module/b,v
index ab3089fe5..d26885518 100644
--- a/t/t9603/cvsroot/module/b,v
+++ b/t/t9603/cvsroot/module/b,v
@@ -1,13 +1,20 @@
-head 1.2;
+head 1.3;
access;
-symbols;
+symbols
+ A:1.2.0.2;
locks; strict;
comment @# @;
+1.3
+date 2009.03.11.19.05.08; author tester; state Exp;
+branches;
+next 1.2;
+
1.2
date 2009.02.21.18.11.43; author tester; state Exp;
-branches;
+branches
+ 1.2.2.1;
next 1.1;
1.1
@@ -15,17 +22,60 @@ date 2009.02.21.18.11.14; author tester; state Exp;
branches;
next ;
+1.2.2.1
+date 2009.03.11.19.03.52; author tester; state Exp;
+branches;
+next 1.2.2.2;
+
+1.2.2.2
+date 2009.03.11.19.09.10; author tester; state Exp;
+branches;
+next ;
+
desc
@@
+1.3
+log
+@Rev 4
+@
+text
+@1.3
+@
+
+
1.2
log
@Rev 3
@
text
-@1.2
+@d1 1
+a1 1
+1.2
+@
+
+
+1.2.2.1
+log
+@Rev 4 Branch A
+@
+text
+@d1 1
+a1 1
+1.2.2.1
+@
+
+
+1.2.2.2
+log
+@Rev 5 Branch A
+@
+text
+@d1 1
+a1 1
+1.2
@