Revision not present in CHKInventoryRepository(..)

John Arbash Meinel john at arbash-meinel.com
Mon Oct 17 08:16:10 UTC 2011


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10/17/2011 8:09 AM, Andrew Foster wrote:
> John Meinel wrote:
>> The history is already missing. It is just that bzr0.8.2 didn't 
>> notice. We do want to support your use case, though. I suppose
>> the big question is why r156. If you were using 0.8.2, I think it
>> is possible for it to have picked a revision history that didn't
>> match the mainline history.
> 
> Looking at the revision log using 0.8.2, I don't see any
> particular relevance to r156 nor its surrounding commits, they were
> regular I'm-not-fiddling-with-bzr patches.
> 
> I tried a `bzr check` and got:
> 
> saboteur:test andy$ bzr check Checking working tree at
> '/Users/andy/projects/test'. Checking branch at
> 'file:///Users/andy/projects/test/'. Checking repository at
> 'file:///Users/andy/projects/test/'. checked repository
> file:///Users/andy/projects/test/ format RepositoryFormat2a()
>  3520 revisions 5141 file-ids 3 ghost revisions 48 inconsistent
> parents checked branch file:///Users/andy/projects/test/ format
> Branch format 7 found error:Internal check failed: revno does not
> match len(mainline) 1564 != -1
> 
>> I don't remember if we have an easy way to fix the revno. I think
>> (bzr reconcile --branch).
> 
> `bzr reconcile` runs, doubles the size of the .bzr folder, but
> doesn't change anything.
> 
> saboteur:test andy$ bzr reconcile Reconciling branch
> file:///Users/andy/projects/test/ revision_history ok. Reconciling
> repository file:///Users/andy/projects/test/ Reconciliation
> complete.

The extra space is in .bzr/repository/obsolete_packs you can delete
the files in there, but leave the directory alone. bzr itself will
delete those files eventually. We save them for a bit because OSes
like to lie about when data is actually written to disk.

If 'bzr check' noticed that len(mainline) of the branch was weird,
'bzr reconcile' should have fixed it.

I don't think fast-export supports having any ghosts, since it isn't
something the original format (git) supports at all. After reconcile,
does 'bzr log' work? Are the numbers shifted from what they used to be?

John
=:->


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6b5EoACgkQJdeBCYSNAANtWACdE0h6Or8LJacJvd4Zk7GiaRlM
tpwAoKG0+PsUbFhDxE29VQ6Wct5CCDK3
=qaR6
-----END PGP SIGNATURE-----



More information about the bazaar mailing list