Merge fails with bzr: ERROR: No final name for trans_id 'new-2'

Bug #125728 reported by Ignas Mikalajūnas
4
Affects Status Importance Assigned to Milestone
Bazaar
Fix Released
Undecided
Unassigned

Bug Description

Bazaar (bzr) 0.16.0
Ubuntu edgy

Steps to reproduce:

bzr get http://ignas.pov.lt/merge-failing-data/schooltool
bzr merge http://ignas.pov.lt/merge-failing-data/schooltool-lyceum/src/lyceum/person

Got:
bzr: ERROR: No final name for trans_id 'new-2'
file-id: 'lyceum-20070710094113-hbxnub1abwcl8dh6-6392'
root trans-id: 'new-0'

Revision history for this message
Ignas Mikalajūnas (ignas) wrote :

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'

Revision history for this message
Aaron Bentley (abentley) wrote :

This was fixed as a side effect of iter_changes merge, which will be part of 0.19

Changed in bzr:
status: New → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.