[MERGE] Cope with ghosts in mainline history (was: Re: ghost revs/inconsistent parents/missing revs in bzr check)

[Jelmer Vernooij]

Tom Cato Amundsen wrote:
>> Isn't that just a specific bug in Bazaar related to ghosts? This sort of
>> thing shouldn't be a problem in general with ghosts AFAIU. It also seems
>> somewhat specific to your situation; I have several branches with
>> ghosts, and none of them has had this problem.
>>
> 
> https://bugs.launchpad.net/bzr/+bug/248540
> 
> Yes, I guess this would have been fixed if more people had the
> problem. There is a workaround for my repo mentioned in the bug
> report, but there is a performance issue. So if I could get my repo
> fixed without changing bzr, I guess that would be the best solution.

Any chance you can try with the attached patch ? Unfortunately it
doesn't include any tests but it seems to at least fix the last case you
mentioned in your bug report.

Cheers,

Jelmer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug248540.diff
Type: text/x-diff
Size: 5638 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090407/e13dac19/attachment.bin