Mercurial > hg-stable
comparison tests/test-keyword.t @ 15075:77325c92db95 stable
keyword: make status test after record and kwexpand/kwshrink reliable
This guarantees test failure when the dirstate code is omitted at
the end of the kwtemplater.overwrite method.
kwexpand/kwshrink:
Without a 1 second wait the test succeeds sometimes, even when
the dirstate of the overwritten file is not forced to normal.
record:
status after recording an added file allows to check whether
normallookup is needed after overwriting.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Sat, 10 Sep 2011 13:23:41 +0100 |
parents | e4c65158b5e7 |
children | 62dc0e7ab092 |
comparison
equal
deleted
inserted
replaced
15074:64fbd0de9773 | 15075:77325c92db95 |
---|---|
442 new file mode 100644 | 442 new file mode 100644 |
443 examine changes to 'r'? [Ynsfdaq?] | 443 examine changes to 'r'? [Ynsfdaq?] |
444 r | 444 r |
445 committed changeset 3:899491280810 | 445 committed changeset 3:899491280810 |
446 overwriting r expanding keywords | 446 overwriting r expanding keywords |
447 - status call required for dirstate.normallookup() check | |
448 $ hg status r | |
447 $ hg --verbose rollback | 449 $ hg --verbose rollback |
448 repository tip rolled back to revision 2 (undo commit) | 450 repository tip rolled back to revision 2 (undo commit) |
449 working directory now based on revision 2 | 451 working directory now based on revision 2 |
450 overwriting r shrinking keywords | 452 overwriting r shrinking keywords |
451 $ hg forget r | 453 $ hg forget r |
832 | 834 |
833 $ mkdir x | 835 $ mkdir x |
834 $ hg copy a x/a | 836 $ hg copy a x/a |
835 $ hg --verbose kwshrink a | 837 $ hg --verbose kwshrink a |
836 overwriting a shrinking keywords | 838 overwriting a shrinking keywords |
839 - sleep required for dirstate.normal() check | |
840 $ sleep 1 | |
837 $ hg status a | 841 $ hg status a |
838 $ hg --verbose kwexpand a | 842 $ hg --verbose kwexpand a |
839 overwriting a expanding keywords | 843 overwriting a expanding keywords |
840 $ hg status a | 844 $ hg status a |
841 | 845 |