##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: remove unneeded -d flags...
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.
Martin Geisler - - Load All Authors

File last commit:

r8167:6c82beaa default
r12156:4c94b6d0 default
Show More
test-issue522
31 lines | 632 B | text/plain | TextLexer
/ tests / test-issue522
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# In the merge below, the file "foo" has the same contents in both
# parents, but if we look at the file-level history, we'll notice that
# the version in p1 is an ancestor of the version in p2. This test
# makes sure that we'll use the version from p2 in the manifest of the
# merge revision.
hg init repo
cd repo
echo foo > foo
hg ci -qAm 'add foo'
echo bar >> foo
hg ci -m 'change foo'
hg backout -r tip -m 'backout changed foo'
hg up -C 0
touch bar
hg ci -qAm 'add bar'
hg merge --debug
hg debugstate | grep foo
hg st -A foo
hg ci -m 'merge'
hg manifest --debug | grep foo
hg debugindex .hg/store/data/foo.i