Conflict while using "bzr pull"

[John Arbash Meinel]

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'm sorry I didn't keep the pre-image, so I realize this bug report is
somewhat incomplete. But I thought I would at least mention it.

John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: traceback.txt
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20051212/b128bf24/attachment.txt 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051212/b128bf24/attachment.pgp