# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1283463403 -7200
# Node ID 44fcacae45c8f71f18d3c0c365037829059c9ec0
# Parent  8bedcfc38659043abe297900a4fd8a156f29a3a7# Parent  d598d24a7e67017a65cc189897f25b25516d9363
merge with stable

diff -r 8bedcfc38659 -r 44fcacae45c8 tests/test-convert-cvs
--- a/tests/test-convert-cvs	Thu Sep 02 18:12:07 2010 +0200
+++ b/tests/test-convert-cvs	Thu Sep 02 23:36:43 2010 +0200
@@ -134,6 +134,7 @@
 
 echo % commit new file revisions with some fuzz
 cd src
+sleep 1
 echo f >> a
 cvscall -q commit -mfuzzy . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'