Crash while merging in bzr 0.1.1

[John A Meinel]

John Eckerdal wrote:
> Hi,
>
> I am seeing a crash when trying to merge one branch to another.
> There are several versions in the two branches and I have been playing
> with bzr for a while now.
> Previously there was an issue when a file was removed from one branch
> that was later modified in the other but that specific problem was
> solved a few versions ago. However the first item in the backtrace
> below points to something similar ("not in inventory") (although this
> may be wrong since I am not familiar with the bzr internals).
>
> It should be noted that both branches was created with bzr-0.0.7 and
> the upgraded to bzr-0.1 (and I am now running bzr-0.1.1):
>

...

> 832, in __getitem__
> BzrError: file_id {cvsignore-20050829233412-8f3c675d3c08c5f6} not in inventory
>
> Not sure what more information you need here. If there is more I will
> try to provide it

Well, a tarball of the 2 branches might help. But mostly we need to know
what is actually being merged. Is the .cvsignore file present? Has it
been deleted?

You could also look at your ".bzr/inventory" file to try and match up
the id that it is looking for (the stuff inside the braces {}).

John
=:->

>
> Thanks in advance,
> John
>
>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051023/5818b15e/attachment.pgp