I got this bug after the following:

1. I modified a file in a feature branch
2. Another developer deleted the file in his own feature branch and merged into trunk
3. I pulled from the master trunk to my local mirror of trunk, getting his changes (fine)
4. I merged from my local trunk into my feature branch (conflict)
5. I tried bzr resolve --take-other and got a crash report (below)

I'm a new user so I'm probably just doing something stupid, but I thought I'd see if there was a bug report pertaining to this, and there was.

Hope this helps!

C:\feature-branch> bzr resolve --take-other
bzr: ERROR: bzrlib.errors.InvalidEntryName: Invalid entry name: src/test/library
/SKS/Model/GenericModelTest.php

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 911, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1111, in run_bzr
  File "bzrlib\commands.pyo", line 689, in run_argv_aliases
  File "bzrlib\commands.pyo", line 704, in run
  File "bzrlib\cleanup.pyo", line 135, in run_simple
  File "bzrlib\cleanup.pyo", line 165, in _do_with_cleanups
  File "bzrlib\conflicts.pyo", line 160, in run
  File "bzrlib\conflicts.pyo", line 189, in resolve
  File "bzrlib\conflicts.pyo", line 415, in _do
  File "bzrlib\conflicts.pyo", line 600, in action_take_other
  File "bzrlib\conflicts.pyo", line 444, in _resolve_with_cleanups
  File "bzrlib\cleanup.pyo", line 135, in run_simple
  File "bzrlib\cleanup.pyo", line 165, in _do_with_cleanups
  File "bzrlib\conflicts.pyo", line 594, in _resolve
  File "bzrlib\transform.pyo", line 1549, in apply
  File "bzrlib\transform.pyo", line 1625, in _generate_inventory_delta
  File "bzrlib\inventory.pyo", line 2320, in make_entry
  File "bzrlib\inventory.pyo", line 537, in __init__
  File "bzrlib\inventory.pyo", line 216, in __init__
InvalidEntryName: Invalid entry name: src/test/library/SKS/Model/GenericModelTes
t.php

bzr 2.2.0 on python 2.6.4 (Windows-XP-5.1.2600-SP3)
arguments: ['bzr', 'resolve', '--take-other']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrp4                C:\Program Files\Bazaar\plugins\bzrp4 [unknown]
  bzrtools             C:\Program Files\Bazaar\plugins\bzrtools [2.2.0]
  colo                 C:\Program Files\Bazaar\plugins\colo [0.1.0]
  explorer             C:\Program Files\Bazaar\plugins\explorer [1.1b1]
  fastimport           C:\Program Files\Bazaar\plugins\fastimport [0.9.0dev]
  launchpad            C:\Program Files\Bazaar\plugins\launchpad [2.2.0]
  loom                 C:\Program Files\Bazaar\plugins\loom [2.2.1dev]
  netrc_credential_store C:\Program Files\Bazaar\plugins\netrc_credential_store
[2.2.0]
  news_merge           C:\Program Files\Bazaar\plugins\news_merge [2.2.0]
  pipeline             C:\Program Files\Bazaar\plugins\pipeline [unknown]
  qbzr                 C:\Program Files\Bazaar\plugins\qbzr [0.19.0]
  rewrite              C:\Program Files\Bazaar\plugins\rewrite [0.6.0]
  svn                  C:\Program Files\Bazaar\plugins\svn [1.0.3]
  upload               C:\Program Files\Bazaar\plugins\upload [1.0.0dev]
  xmloutput            C:\Program Files\Bazaar\plugins\xmloutput [0.8.6]

*** 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.