Merge branch 'jc/ci-upload-artifact-and-linux32'
[git/gitster.git] / t / t9603-cvsimport-patchsets.sh
blob2a387fdbaaefe0cf8ac424cd7939514904239cb5
1 #!/bin/sh
3 # Structure of the test cvs repository
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
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.
14 test_description='git cvsimport testing for correct patchset estimation'
16 TEST_PASSES_SANITIZE_LEAK=true
17 . ./lib-cvs.sh
19 setup_cvs_test_repository t9603
21 test_expect_failure PERL 'import with criss cross times on revisions' '
22 git cvsimport -p"-x" -C module-git module &&
24 cd module-git &&
25 git log --pretty=format:%s > ../actual-main &&
26 git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
27 echo "" >> ../actual-main &&
28 echo "" >> ../actual-A
29 ) &&
30 echo "Rev 4
31 Rev 3
32 Rev 2
33 Rev 1" > expect-main &&
34 test_cmp expect-main actual-main &&
36 echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
37 Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
38 test_cmp expect-A actual-A
41 test_done