Conflict while using "bzr pull"

[Jamie Wilkinson]

This one time, at band camp, John Arbash Meinel wrote:
>I keep a set of mirrors of all of the major bzr branches (or at least
>any that I come into contact with).
>I keep them up-to-date with my update-mirrors plugin, which is
>essentially just a "bzr pull --overwrite --verbose", on a bunch of
>different branches.
>
>This morning, it tried to updated Aaron's "bzr.ab" branch. Attached is
>the errors that I got.
>
>This is the current state of the branch:
>$ bzr log --short -r -1
> 1265 Aaron Bentley     2005-12-11
>      Merged the new bzr missing command
>
>The tree was really messed up (it had alternate directories, a lot of
>changes, etc) I removed the bzr-tree-change file, and eventually got it
>cleaned up with a few bzr reverts, and clean-tree.
>
>It seems that the pull itself had succeeded, because I wasn't missing
>any revisions.

I've seen this twice, at least, on my laptop and workstation; in both cases
I assumed it was my fault, and fixed by doing something like:

bzr branch bzr.dev bzr.newdev
cd bzr.newdev
bzr pull http://.../bzr.dev
cd ..
mv bzr.dev bzr.olddev
mv bzr.newdev bzr.dev

and then after that the bzr.dev directory had a clean status report.

I also didn't keep the pre-images around :(