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

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

addremove: correctly handle intermediate symlinks...
addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).
Thomas Arendsen Hein - - Load All Authors

File last commit:

r5080:73fdc8bd default
r6651:7f0dd352 default
Show More
test-pull-update
29 lines | 301 B | text/plain | TextLexer
/ tests / test-pull-update
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Update on pull -u when heads were closed (fixes issue666)....
 r5080 #!/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