##// 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 | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
merge with other head by default, not tip....
 r2915 #!/bin/sh
hg init
echo a > a
hg commit -A -ma
Greg Ward
test-merge-default: make content of test repo clearer....
 r10504 echo b >> a
Vadim Gelfer
merge with other head by default, not tip....
 r2915 hg commit -mb
Greg Ward
test-merge-default: make content of test repo clearer....
 r10504 echo c >> a
Vadim Gelfer
merge with other head by default, not tip....
 r2915 hg commit -mc
hg up 1
Greg Ward
test-merge-default: make content of test repo clearer....
 r10504 echo d >> a
Vadim Gelfer
merge with other head by default, not tip....
 r2915 hg commit -md
hg up 1
Greg Ward
test-merge-default: make content of test repo clearer....
 r10504 echo e >> a
Vadim Gelfer
merge with other head by default, not tip....
 r2915 hg commit -me
hg up 1
echo % should fail because not at a head
hg merge
hg up
echo % should fail because \> 2 heads
Mads Kiilerich
test-merge-default and check-code.py: No "export x=x" in sh
 r10658 HGMERGE=internal:other; export HGMERGE
Vadim Gelfer
merge with other head by default, not tip....
 r2915 hg merge
echo % should succeed
hg merge 2
hg commit -mm1
echo % should succeed - 2 heads
Dirkjan Ochtman
merge: rename -S/--show option to -P/--preview
 r8834 hg merge -P
Vadim Gelfer
merge with other head by default, not tip....
 r2915 hg merge
hg commit -mm2
Benoit Boissinot
improve error message for 'hg merge' when repo already at branchtip
 r5242 echo % should fail because at tip
hg merge
hg up 0
Vadim Gelfer
merge with other head by default, not tip....
 r2915 echo % should fail because 1 head
hg merge
Benoit Boissinot
merge: add hints about the use of 'hg heads' to find the rev to merge
 r10355 hg up 3
Greg Ward
test-merge-default: make content of test repo clearer....
 r10504 echo f >> a
Benoit Boissinot
merge: add hints about the use of 'hg heads' to find the rev to merge
 r10355 hg branch foobranch
hg commit -mf
echo % should fail because merge with other branch
hg merge
Greg Ward
merge: fix --preview to show all nodes that will be merged (issue2043)....
 r10505 # 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
Vadim Gelfer
merge with other head by default, not tip....
 r2915 true