##// 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.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r3389:efbe24c7 default
r6385:0d4e068e default
Show More
test-merge8
19 lines | 263 B | text/plain | TextLexer
/ tests / test-merge8
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update