Mercurial > hg > mercurial-crew
view tests/test-merge-revert2.out @ 12156:4c94b6d0fb1c
tests: remove unneeded -d flags
Many tests fixed the commit date of their changesets at '1000000 0' or
similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not
better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is
the default run-tests.py installs.
Removing the unnecessary flag removes some clutter and will hopefully
make it clearer what the tests are really trying to test. Some tests
did not even change their output when the dates were changed, in which
case the -d flag was truly irrelevant.
Dates used in sequence (such as '0 0', '1 0', etc...) were left alone
since they may make the test easier to understand.
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Thu, 02 Sep 2010 23:22:51 +0200 |
| parents | 92ccccb55ba3 |
| children |
line wrap: on
line source
1:dfab7f3c2efb 0:c3fa057dd86f dfab7f3c2efb tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved c3fa057dd86f c3fa057dd86f+ reverting file1 c3fa057dd86f 1 files updated, 0 files merged, 0 files removed, 0 files unresolved dfab7f3c2efb tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file1 warning: conflicts during merge. merging file1 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges diff -r dfab7f3c2efb file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 another line of text +<<<<<<< local +changed file1 different +======= changed file1 +>>>>>>> other M file1 ? file1.orig dfab7f3c2efb+ tip reverting file1 ? file1.orig dfab7f3c2efb tip ? file1.orig dfab7f3c2efb tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig dfab7f3c2efb tip