--- a/tests/test-convert-cvs-detectmerge.t Wed Sep 29 01:32:51 2010 +0200
+++ b/tests/test-convert-cvs-detectmerge.t Wed Sep 29 01:33:31 2010 +0200
@@ -53,6 +53,7 @@
modify file1 on branch v1_0
$ cvscall -Q update -rv1_0
+ $ sleep 1
$ echo "change" >> file1
$ cvsci -m"add text"
cvs commit: Examining .
@@ -95,6 +96,7 @@
this will create rev 1.3
change on trunk to backport
+ $ sleep 1
$ echo "backport me" >> file1
$ cvsci -m"add other text" file1
$ cvscall log file1
@@ -148,6 +150,7 @@
fix bug on v1_1, merge to trunk with error
$ cvscall -Q update -rv1_1
+ $ sleep 1
$ echo "merge forward" >> file1
$ cvscall -Q tag unmerged
$ cvsci -m"fix file1"