[issue586] removing remote files after merge appears to corrupt the dirstate

Brendan Cully mercurial-bugs at selenic.com
Sun Jun 10 18:38:59 CDT 2007


New submission from Brendan Cully <brendan at kublai.com>:

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Ammergebug

hg st -A

The output is:
R a
C b

Looks like dirstate is somehow corrupted. I can even do further commits.
It's also not clear why hg rm needs -f to remove the remote file (it reports it
as modified).

----------
messages: 3189
nosy: alexis, brendan, evanp, mpm
priority: bug
status: unread
title: removing remote files after merge appears to corrupt the dirstate
topic: merge

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



More information about the Mercurial-devel mailing list