In the case where a merged revision has added a file with the same name and moved the original out of the way. If you manually delete the new file and revert the old one back into place, then you get this error. The workaround is to revert the NEW file, which puts things back AND resolves the conflict.
# wrong way
rm V3TemplateXMLHandler.java # the new one
bzr revert V3TemplateXMLHandler.java.moved
bzr resolved V3TemplateXMLHandler.java
bzr inventory
bzr: ERROR: exceptions.AssertionError: name u'V3TemplateXMLHandler.java' already in parent
Traceback (most recent call last):
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 912, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1112, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 690, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 705, 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/commands.py", line 1127, in ignore_pipe
result = func(*args, **kwargs)
File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 783, in run
entries = tree.inventory.entries()
File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 401, in _get_inventory
self._generate_inventory()
File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 337, in _generate_inventory
% (name_unicode,))
AssertionError: name u'V3TemplateXMLHandler.java' already in parent
*** Bazaar has encountered an internal error. This probably indicates a
bug in Bazaar. You can help us fix it by filing a bug report at https://bugs.launchpad.net/bzr/+filebug
including this traceback and a description of the problem.
# right way
bzr revert V3TemplateXMLHandler.java
# this removes the new file and reverts the moved one back into position
I'm getting this when resolving conflicts.
In the case where a merged revision has added a file with the same name and moved the original out of the way. If you manually delete the new file and revert the old one back into place, then you get this error. The workaround is to revert the NEW file, which puts things back AND resolves the conflict.
# wrong way ndler.java # the new one ndler.java. moved ndler.java
rm V3TemplateXMLHa
bzr revert V3TemplateXMLHa
bzr resolved V3TemplateXMLHa
bzr inventory
bzr: ERROR: exceptions. AssertionError: name u'V3TemplateXML Handler. java' already in parent
Traceback (most recent call last): python2. 6/dist- packages/ bzrlib/ commands. py", line 912, in exception_ to_return_ code python2. 6/dist- packages/ bzrlib/ commands. py", line 1112, in run_bzr python2. 6/dist- packages/ bzrlib/ commands. py", line 690, in run_argv_aliases **all_cmd_ args) python2. 6/dist- packages/ bzrlib/ commands. py", line 705, 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/ commands. py", line 1127, in ignore_pipe python2. 6/dist- packages/ bzrlib/ builtins. py", line 783, in run entries( ) python2. 6/dist- packages/ bzrlib/ workingtree_ 4.py", line 401, in _get_inventory _generate_ inventory( ) python2. 6/dist- packages/ bzrlib/ workingtree_ 4.py", line 337, in _generate_inventory Handler. java' already in parent
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/
result = func(*args, **kwargs)
File "/usr/lib/
entries = tree.inventory.
File "/usr/lib/
self.
File "/usr/lib/
% (name_unicode,))
AssertionError: name u'V3TemplateXML
bzr 2.2.1 on python 2.6.6 (Linux- 2.6.35- 25-generic- x86_64- with-Ubuntu- 10.10-maverick) python2. 6/dist- packages/ bzrlib/ plugins/ bash_completion [2.2.1] python2. 6/dist- packages/ bzrlib/ plugins/ bzrtools [2.2.0] python2. 6/dist- packages/ bzrlib/ plugins/ launchpad [2.2.1] credential_ store /usr/lib/ python2. 6/dist- packages/ bzrlib/ plugins/ netrc_credentia l_store [2.2.1] python2. 6/dist- packages/ bzrlib/ plugins/ news_merge [2.2.1] python2. 6/dist- packages/ bzrlib/ plugins/ qbzr [0.19.1] python2. 6/dist- packages/ bzrlib/ plugins/ rewrite [0.6.1] python2. 6/dist- packages/ bzrlib/ plugins/ svn [1.0.3] .bazaar/ plugins/ xmloutput [0.8.7.dev]
arguments: ['/usr/bin/bzr', 'inventory']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.utf8'
plugins:
bash_completion /usr/lib/
bzrtools /usr/lib/
launchpad /usr/lib/
netrc_
news_merge /usr/lib/
qbzr /usr/lib/
rewrite /usr/lib/
svn /usr/lib/
xmloutput /home/adrian/
*** Bazaar has encountered an internal error. This probably indicates a /bugs.launchpad .net/bzr/ +filebug
bug in Bazaar. You can help us fix it by filing a bug report at
https:/
including this traceback and a description of the problem.
# right way ndler.java
bzr revert V3TemplateXMLHa
# this removes the new file and reverts the moved one back into position