##// 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.
Mads Kiilerich - - Load All Authors

File last commit:

r10658:95c7c4b7 stable
r12156:4c94b6d0 default
Show More
test-merge-default
60 lines | 920 B | text/plain | TextLexer
/ tests / test-merge-default
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo a > a
hg commit -A -ma
echo b >> a
hg commit -mb
echo c >> a
hg commit -mc
hg up 1
echo d >> a
hg commit -md
hg up 1
echo e >> a
hg commit -me
hg up 1
echo % should fail because not at a head
hg merge
hg up
echo % should fail because \> 2 heads
HGMERGE=internal:other; export HGMERGE
hg merge
echo % should succeed
hg merge 2
hg commit -mm1
echo % should succeed - 2 heads
hg merge -P
hg merge
hg commit -mm2
echo % should fail because at tip
hg merge
hg up 0
echo % should fail because 1 head
hg merge
hg up 3
echo f >> a
hg branch foobranch
hg commit -mf
echo % should fail because merge with other branch
hg merge
# Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that
# are not ancestors of 7, regardless of where their least common
# ancestor is.
echo % merge preview not affected by common ancestor
hg up -q 7
hg merge -q -P 6 # expect: 2, 4, 5, 6
true