Mercurial > public > mercurial-scm > hg-stable
diff tests/test-double-merge.t @ 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 | b773ca489fd3 |
| children | efdcce3fd2d5 |
line wrap: on
line diff
--- a/tests/test-double-merge.t Thu Sep 02 22:17:22 2010 +0200 +++ b/tests/test-double-merge.t Thu Sep 02 23:22:51 2010 +0200 @@ -2,27 +2,27 @@ $ cd repo $ echo line 1 > foo - $ hg ci -qAm 'add foo' -d "1000000 0" + $ hg ci -qAm 'add foo' copy foo to bar and change both files $ hg cp foo bar $ echo line 2-1 >> foo $ echo line 2-2 >> bar - $ hg ci -m 'cp foo bar; change both' -d "1000000 0" + $ hg ci -m 'cp foo bar; change both' in another branch, change foo in a way that doesn't conflict with the other changes $ hg up -qC 0 $ echo line 0 > foo $ hg cat foo >> foo - $ hg ci -m 'change foo' -d "1000000 0" + $ hg ci -m 'change foo' created new head we get conflicts that shouldn't be there $ hg merge -P - changeset: 1:d9da848d0adf + changeset: 1:484bf6903104 user: test - date: Mon Jan 12 13:46:40 1970 +0000 + date: Thu Jan 01 00:00:00 1970 +0000 summary: cp foo bar; change both $ hg merge --debug @@ -34,7 +34,7 @@ checking for directory renames resolving manifests overwrite None partial False - ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf + ancestor e6dc8efe11cc local 6a0df1dad128+ remote 484bf6903104 foo: versions differ -> m foo: remote copied to bar -> m preserving foo for resolve of bar @@ -42,12 +42,12 @@ updating: foo 1/2 files (50.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging foo and bar to bar - my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da + my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc premerge successful updating: foo 2/2 files (100.00%) picked tool 'internal:merge' for foo (binary False symlink False) merging foo - my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da + my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc premerge successful 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)