]>
Commit | Line | Data |
---|---|---|
1 | #!/bin/sh | |
2 | ||
3 | # Structure of the test cvs repository | |
4 | # | |
5 | # Message File:Content Commit Time | |
6 | # Rev 1 a: 1.1 2009-02-21 19:11:43 +0100 | |
7 | # Rev 2 a: 1.2 b: 1.1 2009-02-21 19:11:14 +0100 | |
8 | # Rev 3 b: 1.2 2009-02-21 19:11:43 +0100 | |
9 | # | |
10 | # As you can see the commit of Rev 3 has the same time as | |
11 | # Rev 1 this leads to a broken import because of a cvsps | |
12 | # bug. | |
13 | ||
14 | test_description='git cvsimport testing for correct patchset estimation' | |
15 | . ./lib-cvs.sh | |
16 | ||
17 | setup_cvs_test_repository t9603 | |
18 | ||
19 | test_expect_failure PERL 'import with criss cross times on revisions' ' | |
20 | ||
21 | git cvsimport -p"-x" -C module-git module && | |
22 | (cd module-git && | |
23 | git log --pretty=format:%s > ../actual-master && | |
24 | git log A~2..A --pretty="format:%s %ad" -- > ../actual-A && | |
25 | echo "" >> ../actual-master && | |
26 | echo "" >> ../actual-A | |
27 | ) && | |
28 | echo "Rev 4 | |
29 | Rev 3 | |
30 | Rev 2 | |
31 | Rev 1" > expect-master && | |
32 | test_cmp expect-master actual-master && | |
33 | ||
34 | echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000 | |
35 | Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A && | |
36 | test_cmp expect-A actual-A | |
37 | ' | |
38 | ||
39 | test_done |