Checkout of joined branches fails

[Radim Kolář]

Today i joined several branches into one with BZR JOIN. It worked well, no errors but now i cant checkout newly joined repo.

C:\repos\foois-master>bzr checkout .
bzr: ERROR: exceptions.AssertionError: ('not present: %r', StaticTuple('', '', 'TREE_ROOT'))

Traceback (most recent call last):
  File "C:\Python26\lib\site-packages\bzrlib\commands.py", line 920, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "C:\Python26\lib\site-packages\bzrlib\commands.py", line 1131, in run_bzr
    ret = run(*run_argv)
  File "C:\Python26\lib\site-packages\bzrlib\commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "C:\Python26\lib\site-packages\bzrlib\commands.py", line 695, in run
    return self._operation.run_simple(*args, **kwargs)
  File "C:\Python26\lib\site-packages\bzrlib\cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "C:\Python26\lib\site-packages\bzrlib\cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "C:\Python26\lib\site-packages\bzrlib\builtins.py", line 1633, in run
    source.bzrdir.create_workingtree(revision_id)
  File "C:\Python26\lib\site-packages\bzrlib\bzrdir.py", line 910, in create_workingtree
    accelerator_tree=accelerator_tree, hardlink=hardlink)
  File "C:\Python26\lib\site-packages\bzrlib\workingtree_4.py", line 1549, in initialize
    delta_from_tree=delta_from_tree)
  File "C:\Python26\lib\site-packages\bzrlib\transform.py", line 2536, in build_tree
    delta_from_tree)
  File "C:\Python26\lib\site-packages\bzrlib\transform.py", line 2652, in _build_tree
    precomputed_delta=precomputed_delta)
  File "C:\Python26\lib\site-packages\bzrlib\transform.py", line 1758, in apply
    self._tree.apply_inventory_delta(inventory_delta)
  File "C:\Python26\lib\site-packages\bzrlib\mutabletree.py", line 52, in tree_write_locked
    return unbound(self, *args, **kwargs)
  File "C:\Python26\lib\site-packages\bzrlib\workingtree_4.py", line 1304, in apply_inventory_delta
    state.update_by_delta(changes)
  File "C:\Python26\lib\site-packages\bzrlib\dirstate.py", line 1387, in update_by_delta
    self._apply_insertions(insertions.values())
  File "C:\Python26\lib\site-packages\bzrlib\dirstate.py", line 1439, in _apply_insertions
    path_utf8=path_utf8)
  File "C:\Python26\lib\site-packages\bzrlib\dirstate.py", line 3116, in update_minimal
    raise AssertionError('not present: %r', entry_key)
AssertionError: ('not present: %r', StaticTuple('', '', 'TREE_ROOT'))

bzr 2.5.0 on python 2.6.6 (Windows-XP-5.1.2600-SP3)
arguments: ['C:\\Python26\\Scripts\\bzr', 'checkout', '.']
plugins: bash_completion[2.5.0], bookmarks[unknown], bzrtools[2.5.0],
    changelog_merge[2.5.0], fastimport[0.9.0dev], launchpad[2.5.0],
    netrc_credential_store[2.5.0], news_merge[2.5.0], po_merge[2.5.0],
    weave_fmt[2.5.0], xmloutput[0.8.8]
encoding: 'cp1250', fsenc: 'mbcs', lang: None

bzr check didnt discovered anything

C:\repos\foois-master>bzr check -v
Checking working tree at 'C:/repos/foois-master'.
Checking branch at 'file:///C:/repos/foois-master/'.
Checking repository at 'file:///C:/repos/foois-master/'.
checked repository file:///C:/repos/foois-master/ format RepositoryFormat2a()
   439 revisions
   262 file-ids
     0 unreferenced text versions
checked branch file:///C:/repos/foois-master/ format Branch format 7

[Radim Kolář (hsn10)]

workaround:

after checkout fails do bzr update -r 1;bzr update -r 2; etc...

[Radim Kolář (hsn10)]

bzr reconcile does not fix anything. but this sequence works:

bzr checkout <-- errror
bzr revert
bzr update

working tree builds, so it will be most likely fine.