Some cvs repositories may have time deviations in their recorded commits. This is a test for one of such cases. These kind of repositories can happen if the system time of cvs clients is not fully synchronised. Consider the following sequence of events: * client A commits file a r1.1 * client A commits file a r1.2, b r1.1 * client B commits file b r1.2 using the same timestamp as a r1.1 This can be resolved but due to cvsps grouping its patchsets solely based on the timestamp and never breaking these groups it outputs the wrong order which then leads to a broken import. I hit this bug when importing from a real repository which was originally converted from another rcs based scm. Other import tools can handle this correctly, e.g. parsecvs. --- As this is my first real patch, please let me know if I added anything to the wrong place. There is actually another bug depending on timings which I haven't written a testcase for yet. It is not such a showstopper but cvsps skips revisions from a file if they have the same commit message and fit into the same time window. cheers Heiko t/t9603-cvsimport-time.sh | 60 ++++++++++++++++++++++++++++++++++++++++ t/t9603/cvsroot/time/a,v | 41 +++++++++++++++++++++++++++ t/t9603/cvsroot/time/b,v | 41 +++++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 0 deletions(-) create mode 100755 t/t9603-cvsimport-time.sh create mode 100644 t/t9603/cvsroot/CVSROOT/.empty create mode 100644 t/t9603/cvsroot/time/a,v create mode 100644 t/t9603/cvsroot/time/b,v diff --git a/t/t9603-cvsimport-time.sh b/t/t9603-cvsimport-time.sh new file mode 100755 index 0000000..d6de242 --- /dev/null +++ b/t/t9603-cvsimport-time.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +test_description='git cvsimport basic tests' +. ./test-lib.sh + +CVSROOT="$TEST_DIRECTORY"/t9603/cvsroot +export CVSROOT +unset CVS_SERVER +# for clean cvsps cache +HOME=$(pwd) +export HOME + +if ! type cvs >/dev/null 2>&1 +then + say 'skipping cvsimport tests, cvs not found' + test_done + exit +fi + +cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` +case "$cvsps_version" in +2.1 | 2.2*) + ;; +'') + say 'skipping cvsimport tests, cvsps not found' + test_done + exit + ;; +*) + say 'skipping cvsimport tests, unsupported cvsps version' + test_done + exit + ;; +esac + +# Structure of the test cvs repository +# +# Message File:Content Commit Time +# Rev 1 a: 1.1 2009-02-21 19:11:43 +0100 +# Rev 2 a: 1.2 b: 1.1 2009-02-21 19:11:14 +0100 +# Rev 3 b: 1.2 2009-02-21 19:11:43 +0100 +# +# As you can see the commit of Rev 3 has the same time as +# Rev 1 this leads to a broken import because of a cvsps +# bug. + +test_expect_success 'import with criss cross times on revisions' ' + + git cvsimport -p"-x" -C import time && + cd import && + git log --pretty=format:%s > ../actual && + echo "" >> ../actual && + cd .. && + echo "Rev 3 +Rev 2 +Rev 1" > expect && + test_cmp actual expect +' + +test_done diff --git a/t/t9603/cvsroot/CVSROOT/.empty b/t/t9603/cvsroot/CVSROOT/.empty new file mode 100644 index 0000000..e69de29 diff --git a/t/t9603/cvsroot/time/a,v b/t/t9603/cvsroot/time/a,v new file mode 100644 index 0000000..66a96aa --- /dev/null +++ b/t/t9603/cvsroot/time/a,v @@ -0,0 +1,41 @@ +head 1.2; +access; +symbols; +locks; strict; +comment @# @; + + +1.2 +date 2009.02.21.18.11.14; author hvoigt; state Exp; +branches; +next 1.1; + +1.1 +date 2009.02.21.18.11.43; author hvoigt; state Exp; +branches; +next ; + + +desc +@@ + + +1.2 +log +@Rev 2 +@ +text +@xxx +@ + + +1.1 +log +@Rev 1 +@ +text +@d1 1 +a1 1 +1.1 +@ + diff --git a/t/t9603/cvsroot/time/b,v b/t/t9603/cvsroot/time/b,v new file mode 100644 index 0000000..b5da856 --- /dev/null +++ b/t/t9603/cvsroot/time/b,v @@ -0,0 +1,41 @@ +head 1.2; +access; +symbols; +locks; strict; +comment @# @; + + +1.2 +date 2009.02.21.18.11.43; author hvoigt; state Exp; +branches; +next 1.1; + +1.1 +date 2009.02.21.18.11.14; author hvoigt; state Exp; +branches; +next ; + + +desc +@@ + + +1.2 +log +@Rev 3 +@ +text +@xxx +@ + + +1.1 +log +@Rev 2 +@ +text +@d1 1 +a1 1 +1.1 +@ + -- 1.6.1.2.390.gba743 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
