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

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

commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
Benoit Boissinot - - Load All Authors

File last commit:

r3853:c0b44915 default
r6385:0d4e068e default
Show More
test-excessive-merge
46 lines | 566 B | text/plain | TextLexer
/ tests / test-excessive-merge
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo foo > a
echo foo > b
hg add a b
hg ci -m "test" -d "1000000 0"
echo blah > a
hg ci -m "branch a" -d "1000000 0"
hg co 0
echo blah > b
hg ci -m "branch b" -d "1000000 0"
HGMERGE=true hg merge 1
hg ci -m "merge b/a -> blah" -d "1000000 0"
hg co 1
HGMERGE=true hg merge 2
hg ci -m "merge a/b -> blah" -d "1000000 0"
hg log
hg debugindex .hg/store/00changelog.i
echo
echo 1
hg manifest --debug 1
echo 2
hg manifest --debug 2
echo 3
hg manifest --debug 3
echo 4
hg manifest --debug 4
echo
hg debugindex .hg/store/data/a.i
hg verify