[MERGE][bug 336749] deal with text revisions that originated in revisions that are ghosts in reconcile

[Tom Cato Amundsen]

The patch definately changes things, but it is not still possible to
reconcile the solfege.dev branch. With an uptodate bzr.dev (revno
4393) and mainline-ghosts-4273.patch and
referenced-ghost-text-4386.patch I get this error message:

tom at tomsin-laptop:~/tmp/bzr/bzr-ghost.dev$ ./bzr reconcile ~/tmp/solfege.test/
Reconciling branch file:///home/tom/tmp/solfege.test/
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.test/.bzr/repository/')".

So this is progress. bzr 1.15 display this traceback:

tom at tomsin-laptop:~/tmp$ bzr reconcile solfege.test
Reconciling branch file:///home/tom/tmp/solfege.test/
bzr: ERROR: exceptions.KeyError:
'Arch-1:tca at gnu.org--solfege-2005%solfege--unstable--3.1--version-0'

Traceback (most recent call last):
  File "/home/tom/lib/python/bzrlib/commands.py", line 729, in
exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/home/tom/lib/python/bzrlib/commands.py", line 924, in run_bzr
    ret = run(*run_argv)
  File "/home/tom/lib/python/bzrlib/commands.py", line 560, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/tom/lib/python/bzrlib/builtins.py", line 1491, in run
    reconcile(dir)
  File "/home/tom/lib/python/bzrlib/reconcile.py", line 53, in reconcile
    reconciler.reconcile()
  File "/home/tom/lib/python/bzrlib/reconcile.py", line 77, in reconcile
    self._reconcile()
  File "/home/tom/lib/python/bzrlib/reconcile.py", line 83, in _reconcile
    self._reconcile_branch()
  File "/home/tom/lib/python/bzrlib/reconcile.py", line 95, in _reconcile_branch
    branch_reconciler = self.branch.reconcile(thorough=True)
  File "/home/tom/lib/python/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/home/tom/lib/python/bzrlib/branch.py", line 1251, in reconcile
    reconciler.reconcile()
  File "/home/tom/lib/python/bzrlib/reconcile.py", line 128, in reconcile
    self._reconcile_steps()
  File "/home/tom/lib/python/bzrlib/reconcile.py", line 135, in _reconcile_steps
    self._reconcile_revision_history()
  File "/home/tom/lib/python/bzrlib/reconcile.py", line 141, in
_reconcile_revision_history
    last_revision_id))
  File "/home/tom/lib/python/bzrlib/repository.py", line 2247, in
iter_reverse_revision_history
    parents = graph.get_parent_map([next_id])[next_id]
KeyError: 'Arch-1:tca at gnu.org--solfege-2005%solfege--unstable--3.1--version-0'

bzr 1.15 on python 2.6.2 (linux2)
arguments: ['/home/tom/bin/bzr', 'reconcile', 'solfege.test']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'nb_NO.UTF-8'
plugins:
  cia                  /home/tom/.bazaar/plugins/cia [1.0dev]
  launchpad            /home/tom/lib/python/bzrlib/plugins/launchpad [1.15]
  netrc_credential_store
/home/tom/lib/python/bzrlib/plugins/netrc_credential_store [1.15]
  upload               /home/tom/.bazaar/plugins/upload [1.0dev]
*** 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.
tom at tomsin-laptop:~/tmp$


On Thu, May 28, 2009 at 5:11 PM, Bundle Buggy
<bundlebuggy at aaronbentley.com> wrote:
> Bundle Buggy has detected this merge request.
>
> For details, see:
> http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C4A1EA958.1000302%40vernstok.nl%3E
> Project: Bazaar
>
>



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