##// 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.
Patrick Mezard - - Load All Authors

File last commit:

r5075:2184378b default
r6206:0b6f1249 default
Show More
test-issue352
24 lines | 269 B | text/plain | TextLexer
/ tests / test-issue352
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# http://www.selenic.com/mercurial/bts/issue352
"$TESTDIR/hghave" eol-in-paths || exit 80
hg init foo
cd foo
A=`printf 'he\rllo'`
echo foo > "$A"
hg add
hg ci -A -m m
rm "$A"
echo foo > "hell
o"
hg add
hg ci -A -m m
echo foo > "$A"
hg debugwalk
exit 0