Comment 3 for bug 322767

So it's possible to generate .moved files or directories if you have a conflict adding a directory because eg two different people have added it. It's possible that both of them will be present and versioned, in which case the scenario can look like this:

 bzr merge ../other
 bzr resolve --all
   (now the .moved file still exists and is versioned)
 bzr commit

resolve --all means to mark everything as resolved regardless of what's in the directory. It's possible people are doing that when they don't know what else to do.

It's also possible that they do have a .moved file and are explicitly adding it, in which case blocking that like in bug 308403 may help. Also, handling of tree shape conflicts could be better in general, both as far as what's marked as a conflict and what needs to be done to resolve them.

What specifically needs to be done to close this support issue? Is warning/blocking add of ignored files enough?