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

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

Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r5057:99a4592e default
r5080:73fdc8bd default
Show More
test-double-merge
30 lines | 523 B | text/plain | TextLexer
/ tests / test-double-merge
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init repo
cd repo
echo line 1 > foo
hg ci -qAm 'add foo' -d "1000000 0"
# copy foo to bar and change both files
hg cp foo bar
echo line 2-1 >> foo
echo line 2-2 >> bar
hg ci -m 'cp foo bar; change both' -d "1000000 0"
# in another branch, change foo in a way that doesn't conflict with
# the other changes
hg up -qC 0
echo line 0 >| foo
hg cat foo >> foo
hg ci -m 'change foo' -d "1000000 0"
# we get conflicts that shouldn't be there
hg merge --debug
echo "-- foo --"
cat foo
echo "-- bar --"
cat bar