##// 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.
Matt Mackall - - Load All Authors

File last commit:

r5059:8d9bdcbb default
r6385:0d4e068e default
Show More
test-copy-move-merge
30 lines | 292 B | text/plain | TextLexer
/ tests / test-copy-move-merge
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
mkdir t
cd t
hg init
echo 1 > a
hg ci -qAm "first" -d "1000000 0"
hg cp a b
hg mv a c
echo 2 >> b
echo 2 >> c
hg ci -qAm "second" -d "1000000 0"
hg co -C 0
echo 0 > a
echo 1 >> a
hg ci -qAm "other" -d "1000000 0"
hg merge --debug
echo "-- b --"
cat b
echo "-- c --"
cat c