doing merge() with no base_revision specified
clamping count of 3 to 2
Traceback (most recent call last):
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 718, in run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 679, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 375, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2724, in run
change_reporter=change_reporter)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3743, in _merge_helper
conflicts = merger.do_merge()
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 311, in do_merge
**kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 467, in __init__
delta.report_changes(self.tt._iter_changes(), change_reporter)
File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 1051, in _iter_changes
self._to_file_data(to_trans_id, from_trans_id, from_executable)
File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 1003, in _to_file_data
to_name = self.final_name(to_trans_id)
File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 476, in final_name
raise NoFinalPath(trans_id, self)
NoFinalPath: No final name for trans_id 'new-2'
file-id: 'lyceum-20070710094113-hbxnub1abwcl8dh6-6392'
root trans-id: 'new-0'
doing merge() with no base_revision specified python2. 5/site- packages/ bzrlib/ commands. py", line 718, in run_bzr_ catch_errors python2. 5/site- packages/ bzrlib/ commands. py", line 679, in run_bzr python2. 5/site- packages/ bzrlib/ commands. py", line 375, in run_argv_aliases **all_cmd_ args) python2. 5/site- packages/ bzrlib/ builtins. py", line 2724, in run reporter= change_ reporter) python2. 5/site- packages/ bzrlib/ builtins. py", line 3743, in _merge_helper python2. 5/site- packages/ bzrlib/ merge.py" , line 311, in do_merge python2. 5/site- packages/ bzrlib/ merge.py" , line 467, in __init__ report_ changes( self.tt. _iter_changes( ), change_reporter) python2. 5/site- packages/ bzrlib/ transform. py", line 1051, in _iter_changes _to_file_ data(to_ trans_id, from_trans_id, from_executable) python2. 5/site- packages/ bzrlib/ transform. py", line 1003, in _to_file_data name(to_ trans_id) python2. 5/site- packages/ bzrlib/ transform. py", line 476, in final_name trans_id, self) 20070710094113- hbxnub1abwcl8dh 6-6392'
clamping count of 3 to 2
Traceback (most recent call last):
File "/usr/lib/
return run_bzr(argv)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
change_
File "/usr/lib/
conflicts = merger.do_merge()
File "/usr/lib/
**kwargs)
File "/usr/lib/
delta.
File "/usr/lib/
self.
File "/usr/lib/
to_name = self.final_
File "/usr/lib/
raise NoFinalPath(
NoFinalPath: No final name for trans_id 'new-2'
file-id: 'lyceum-
root trans-id: 'new-0'