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

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

fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
Vadim Gelfer - - Load All Authors

File last commit:

r1960:dac4bd67 default
r6206:0b6f1249 default
Show More
test-unrelated-pull
20 lines | 217 B | text/plain | TextLexer
/ tests / test-unrelated-pull
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -m "a" -u a -d "1000000 0"
cd ..
mkdir b
cd b
hg init
echo 321 > b
hg add b
hg commit -m "b" -u b -d "1000000 0"
hg pull ../a
hg pull -f ../a
hg heads