Mercurial > public > mercurial-scm > hg

diff tests/test-convert-cvs-detectmerge.t @ 14824:7698c275aa56 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 01 Jul 2011 18:13:48 +0200
parents 017ab404e588
children 13d73bf6be29
line wrap: on
line diff
--- a/tests/test-convert-cvs-detectmerge.t	Thu Jun 30 16:36:38 2011 +0200
+++ b/tests/test-convert-cvs-detectmerge.t	Fri Jul 01 18:13:48 2011 +0200
@@ -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 .