Mercurial > hg
comparison tests/test-convert-cvs-detectmerge.t @ 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 | 017ab404e588 |
| children | 13d73bf6be29 |
comparison
equal
deleted
inserted
replaced
| 14822:760d2dae4839 | 14824:7698c275aa56 |
|---|---|
| 52 T file1 | 52 T file1 |
| 53 | 53 |
| 54 modify file1 on branch v1_0 | 54 modify file1 on branch v1_0 |
| 55 | 55 |
| 56 $ cvscall -Q update -rv1_0 | 56 $ cvscall -Q update -rv1_0 |
| 57 $ sleep 1 | |
| 57 $ echo "change" >> file1 | 58 $ echo "change" >> file1 |
| 58 $ cvsci -m"add text" | 59 $ cvsci -m"add text" |
| 59 cvs commit: Examining . | 60 cvs commit: Examining . |
| 60 | 61 |
| 61 make unrelated change on v1_1 | 62 make unrelated change on v1_1 |