Comment 1 for bug 504835

On Fri, 08 Jan 2010 16:55:24 -0000, Ted Gould <email address hidden> wrote:
> Public bug reported:
>
>
> I can't tell you what this means; I think it's bad. But I'm not sure. I'd propose a fix, but I don't know what it's saying :)
>
> $ bzr merge --force --weave ../icon-path-karmic/
> Warning: criss-cross merge encountered. See bzr help criss-cross.
> bzr: ERROR: The file id "changelog-20091102011209-0tu4wfm2gvucbft6-2"
> is not present in the tree <Inventory object at a7939ec,
> contents="{'tests-200910210

Could you run again with "-Derror" so that we can see where the
exception is being raised?

We should consider making this an internal error, and having UIs catch
and wrap it, or perhaps changing the __str__, as this isn't a very good
error message.

Thanks,

James