Sorry, but it looks like this is still unresolved. I tried to recreate the same repository structures as before by merging two earlier unrelated repositories. That initial merge worked OK. But when I then merge an updated branch into the combined branch I again get a similar error:
jal@odeon:~/bzr/t-merge$ bzr merge ../domui-trunk
Warning: criss-cross merge encountered. See bzr help criss-cross.
bzr: ERROR: No final name for trans_id 'new-211'
file-id: None
root trans-id: 'new-0'
The .bzr.log file states:
Sat 2010-09-04 17:54:12 +0200
0.029 bazaar version: 2.2.0
0.030 bzr arguments: [u'merge', u'../domui-trunk']
0.040 looking for plugins in /home/jal/.bazaar/plugins
0.080 looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.080 Plugin name qbzr already loaded
0.086 encoding stdout as sys.stdout encoding 'UTF-8'
0.107 opening working tree '/home/jal/bzr/t-merge'
[ 4337] 2010-09-04 17:54:13.753 WARNING: Warning: criss-cross merge encountered. See bzr help criss-cross.
0.776 Criss-cross lcas: set(['<email address hidden>', '<email address hidden>'])
0.824 Base revid: '<email address hidden>'
1.740 Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 911, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1111, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 689, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 704, in run
return self._operation.run_simple(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3882, in run
verified)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3901, in _do_merge
conflict_count = merger.do_merge()
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 704, in do_merge
merge = operation.run_simple()
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 675, in _do_merge_to
merge.do_merge()
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 814, in do_merge
operation.run()
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 131, in run
self.cleanups, self.func, self, *args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 819, in _do_merge
self._compute_transform()
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 864, in _compute_transform
self.fix_root()
File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 1128, in fix_root
self.tt.adjust_path(self.tt.final_name(trans_id),
File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 466, in final_name
raise NoFinalPath(trans_id, self)
NoFinalPath: No final name for trans_id 'new-211'
file-id: None
root trans-id: 'new-0'
Sorry, but it looks like this is still unresolved. I tried to recreate the same repository structures as before by merging two earlier unrelated repositories. That initial merge worked OK. But when I then merge an updated branch into the combined branch I again get a similar error:
jal@odeon: ~/bzr/t- merge$ bzr merge ../domui-trunk
Warning: criss-cross merge encountered. See bzr help criss-cross.
bzr: ERROR: No final name for trans_id 'new-211'
file-id: None
root trans-id: 'new-0'
The .bzr.log file states:
Sat 2010-09-04 17:54:12 +0200 .bazaar/ plugins python2. 6/dist- packages/ bzrlib/ plugins jal/bzr/ t-merge' python2. 6/dist- packages/ bzrlib/ commands. py", line 911, in exception_ to_return_ code python2. 6/dist- packages/ bzrlib/ commands. py", line 1111, in run_bzr python2. 6/dist- packages/ bzrlib/ commands. py", line 689, in run_argv_aliases **all_cmd_ args) python2. 6/dist- packages/ bzrlib/ commands. py", line 704, in run .run_simple( *args, **kwargs) python2. 6/dist- packages/ bzrlib/ cleanup. py", line 135, in run_simple python2. 6/dist- packages/ bzrlib/ cleanup. py", line 165, in _do_with_cleanups python2. 6/dist- packages/ bzrlib/ builtins. py", line 3882, in run python2. 6/dist- packages/ bzrlib/ builtins. py", line 3901, in _do_merge python2. 6/dist- packages/ bzrlib/ merge.py" , line 704, in do_merge run_simple( ) python2. 6/dist- packages/ bzrlib/ cleanup. py", line 135, in run_simple python2. 6/dist- packages/ bzrlib/ cleanup. py", line 165, in _do_with_cleanups python2. 6/dist- packages/ bzrlib/ merge.py" , line 675, in _do_merge_to do_merge( ) python2. 6/dist- packages/ bzrlib/ merge.py" , line 814, in do_merge python2. 6/dist- packages/ bzrlib/ cleanup. py", line 131, in run python2. 6/dist- packages/ bzrlib/ cleanup. py", line 165, in _do_with_cleanups python2. 6/dist- packages/ bzrlib/ merge.py" , line 819, in _do_merge _compute_ transform( ) python2. 6/dist- packages/ bzrlib/ merge.py" , line 864, in _compute_transform python2. 6/dist- packages/ bzrlib/ merge.py" , line 1128, in fix_root tt.adjust_ path(self. tt.final_ name(trans_ id), python2. 6/dist- packages/ bzrlib/ transform. py", line 466, in final_name trans_id, self)
0.029 bazaar version: 2.2.0
0.030 bzr arguments: [u'merge', u'../domui-trunk']
0.040 looking for plugins in /home/jal/
0.080 looking for plugins in /usr/lib/
0.080 Plugin name qbzr already loaded
0.086 encoding stdout as sys.stdout encoding 'UTF-8'
0.107 opening working tree '/home/
[ 4337] 2010-09-04 17:54:13.753 WARNING: Warning: criss-cross merge encountered. See bzr help criss-cross.
0.776 Criss-cross lcas: set(['<email address hidden>', '<email address hidden>'])
0.824 Base revid: '<email address hidden>'
1.740 Traceback (most recent call last):
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
return self._operation
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
verified)
File "/usr/lib/
conflict_count = merger.do_merge()
File "/usr/lib/
merge = operation.
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
merge.
File "/usr/lib/
operation.run()
File "/usr/lib/
self.cleanups, self.func, self, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
self.
File "/usr/lib/
self.fix_root()
File "/usr/lib/
self.
File "/usr/lib/
raise NoFinalPath(
NoFinalPath: No final name for trans_id 'new-211'
file-id: None
root trans-id: 'new-0'
1.740 Transferred: 0kB (0.0kB/s r:0kB w:0kB)
1.740 return code 3