Comment 7 for bug 929164

Clint hit a similar problem with cyrus-sasl2, and I confirmed that the same bzr bd -S bug hits that package after the merge. The common theme here is that both had conflicts which had to be resolved manually.

I've confirmed that `bzr rm` with no arguments solves the bzr bd -S problem. Why is that and is there anything we can do to avoid having to run bzr rm?