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>
Heiko Voigt committed
Mar 18, 2009 at 18:33 UTC
3867906b376638cdba6be86755db1d1268ab89c9
4 files changed
+103
-11
t/t9603-cvsimport-patchsets.sh
+12
-5
@@ -21,13 +21,20 @@ test_expect_failure 'import with criss cross times on revisions' '
21
22
git cvsimport -p"-x" -C module-git module &&
23
cd module-git &&
24
- git log --pretty=format:%s > ../actual &&
25
- echo "" >> ../actual &&
24
+ git log --pretty=format:%s > ../actual-master &&
25
+ git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
26
+ echo "" >> ../actual-master &&
27
+ echo "" >> ../actual-A &&
28
cd .. &&
27
- echo "Rev 3
29
+ echo "Rev 4
30
+Rev 3
31
Rev 2
29
-Rev 1" > expect &&
30
- test_cmp actual expect
32
+Rev 1" > expect-master &&
33
+ test_cmp actual-master expect-master &&
34
+
35
+ echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
36
+Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
37
+ test_cmp actual-A expect-A
38
'
39
40
test_done
t/t9603/cvsroot/.gitattributes
new
+1
@@ -0,0 +1 @@
1
+* -whitespace
t/t9603/cvsroot/module/a,v
+36
-2
@@ -1,13 +1,15 @@
1
head 1.2;
2
access;
3
-symbols;
3
+symbols
4
+ A:1.2.0.2;
5
locks; strict;
6
comment @# @;
7
8
9
1.2
10
date 2009.02.21.18.11.14; author tester; state Exp;
10
-branches;
11
+branches
12
+ 1.2.2.1;
13
next 1.1;
14
15
1.1
@@ -15,6 +17,16 @@ date 2009.02.21.18.11.43; author tester; state Exp;
17
branches;
18
next ;
19
20
+1.2.2.1
21
+date 2009.03.11.19.03.52; author tester; state Exp;
22
+branches;
23
+next 1.2.2.2;
24
+
25
+1.2.2.2
26
+date 2009.03.11.19.09.10; author tester; state Exp;
27
+branches;
28
+next ;
29
+
30
31
desc
32
@@
@@ -29,6 +41,28 @@ text
41
@
42
43
44
+1.2.2.1
45
+log
46
+@Rev 4 Branch A
47
+@
48
+text
49
+@d1 1
50
+a1 1
51
+1.2.2.1
52
+@
53
+
54
+
55
+1.2.2.2
56
+log
57
+@Rev 5 Branch A
58
+@
59
+text
60
+@d1 1
61
+a1 1
62
+1.2.2.2
63
+@
64
+
65
+
66
1.1
67
log
68
@Rev 1
t/t9603/cvsroot/module/b,v
+54
-4
@@ -1,13 +1,20 @@
1
-head 1.2;
1
+head 1.3;
2
access;
3
-symbols;
3
+symbols
4
+ A:1.2.0.2;
5
locks; strict;
6
comment @# @;
7
8
9
+1.3
10
+date 2009.03.11.19.05.08; author tester; state Exp;
11
+branches;
12
+next 1.2;
13
+
14
1.2
15
date 2009.02.21.18.11.43; author tester; state Exp;
10
-branches;
16
+branches
17
+ 1.2.2.1;
18
next 1.1;
19
20
1.1
@@ -15,17 +22,60 @@ date 2009.02.21.18.11.14; author tester; state Exp;
22
branches;
23
next ;
24
25
+1.2.2.1
26
+date 2009.03.11.19.03.52; author tester; state Exp;
27
+branches;
28
+next 1.2.2.2;
29
+
30
+1.2.2.2
31
+date 2009.03.11.19.09.10; author tester; state Exp;
32
+branches;
33
+next ;
34
+
35
36
desc
37
@@
38
39
40
+1.3
41
+log
42
+@Rev 4
43
+@
44
+text
45
+@1.3
46
+@
47
+
48
+
49
1.2
50
log
51
@Rev 3
52
@
53
text
28
-@1.2
54
+@d1 1
55
+a1 1
56
+1.2
57
+@
58
+
59
+
60
+1.2.2.1
61
+log
62
+@Rev 4 Branch A
63
+@
64
+text
65
+@d1 1
66
+a1 1
67
+1.2.2.1
68
+@
69
+
70
+
71
+1.2.2.2
72
+log
73
+@Rev 5 Branch A
74
+@
75
+text
76
+@d1 1
77
+a1 1
78
+1.2
79
@
80
81