Crash while merging in bzr 0.1.1

[John Eckerdal]

On 10/24/05, John Arbash Meinel <john at arbash-meinel.com> wrote:
> John Eckerdal wrote:
> > Hi,
> >
>

[snip]

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

Yep. grep was used here.

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

The original .cvsignore was modified. And in the branch I am trying to
merge this to the .cvsignore file is no longer present. So yes, there
was a modification in one branch that was deleted in the other branch.
This worked nicely in bzr 0.0.7.

Then I tried to upgrade to bzr 0.1 / 0.1.1 and during this I hade to
upgrade the format also.

I think that after this upgrade this is the first time a merge to a
deleted file occured.

--
John