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

[Tom Cato Amundsen]

Branching with the -r options works. B "bzr check" display an error
message. See below.

Tom Cato

tom at tomsin-laptop:~/tmp$ ./bzr/b.dev/bzr branch -r 1037
~/src/solfege.dev solfege.dev
Branched 1037 revision(s).
tom at tomsin-laptop:~/tmp$ cd solfege.dev
tom at tomsin-laptop:~/tmp/solfege.dev$ ../bzr/b.dev/bzr check
Checking working tree at 'file:///home/tom/tmp/solfege.dev/'.
Checking repository at 'file:///home/tom/tmp/solfege.dev/'.
checked repository <bzrlib.transport.local.LocalTransport
url=file:///home/tom/tmp/solfege.dev/> format
<RepositoryFormatKnitPack1>
  1302 revisions
  1442 file-ids
  6693 unique file texts
1299153 repeated file texts
     0 unreferenced text versions
     3 ghost revisions
     3 revisions missing parents in ancestry
   272 inconsistent parents
Checking branch at 'file:///home/tom/tmp/solfege.dev/'.
bzr: ERROR: Revision
{Arch-1:tca at gnu.org--solfege-2005%solfege--unstable--3.1--version-0}
not present in "KnitPackRepository('file:///home/tom/tmp/solfege.dev/.bzr/repository/')".


On Tue, Apr 7, 2009 at 10:35 PM, Jelmer Vernooij <jelmer at vernstok.nl> wrote:
> 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
>
>



-- 
Tom Cato Amundsen <tca at gnu.org>                 http://www.solfege.org/
GNU Solfege - free ear training    http://www.gnu.org/software/solfege/