Crash using resolve --action=take-other option

[Angel Guzman Maeso]

Using bzr-2.3b3-1-setup.exe on Windows XP SP2 I get the next errors with the following command:

bzr resolve --action=take-other Client.java
bzr: ERROR: exceptions.AttributeError: 'NoneType' object has no attribute 'lower'

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 917, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1117, in run_bzr
  File "bzrlib\commands.pyo", line 691, in run_argv_aliases
  File "bzrlib\commands.pyo", line 710, 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 162, in run
  File "bzrlib\conflicts.pyo", line 191, in resolve
  File "bzrlib\conflicts.pyo", line 417, in _do
  File "bzrlib\conflicts.pyo", line 551, in action_take_other
  File "bzrlib\conflicts.pyo", line 446, 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 510, in _resolve
  File "bzrlib\transform.pyo", line 1665, in apply
  File "bzrlib\transform.pyo", line 515, in _check_malformed
  File "bzrlib\transform.pyo", line 506, in find_conflicts
  File "bzrlib\transform.pyo", line 671, in _duplicate_entries
AttributeError: 'NoneType' object has no attribute 'lower'

bzr 2.3b3 on python 2.6.6 (Windows-XP-5.1.2600-SP3)
arguments: ['bzr', 'resolve', '--action=take-other', 'Client.java']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrtools C:\Archivos de programa\Bazaar\plugins\bzrtools [2.3.0]
  colo C:\Archivos de programa\Bazaar\plugins\colo [0.2.1dev]
  explorer C:\Archivos de programa\Bazaar\plugins\explorer [1.1.2dev
]
  fastimport C:\Archivos de programa\Bazaar\plugins\fastimport [0.10.0
dev]
  launchpad C:\Archivos de programa\Bazaar\plugins\launchpad [2.3b3]
  loom C:\Archivos de programa\Bazaar\plugins\loom [2.2.1dev]
  netrc_credential_store C:\Archivos de programa\Bazaar\plugins\netrc_credential
_store [2.3b3]
  news_merge C:\Archivos de programa\Bazaar\plugins\news_merge [2.3b3]

  pipeline C:\Archivos de programa\Bazaar\plugins\pipeline [unknown]

  qbzr C:\Archivos de programa\Bazaar\plugins\qbzr [0.20.0dev1]
  rewrite C:\Archivos de programa\Bazaar\plugins\rewrite [0.6.2dev]

  svn C:\Archivos de programa\Bazaar\plugins\svn [1.0.5dev]
  upload C:\Archivos de programa\Bazaar\plugins\upload [1.0.0dev]
  xmloutput C:\Archivos de programa\Bazaar\plugins\xmloutput [0.8.7.d
ev]

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