diff options
| author | Heiko Voigt <git-list@hvoigt.net> | 2009-03-18 17:33:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-21 06:41:01 (GMT) |
| commit | 3867906b376638cdba6be86755db1d1268ab89c9 (patch) | |
| tree | 83d8ec36ad89442403fb328013dce403ee51d67a /t/t9603-cvsimport-patchsets.sh | |
| parent | 9291ccfd27e1e1958b50df7f408996ac22c0776a (diff) | |
| download | git-3867906b376638cdba6be86755db1d1268ab89c9.zip git-3867906b376638cdba6be86755db1d1268ab89c9.tar.gz git-3867906b376638cdba6be86755db1d1268ab89c9.tar.bz2 | |
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>
Diffstat (limited to 't/t9603-cvsimport-patchsets.sh')
| -rwxr-xr-x | t/t9603-cvsimport-patchsets.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh index 15a971f..958bdce 100755 --- a/t/t9603-cvsimport-patchsets.sh +++ b/t/t9603-cvsimport-patchsets.sh @@ -21,13 +21,20 @@ test_expect_failure 'import with criss cross times on revisions' ' git cvsimport -p"-x" -C module-git module && cd module-git && - git log --pretty=format:%s > ../actual && - echo "" >> ../actual && + git log --pretty=format:%s > ../actual-master && + git log A~2..A --pretty="format:%s %ad" -- > ../actual-A && + echo "" >> ../actual-master && + echo "" >> ../actual-A && cd .. && - echo "Rev 3 + echo "Rev 4 +Rev 3 Rev 2 -Rev 1" > expect && - test_cmp actual expect +Rev 1" > expect-master && + test_cmp actual-master expect-master && + + echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000 +Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A && + test_cmp actual-A expect-A ' test_done |