Comment 6 for bug 192859

Revision history for this message
Martin Pool (mbp) wrote :

https://bugs.edge.launchpad.net/bzr/+bug/240762 is similar but happening during merge

bug 341555 is basically the same as the first case: the working inventory holds a symlink entry, but now it's changed to be a directory, therefore it can have children

Just doing 'bzr st' will fix the situation because that re-checks the kind of all wt entries.

In a way the root problem here is that the dirstate column 0 has a 'kind' value: if it's different to what's actually on disk then it's the external reality that is correct.