freshlybakedca.ke
Git fork
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>
authored by
Heiko Voigt
and committed by
Junio C Hamano
3867906b
9291ccfd
+103
-11
+12
-5
t/t9603-cvsimport-patchsets.sh
+12
-5
t/t9603-cvsimport-patchsets.sh
···
21
21
22
22
git cvsimport -p"-x" -C module-git module &&
23
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 &&
26
28
cd .. &&
27
-
echo "Rev 3
29
+
echo "Rev 4
30
+
Rev 3
28
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
31
38
'
32
39
33
40
test_done
+1
t/t9603/cvsroot/.gitattributes
+1
t/t9603/cvsroot/.gitattributes
···
1
+
* -whitespace
+36
-2
t/t9603/cvsroot/module/a,v
+36
-2
t/t9603/cvsroot/module/a,v
···
1
1
head 1.2;
2
2
access;
3
-
symbols;
3
+
symbols
4
+
A:1.2.0.2;
4
5
locks; strict;
5
6
comment @# @;
6
7
7
8
8
9
1.2
9
10
date 2009.02.21.18.11.14; author tester; state Exp;
10
-
branches;
11
+
branches
12
+
1.2.2.1;
11
13
next 1.1;
12
14
13
15
1.1
···
15
17
branches;
16
18
next ;
17
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
+
18
30
19
31
desc
20
32
@@
···
26
38
@
27
39
text
28
40
@1.2
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
29
63
@
30
64
31
65
+54
-4
t/t9603/cvsroot/module/b,v
+54
-4
t/t9603/cvsroot/module/b,v
···
1
-
head 1.2;
1
+
head 1.3;
2
2
access;
3
-
symbols;
3
+
symbols
4
+
A:1.2.0.2;
4
5
locks; strict;
5
6
comment @# @;
6
7
7
8
9
+
1.3
10
+
date 2009.03.11.19.05.08; author tester; state Exp;
11
+
branches;
12
+
next 1.2;
13
+
8
14
1.2
9
15
date 2009.02.21.18.11.43; author tester; state Exp;
10
-
branches;
16
+
branches
17
+
1.2.2.1;
11
18
next 1.1;
12
19
13
20
1.1
···
15
22
branches;
16
23
next ;
17
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
+
18
35
19
36
desc
20
37
@@
21
38
22
39
40
+
1.3
41
+
log
42
+
@Rev 4
43
+
@
44
+
text
45
+
@1.3
46
+
@
47
+
48
+
23
49
1.2
24
50
log
25
51
@Rev 3
26
52
@
27
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
29
79
@
30
80
31
81