##// END OF EJS Templates
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.

File last commit:

r6112:5ffa9627 default
r6206:0b6f1249 default
Show More
test-symlink-basic
40 lines | 700 B | text/plain | TextLexer
#!/bin/sh
"$TESTDIR/hghave" symlink || exit 80
hg init a
cd a
ln -s nothing dangling
hg commit -m 'commit symlink without adding' dangling
hg add dangling
hg commit -m 'add symlink'
hg tip -v
hg manifest --debug
echo '% rev 0:'
$TESTDIR/readlink.py dangling
rm dangling
ln -s void dangling
hg commit -m 'change symlink'
echo '% rev 1:'
$TESTDIR/readlink.py dangling
echo '% modifying link'
rm dangling
ln -s empty dangling
$TESTDIR/readlink.py dangling
echo '% reverting to rev 0:'
hg revert -r 0 -a
$TESTDIR/readlink.py dangling
echo '% backups:'
$TESTDIR/readlink.py *.orig
rm *.orig
hg up -C
echo '% copies'
hg cp -v dangling dangling2
hg st -Cmard
$TESTDIR/readlink.py dangling dangling2