Comment 1 for bug 1100385

Revision history for this message
Brian de Alwis (slyguy) wrote :

Oops: here's the .bzr.log:

Wed 2013-01-16 12:06:54 -0500
0.044 bazaar version: 2.6b2
0.045 bzr arguments: [u'rebase', u'../a']
0.048 looking for plugins in /Users/bsd/.bazaar/plugins
0.074 Deprecated function called
Called from:
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/plugin.py", line 382, in _load_plugin_module
    exec "import bzrlib.plugins.%s" % name in {}
  File "<string>", line 1, in <module>
  File "/Users/bsd/.bazaar/plugins/keywords/__init__.py", line 386, in <module>
    filters.register_filter_stack_map('keywords', _keywords_filter_stack_lookup)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/symbol_versioning.py", line 100, in decorated_function
    trace.mutter_callsite(4, "Deprecated function called")
0.089 looking for plugins in /usr/pkg/lib/python2.7/site-packages/bzrlib/plugins
0.089 Plugin name bash_completion already loaded
0.089 Plugin name git already loaded
0.099 encoding stdout as sys.stdout encoding 'UTF-8'
0.120 opening working tree '/private/tmp/b'
0.133 Using fetch logic to copy between CHKInventoryRepository('file:///private/tmp/a/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///private/tmp/b/.bzr/repository/')(RepositoryFormat2a())
0.135 fetching: <SearchResult search:(set(['<email address hidden>']), set(['<email address hidden>', 'null:']), 1)>
0.157 Using fetch logic to copy between CHKInventoryRepository('file:///private/tmp/a/.bzr/repository/')(RepositoryFormat2a()) and CHKInventoryRepository('file:///private/tmp/b/.bzr/repository/')(RepositoryFormat2a())
0.157 fetching: <SearchResult search:(set(['<email address hidden>']), set(['<email address hidden>', 'null:', '<email address hidden>']), 0)>
0.158 Started 2 unique searchers for 2 unique revisions
0.166 Not saving DirState because _changes_aborted is set.
0.167 Transferred: 0kB (0.0kB/s r:0kB w:0kB)
0.176 Traceback (most recent call last):
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/commands.py", line 930, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/commands.py", line 1141, in run_bzr
    ret = run(*run_argv)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/commands.py", line 697, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/commands.py", line 1158, in ignore_pipe
    result = func(*args, **kwargs)
  File "/Users/bsd/.bazaar/plugins/rewrite/commands.py", line 227, in run
    finish_rebase(state, wt, replace_map, replayer)
  File "/Users/bsd/.bazaar/plugins/rewrite/commands.py", line 48, in finish_rebase
    rebase(wt.branch.repository, replace_map, replayer)
  File "/Users/bsd/.bazaar/plugins/rewrite/rebase.py", line 378, in rebase
    revision_rewriter(revid, newrevid, newparents)
  File "/Users/bsd/.bazaar/plugins/rewrite/rebase.py", line 489, in __call__
    complete_revert(self.wt, [newparents[0]])
  File "/Users/bsd/.bazaar/plugins/rewrite/rebase.py", line 576, in complete_revert
    wt.set_parent_ids([r for r in newparents[:1] if r != NULL_REVISION])
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/mutabletree.py", line 52, in tree_write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/workingtree_4.py", line 1110, in set_parent_ids
    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/mutabletree.py", line 52, in tree_write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/workingtree_4.py", line 1170, in set_parent_trees
    dirstate.update_basis_by_delta(delta, rev_id)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/dirstate.py", line 1582, in update_basis_by_delta
    self._update_basis_apply_adds(adds)
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/dirstate.py", line 1652, in _update_basis_apply_adds
    "Unable to find block for this record."
  File "/usr/pkg/lib/python2.7/site-packages/bzrlib/dirstate.py", line 1623, in _raise_invalid
    raise errors.InconsistentDelta(path, file_id, reason)
InconsistentDelta: An inconsistent delta was supplied involving 'dir/file', 'file-20130116170606-9odv6d1bgevoz5rc-1'
reason: Unable to find block for this record. Was the parent added?

0.176 return code 3
2909.138 return code 3
(END)