Comment 4 for bug 4700

Robert says the "Conflict adding files to lib/canonical/lp/z3batching." is because z3batching was deleted by the branch Brad was merging in, but there are .pyc files in the directory in the working tree.

This is worse than the previous "Directory $foo not removed because it is not empty" message, which is more like what I would expect (regardless of how "bzr conflicts" subsequently reports this or not). "Conflict adding files" is surprising, because the user hasn't added any files to that directory, and the branch merged from is *deleting* that directory, so it's a mystery what files it thinks are being added, especially as bzr doesn't say which files it's referring to, and there's no obvious way to find out.

Anyway, I think I would like bzr conflicts to inform me of non-textual conflicts, even if I don't need to explicitly resolve them to commit. After a large merge, the output of "bzr st" is quite large, so I really want to use "bzr conflicts" as a way to see where the potential problems with this merge are, as a sort of task list of things to look at (and probably resolve) before I commit. I wouldn't want to miss thinking about a tree-shape conflict because it's only listed as a one-off warning. I don't care about this as much as having the conflict be clearly described, though.