I am trying to weave merge two branches, because they are criss-cross merged. The weave merge aborts with the following:
jal@paris:~/bzr/puzzler-split/domui-lf$ bzr merge --weave ../domui
Warning: criss-cross merge encountered. See bzr help criss-cross.
bzr: ERROR: exceptions.TypeError: 'NoneType' object is not iterable
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 930, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1121, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
return self._operation.run_simple(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4475, in run
verified)
File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 4494, in _do_merge
conflict_count = merger.do_merge()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 686, in do_merge
merge = operation.run_simple()
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 654, in _do_merge_to
merge.do_merge()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 802, in do_merge
operation.run()
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 132, in run
self.cleanups, self.func, self, *args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 807, in _do_merge
self._compute_transform()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 849, in _compute_transform
file_status = self._do_merge_contents(file_id)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 1306, in _do_merge_contents
hook_status, lines = hook.merge_contents(params)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 1417, in merge_contents
merge_hook_params.trans_id)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 1687, in text_merge
lines, base_lines = self._merged_lines(file_id)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 1666, in _merged_lines
plan = self._generate_merge_plan(file_id, base)
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 1655, in _generate_merge_plan
base=base)
File "/usr/lib/python2.7/dist-packages/bzrlib/tree.py", line 458, in plan_file_merge
last_revision_base)
File "/usr/lib/python2.7/dist-packages/bzrlib/versionedfile.py", line 1485, in plan_merge
return _PlanMerge(ver_a, ver_b, self, (self._file_id,)).plan_merge()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 2186, in __init__
self._build_weave()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 2355, in _build_weave
parent_map = self._find_recursive_lcas()
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 2238, in _find_recursive_lcas
unique_lca))
File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 2266, in _find_unique_parents
self.graph.find_unique_ancestors(tip, [base_key]))
File "/usr/lib/python2.7/dist-packages/bzrlib/graph.py", line 462, in find_unique_ancestors
unique_searcher, common_searcher)
File "/usr/lib/python2.7/dist-packages/bzrlib/graph.py", line 547, in _make_unique_searchers
ancestor_all_unique)
File "/usr/lib/python2.7/dist-packages/bzrlib/graph.py", line 735, in _make_breadth_first_searcher
return _BreadthFirstSearcher(revisions, self)
File "/usr/lib/python2.7/dist-packages/bzrlib/graph.py", line 1332, in __init__
self._next_query = set(revisions)
TypeError: 'NoneType' object is not iterable
bzr 2.6.0dev3 on python 2.7.4 (Linux-3.8.0-25-generic-x86_64-with-
Ubuntu-13.04-raring)
arguments: ['/usr/bin/bzr', 'merge', '--weave', '../domui']
plugins: bash_completion[2.6.0dev3], bzrtools[2.5.0],
changelog_merge[2.6.0dev3], commitchecker[unknown], fastimport[0.9.0dev],
grep[2.6.0dev3], history_db[unknown], launchpad[2.6.0dev3],
netrc_credential_store[2.6.0dev3], news_merge[2.6.0dev3],
po_merge[2.6.0dev3], qbzr[0.23.0], rewrite[0.6.4dev], search[1.7.0dev],
undelete[0.2.0], weave_fmt[2.6.0dev3], xmloutput[0.8.8]
encoding: 'utf-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
