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>

diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
index 15a971fc4f8c73b6107ea484b60775c8488fd3d0..958bdce4dd8891fa648ba2bf554b18cae91de712 100755 (executable)
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@@ -21,13 +21,20 @@ test_expect_failure 'import with criss cross times on revisions' '
 
     git cvsimport -p"-x" -C module-git module &&
     cd module-git &&
 
     git cvsimport -p"-x" -C module-git module &&
     cd module-git &&

-        git log --pretty=format:%s > ../actual &&
-        echo "" >> ../actual &&
+        git log --pretty=format:%s > ../actual-master &&
+        git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
+        echo "" >> ../actual-master &&
+        echo "" >> ../actual-A &&

     cd .. &&
     cd .. &&

-    echo "Rev 3
+    echo "Rev 4
+Rev 3

 Rev 2
 Rev 2

-Rev 1" > expect &&
-    test_cmp actual expect
+Rev 1" > expect-master &&
+    test_cmp actual-master expect-master &&
+
+    echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
+Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
+    test_cmp actual-A expect-A

 '
 
 test_done
 '
 
 test_done

diff --git a/t/t9603/cvsroot/.gitattributes b/t/t9603/cvsroot/.gitattributes
new file mode 100644 (file)
index 0000000..562b12e
--- /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 e86adfc108b9faf50f48d050ad8b78cd54c5f10c..ba8fd5af23d3fe73f0f6b397e7241805817ffcc3 100644 (file)
--- a/t/t9603/cvsroot/module/a,v
+++ b/t/t9603/cvsroot/module/a,v
@@ -1,13 +1,15 @@
 head   1.2;
 access;
 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;
 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
 next   1.1;
 
 1.1


@@ -15,6 +17,16 @@ date 2009.02.21.18.11.43;    author tester;  state Exp;
 branches;
 next   ;
 
 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
 @@
 
 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
 1.1
 log
 @Rev 1

diff --git a/t/t9603/cvsroot/module/b,v b/t/t9603/cvsroot/module/b,v
index ab3089fe560c0cd621642d3fc4efc866f3f57dce..d26885518a25dab59db26860b823d09a85559183 100644 (file)
--- 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;
 access;

-symbols;
+symbols
+       A:1.2.0.2;

 locks; strict;
 comment        @# @;
 
 
 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;
 1.2
 date   2009.02.21.18.11.43;    author tester;  state Exp;

-branches;
+branches
+       1.2.2.1;

 next   1.1;
 
 1.1
 next   1.1;
 
 1.1


@@ -15,17 +22,60 @@ date        2009.02.21.18.11.14;    author tester;  state Exp;
 branches;
 next   ;
 
 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
 @@
 
 
 
 desc
 @@
 
 

+1.3
+log
+@Rev 4
+@
+text
+@1.3
+@
+
+

 1.2
 log
 @Rev 3
 @
 text
 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

 @
 
 
 @