Comment 9 for bug 246880

Revision history for this message
Colin Watson (cjwatson) wrote :

I tried to do this and got some way, but am now stuck. The current branch error is:

<cjwatson@sarantium ~/src/ubuntu/casper/bzr>$ bzr branch casper.backup junk
bzr: ERROR: Revision {Arch-1:<email address hidden>%casper--main--0--patch-9} not present in "x_Matt_Zimmerman_<email address hidden>_Sun_Mar_13_00:51:19_2005_1366.36".

I believe that I have imported that revision, although with some difficulty. fetch-ghosts refused to fetch it, I think because it was a direct ancestor, and I had to use bzrlib by hand to say this_branch.fetch(other_branch, 'Arch-1:<email address hidden>%casper--main--0--patch-26'). However, that succeeded (reporting 27 new revisions), so I proceeded to try to import the other branches that would supply the remaining ghosts.

My current attempts are failing like this. Relevant baz archives are:

  http://people.ubuntu.com/~<email address hidden>/
  http://people.ubuntu.com/~<email address hidden>/
  http://people.ubuntu.com/~<email address hidden>/
  http://people.ubuntu.com/~<email address hidden>/

<cjwatson@sarantium ~/src/ubuntu/casper/bzr/casper.backup>$ bzr check
checked branch file:///home/cjwatson/src/ubuntu/casper/bzr/casper.backup/ format Bazaar Branch Format 6 (bzr 0.15)
checked repository <bzrlib.transport.local.LocalTransport url=file:///home/cjwatson/src/ubuntu/casper/bzr/casper.backup/> format <RepositoryFormatKnitPack1>
   758 revisions
   115 file-ids
  1398 unique file texts
 33520 repeated file texts
     0 unreferenced text versions
    12 ghost revisions
    12 revisions missing parents in ancestry
<cjwatson@sarantium ~/src/ubuntu/casper/bzr/casper.backup>$ cd ..
<cjwatson@sarantium ~/src/ubuntu/casper/bzr>$ bzr baz-import-branch tfheen-unionfs <email address hidden>/casper--unionfs--0 casper.backup old-main
importing <email address hidden>/casper--unionfs--0 into /home/cjwatson/src/ubuntu/casper/bzr/tfheen-unionfs
Cleaning up
Import complete.
<cjwatson@sarantium ~/src/ubuntu/casper/bzr>$ cd casper.backup
<cjwatson@sarantium ~/src/ubuntu/casper/bzr/casper.backup>$ bzr fetch-ghosts ../tfheen-unionfs
Installed:
Arch-1:<email address hidden>%casper--unionfs--0--patch-3
Still missing:
Arch-1:<email address hidden>%casper--translations--0--patch-19
Arch-1:<email address hidden>%casper--quieten--0--patch-1
Arch-1:<email address hidden>%casper--vtfix--0--patch-2
Reconciling branch file:///home/cjwatson/src/ubuntu/casper/bzr/casper.backup/
revision_history ok.
Reconciling repository file:///home/cjwatson/src/ubuntu/casper/bzr/casper.backup/
bzr: ERROR: bzrlib.errors.KnitCorrupt: Knit inventory corrupt:
  sha-1 46ef5baf0c84edf97e1aa5fe25a1a9d9e89938fe
  of reconstructed text does not match
  expected 5e691b65534b4ebd046134664516fe58c0c30547
  for version Arch-1:<email address hidden>%casper--unionfs--0--base-0

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 846, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 797, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools/command.py", line 13, in run_argv_aliases
    commands.Command.run_argv_aliases(self, argv, alias_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 499, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools/__init__.py", line 160, in run
    fetch_ghosts(branch, no_fix)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools/fetch_ghosts.py", line 69, in fetch_ghosts
    cmd_reconcile().run(".")
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 1248, in run
    reconcile(dir)
  File "/usr/lib/python2.5/site-packages/bzrlib/reconcile.py", line 52, in reconcile
    reconciler.reconcile()
  File "/usr/lib/python2.5/site-packages/bzrlib/reconcile.py", line 76, in reconcile
    self._reconcile()
  File "/usr/lib/python2.5/site-packages/bzrlib/reconcile.py", line 83, in _reconcile
    self._reconcile_repository()
  File "/usr/lib/python2.5/site-packages/bzrlib/reconcile.py", line 102, in _reconcile_repository
    repo_reconciler = self.repo.reconcile(thorough=True)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/pack_repo.py", line 2069, in reconcile
    reconciler.reconcile()
  File "/usr/lib/python2.5/site-packages/bzrlib/reconcile.py", line 194, in reconcile
    self._reconcile_steps()
  File "/usr/lib/python2.5/site-packages/bzrlib/reconcile.py", line 538, in _reconcile_steps
    new_pack = self._packer.pack(pb=self.pb)
  File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/pack_repo.py", line 598, in pack
    return self._create_pack_from_packs()
  File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/pack_repo.py", line 731, in _create_pack_from_packs
    self._copy_text_texts()
  File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/pack_repo.py", line 1006, in _copy_text_texts
    ideal_index = repo._generate_text_key_index(self._text_refs, ancestors)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1347, in _generate_text_key_index
    text_key_references, pb)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1387, in _do_generate_text_key_index
    for rev_tree in self.revision_trees(to_query):
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1687, in revision_trees
    for inv in inventories:
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1508, in _iter_inventories
    texts = self.get_inventory_weave().get_texts(revision_ids)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1140, in get_texts
    return [''.join(l) for l in self.get_line_list(version_ids)]
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1146, in get_line_list
    text_map, content_map = self._get_content_maps(version_ids)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1203, in _get_content_maps
    (actual_sha, digest, version_id))
KnitCorrupt: Knit inventory corrupt:
  sha-1 46ef5baf0c84edf97e1aa5fe25a1a9d9e89938fe
  of reconstructed text does not match
  expected 5e691b65534b4ebd046134664516fe58c0c30547
  for version Arch-1:<email address hidden>%casper--unionfs--0--base-0

bzr 1.5 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'fetch-ghosts', '../tfheen-unionfs']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.UTF-8'
plugins:
  builddeb /usr/lib/python2.5/site-packages/bzrlib/plugins/builddeb [0.95.0dev0]
  bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.5.0]
  cia /usr/lib/python2.5/site-packages/bzrlib/plugins/cia [unknown]
  fastimport /home/cjwatson/.bazaar/plugins/fastimport [unknown]
  git /home/cjwatson/.bazaar/plugins/git [unknown]
  gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.94.0]
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  push_and_update /home/cjwatson/.bazaar/plugins/push_and_update [0.2.0dev0]
  push_fix /home/cjwatson/.bazaar/plugins/push_fix [unknown]
  rebase /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase [0.3.0]
  vimdiff /home/cjwatson/.bazaar/plugins/vimdiff [unknown]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

A tarball of several of the relevant bzr branches is here:

  http://people.ubuntu.com/~cjwatson/tmp/casper-wreckage.tar.gz