Comment 3 for bug 279680

Same problem, but got into this state differently. Had problems pushing files to central branch due to bug 327558. To work around checked files into central depot directly and pulled (after first deleting files locally first). Had forgotten to bzr revert files locally (that I had previously failed to push up), so they were still status=="added". Files that were pulled down still show status "added". Trying to revert gives below error. Uncommited last change, but did not help. At this point I can't further commit anything locally.

bzr: ERROR: exceptions.AssertionError: name u'StyleX' already in parent

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 896, in run_bzr_catch_errors
  File "bzrlib\commands.pyo", line 842, in run_bzr
  File "bzrlib\commands.pyo", line 542, in run_argv_aliases
  File "bzrlib\builtins.pyo", line 3625, in run
  File "bzrlib\builtins.pyo", line 3635, in _revert_tree_to_revision
  File "bzrlib\mutabletree.pyo", line 52, in tree_write_locked
  File "bzrlib\workingtree.pyo", line 1999, in revert
  File "bzrlib\transform.pyo", line 2351, in revert
  File "bzrlib\transform.pyo", line 2375, in _prepare_revert_transform
  File "bzrlib\decorators.pyo", line 138, in read_locked
  File "bzrlib\workingtree.pyo", line 929, in merge_modified
  File "bzrlib\workingtree_4.pyo", line 417, in _get_inventory
  File "bzrlib\workingtree_4.pyo", line 353, in _generate_inventory
AssertionError: name u'StyleX' already in parent

bzr 1.12 on python 2.5.2 (win32)
arguments: ['bzr', 'revert', 'SourceAnalysis.Targets']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrtools C:\Program Files\Bazaar\plugins\bzrtools [1.12]
  launchpad C:\Program Files\Bazaar\plugins\launchpad [unknown]
  netrc_credential_store C:\Program Files\Bazaar\plugins\netrc_credential_store [unknown]
  qbzr C:\Users\Foo\AppData\Roaming\bazaar\2.0\plugins\qbzr [0.9.8]
  svn C:\Program Files\Bazaar\plugins\svn [0.5]
*** Bazaar has encountered an internal error.