[PATCH] tests: restore previous fix for date ambiguity in cvs test

Mads Kiilerich mads at kiilerich.com
Fri Jul 1 11:14:38 CDT 2011


# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1309536828 -7200
# Branch stable
# Node ID 292f01cb3bfafff85e4f6b5fceb7719063b92aea
# Parent  d8f7fdeaab2383c8a62cdb2391fbf070b887aec2
tests: restore previous fix for date ambiguity in cvs test

017ab404e588 changed some sleeps after cvs update to sleeps before commit. I
don't know why that should work, but I have a machine where it doesn't work.
Commits regularly fails becuase cvs doesn't notice that a file has been
changed.

Restoring the previous sleep between the update and the edit makes cvs notice
the change.

diff --git a/tests/test-convert-cvs-detectmerge.t b/tests/test-convert-cvs-detectmerge.t
--- a/tests/test-convert-cvs-detectmerge.t
+++ b/tests/test-convert-cvs-detectmerge.t
@@ -54,6 +54,7 @@
 modify file1 on branch v1_0
 
   $ cvscall -Q update -rv1_0
+  $ sleep 1
   $ echo "change" >> file1
   $ cvsci -m"add text"
   cvs commit: Examining .


More information about the Mercurial-devel mailing list