2620780fd66f62b8a221684cdd5d3747cd184881
1 #!/bin/sh
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.
14 test_description='git cvsimport testing for correct patchset estimation'
15 . ./lib-cvs.sh
17 CVSROOT="$TEST_DIRECTORY"/t9603/cvsroot
18 export CVSROOT
20 test_expect_failure 'import with criss cross times on revisions' '
22 git cvsimport -p"-x" -C module-git module &&
23 (cd module-git &&
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 ) &&
29 echo "Rev 4
30 Rev 3
31 Rev 2
32 Rev 1" > expect-master &&
33 test_cmp actual-master expect-master &&
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 '
40 test_done