Crash while merging in bzr 0.1.1

[John Arbash Meinel]

John Eckerdal wrote:
> Hi,
> 

...

>>
>>>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?
> 
> 
> The tar-ball would be comparessed around 10 MB.

I certainly wasn't expecting you to mail it to the list. If there was
somewhere you could post it. But we'll do that later, only if we can't
figure this out.

> 
> The .cvsignore file is not present. I removed all of the .cvsignore
> files. I also put .cvsigore in my .bzrignore at some time (this was
> done before they were removed).

Putting a line into .bzrignore should have no influence on this. The
error seems to be more of the form "I want to compare this file" but
that file is not present.

> 
> 
>>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 {}).
> 
> 
> Something like this?
> 
> inventory.weave:. <file
> file_id="cvsignore-20050829233412-8f3c675d3c08c5f6" name=".cvsignore"
> parent_id="trepia-20050829233411-60efeb9759f43270"
> revision="john.eckerdal at gmail.com-20050829233435-369fff7f4221ac6e"
> text_sha1="f3036716d4a59865b26b1fbcd58a263233279f21" text_size="83" />
> 

Well, that is your .weave file, where it is finding that you *used* to
have a file. I was wondering about the current inventory. Though it
looks like you used grep, and I'm guessing the reason you didn't find
anything was because there was nothing there.

Do you know what the merge is trying to do? It sounds like it is trying
to modify a deleted file.

John
=:->
-------------- 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/20051024/fa2291d9/attachment.pgp