1#!/bin/sh
23
# 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.
1314
test_description='git cvsimport testing for correct patchset estimation'
15. ./lib-cvs.sh
1617
setup_cvs_test_repository t9603
1819
test_expect_failure PERL 'import with criss cross times on revisions' '
2021
git cvsimport -p"-x" -C module-git module &&
22(cd module-git &&
23git log --pretty=format:%s > ../actual-master &&
24git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
25echo "" >> ../actual-master &&
26echo "" >> ../actual-A
27) &&
28echo "Rev 4
29Rev 3
30Rev 2
31Rev 1" > expect-master &&
32test_cmp expect-master actual-master &&
3334
echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
35Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
36test_cmp expect-A actual-A
37'
3839
test_done