[issue850] Directory rename inference may lead to unexpected merge result
mercurial-bugs at selenic.com
Fri Nov 30 08:37:30 CST 2007
New submission from Peter Arrenbrecht <peter.arrenbrecht at gmail.com>:
When moving the sole file within a folder "a" to a new folder "b", hg infers
folder "a" was renamed to "b". But that was not the intention. A subsequent
merge of a new file in "a" moves the new file to "b".
#rm repo -rf # -- uncomment to make repeatable
hg init repo
hg init one
echo "one" >a/one
hg ci -m "one"
hg clone one two
echo "two" >a/two
hg ci -m "two"
hg mv a/one b/one
hg ci -m "a2b"
hg pull -u ../two
echo "a contains"
echo "b contains"
title: Directory rename inference may lead to unexpected merge result
Mercurial issue tracker <mercurial-bugs at selenic.com>
More information about the Mercurial-devel