mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
502b9e407c
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.
30 lines
301 B
Bash
Executable File
30 lines
301 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
|
|
hg init t
|
|
cd t
|
|
echo 1 > foo
|
|
hg ci -Am m
|
|
|
|
cd ..
|
|
hg clone t tt
|
|
cd tt
|
|
echo 1.1 > foo
|
|
hg ci -Am m
|
|
|
|
cd ../t
|
|
echo 1.2 > foo
|
|
hg ci -Am m
|
|
echo % should fail
|
|
hg pull -u ../tt
|
|
|
|
cd ../tt
|
|
echo % should fail
|
|
hg pull -u ../t
|
|
HGMERGE=true hg merge
|
|
hg ci -mm
|
|
|
|
cd ../t
|
|
echo % should work
|
|
hg pull -u ../tt
|