Mercurial > hg-stable
changeset 14824:7698c275aa56 stable
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 | 760d2dae4839 |
| children | de9eb6b1da4f |
| files | tests/test-convert-cvs-detectmerge.t |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
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 .