Crash while merging in bzr 0.1.1

[John Eckerdal]

Hi,

On 10/24/05, John A Meinel <john at arbash-meinel.com> wrote:
> 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?

The tar-ball would be comparessed around 10 MB.

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).

> 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" />

--
John