Same problem here with bzr 1.9 with commit/revert.
I was trying to commit after a merge from branch B into A in a shared repository. B was initially branched from A
and no other commits had been made to A since. The file buffer_save.txt is new in the B branch.
bzr: ERROR: exceptions.AssertionError: name u'buffer_save.txt' already in parent
Traceback (most recent call last):
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 893, in run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 839, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 539, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3358, in run
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3368, in _revert_tree_to_revision
report_changes=True)
File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 52, in tree_write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/workingtree.py", line 1993, in revert
report_changes)
File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 2249, in revert
working_tree, target_tree, tt, filenames, backups, pp)
File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 2273, in _prepare_revert_transform
merge_modified = working_tree.merge_modified()
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
result = unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/workingtree.py", line 923, in merge_modified
if file_id not in self.inventory:
File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 430, in _get_inventory
self._generate_inventory()
File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 366, in _generate_inventory
% (name_unicode,))
AssertionError: name u'buffer_save.txt' already in parent
bzr 1.9 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'revert', '-r', '-1']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bzr_difftools /home/alf/.bazaar/plugins/bzr_difftools [unknown]
bzr_xmloutput /home/alf/.bazaar/plugins/bzr_xmloutput [unknown]
bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.9.0]
gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.96.0dev1]
launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
*** Bazaar has encountered an internal error.
Please report a bug at https://bugs.launchpad.net/bzr/+filebug
including this traceback, and a description of what you
were doing when the error occurred
Same problem here with bzr 1.9 with commit/revert.
I was trying to commit after a merge from branch B into A in a shared repository. B was initially branched from A
and no other commits had been made to A since. The file buffer_save.txt is new in the B branch.
bzr: ERROR: exceptions. AssertionError: name u'buffer_save.txt' already in parent
Traceback (most recent call last): python2. 5/site- packages/ bzrlib/ commands. py", line 893, in run_bzr_ catch_errors python2. 5/site- packages/ bzrlib/ commands. py", line 839, in run_bzr python2. 5/site- packages/ bzrlib/ commands. py", line 539, in run_argv_aliases **all_cmd_ args) python2. 5/site- packages/ bzrlib/ builtins. py", line 3358, in run _revert_ tree_to_ revision( tree, revision, file_list, no_backup) python2. 5/site- packages/ bzrlib/ builtins. py", line 3368, in _revert_ tree_to_ revision changes= True) python2. 5/site- packages/ bzrlib/ mutabletree. py", line 52, in tree_write_locked python2. 5/site- packages/ bzrlib/ workingtree. py", line 1993, in revert python2. 5/site- packages/ bzrlib/ transform. py", line 2249, in revert python2. 5/site- packages/ bzrlib/ transform. py", line 2273, in _prepare_ revert_ transform tree.merge_ modified( ) python2. 5/site- packages/ bzrlib/ decorators. py", line 138, in read_locked python2. 5/site- packages/ bzrlib/ workingtree. py", line 923, in merge_modified python2. 5/site- packages/ bzrlib/ workingtree_ 4.py", line 430, in _get_inventory _generate_ inventory( ) python2. 5/site- packages/ bzrlib/ workingtree_ 4.py", line 366, in _generate_inventory
File "/usr/lib/
return run_bzr(argv)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
self.
File "/usr/lib/
report_
File "/usr/lib/
return unbound(self, *args, **kwargs)
File "/usr/lib/
report_changes)
File "/usr/lib/
working_tree, target_tree, tt, filenames, backups, pp)
File "/usr/lib/
merge_modified = working_
File "/usr/lib/
result = unbound(self, *args, **kwargs)
File "/usr/lib/
if file_id not in self.inventory:
File "/usr/lib/
self.
File "/usr/lib/
% (name_unicode,))
AssertionError: name u'buffer_save.txt' already in parent
bzr 1.9 on python 2.5.2 (linux2) .bazaar/ plugins/ bzr_difftools [unknown] .bazaar/ plugins/ bzr_xmloutput [unknown] python2. 5/site- packages/ bzrlib/ plugins/ bzrtools [1.9.0] python2. 5/site- packages/ bzrlib/ plugins/ gtk [0.96.0dev1] python2. 5/site- packages/ bzrlib/ plugins/ launchpad [unknown] /bugs.launchpad .net/bzr/ +filebug
arguments: ['/usr/bin/bzr', 'revert', '-r', '-1']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bzr_difftools /home/alf/
bzr_xmloutput /home/alf/
bzrtools /usr/lib/
gtk /usr/lib/
launchpad /usr/lib/
*** Bazaar has encountered an internal error.
Please report a bug at https:/
including this traceback, and a description of what you
were doing when the error occurred