[issue2093] update with local changes doesn't correctly directory renames

[Benoit Boissinot]

New submission from Benoit Boissinot <bboissin at gmail.com>:

With the following script:

hg init repo
cd repo
mkdir t
for i in a b c d e ;
do	echo $i > t/$i
done
hg ci -Am init
hg mv t tt
hg ci -m rename


hg up 0
echo f > t/f
hg add t/f    # new
echo g > t/g  # unknown
hg rm t/a     # removed
echo b >> t/b # modified
hg st -A
#hg ci -m m
#hg --debug merge
hg --debug up
hg st -A

'f' is marked as modified in tt (instead of new), 'a' isn't removed and 
'b' isn't merged.

If we commit first, it's better but not perfect: 'a' isn't removed by the 
merge.

----------
messages: 12041
nosy: mpm, tonfa
priority: bug
status: unread
title: update with local changes doesn't correctly directory renames
topic: merge

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2093>
____________________________________________________