some kind of merging error with the merge changes tool...

[Anthony D'Angelo]

Run command: bzr merge bzr+ssh://bazaar.launchpad.net/~sketchy/sketchy/trunk/ --directory C:/Users/D'Ango/Desktop/2501/sketchy/trunk
bzr: ERROR: Working tree "C:/Users/D'Ango/Desktop/2501/sketchy/trunk/" has uncommitted changes (See bzr status).
Run command: bzr merge bzr+ssh://bazaar.launchpad.net/~sketchy/sketchy/trunk/ --directory C:/Users/D'Ango/Desktop/2501/sketchy/trunk --force
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
bzr: ERROR: exceptions.AssertionError: Unknown kind 'absent'

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 853, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1055, in run_bzr
  File "bzrlib\commands.pyo", line 661, in run_argv_aliases
  File "bzrlib\commands.pyo", line 665, in run_direct
  File "bzrlib\cleanup.pyo", line 122, in run_simple
  File "bzrlib\cleanup.pyo", line 156, in _do_with_cleanups
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\commands.py", line 784, in run
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\subprocess.py", line 811, in run_subprocess_command
  File "bzrlib\commands.pyo", line 1055, in run_bzr
  File "bzrlib\commands.pyo", line 661, in run_argv_aliases
  File "bzrlib\commands.pyo", line 665, in run_direct
  File "bzrlib\cleanup.pyo", line 122, in run_simple
  File "bzrlib\cleanup.pyo", line 156, in _do_with_cleanups
  File "bzrlib\builtins.pyo", line 3822, in run
  File "bzrlib\builtins.pyo", line 3839, in _do_merge
  File "bzrlib\merge.pyo", line 658, in do_merge
  File "bzrlib\cleanup.pyo", line 122, in run_simple
  File "bzrlib\cleanup.pyo", line 156, in _do_with_cleanups
  File "bzrlib\merge.pyo", line 629, in _do_merge_to
  File "bzrlib\merge.pyo", line 766, in do_merge
  File "bzrlib\cleanup.pyo", line 118, in run
  File "bzrlib\cleanup.pyo", line 156, in _do_with_cleanups
  File "bzrlib\merge.pyo", line 772, in _do_merge
  File "bzrlib\merge.pyo", line 814, in _compute_transform
  File "bzrlib\merge.pyo", line 1316, in _do_merge_contents
  File "bzrlib\merge.pyo", line 1482, in _dump_conflicts
  File "bzrlib\merge.pyo", line 1495, in _conflict_file
  File "bzrlib\transform.pyo", line 2539, in create_from_tree
AssertionError: Unknown kind 'absent'

bzr 2.1.0 on python 2.5.4 (Windows-Vista-6.0.6002-SP2)
arguments: ['C:\\Program Files\\Bazaar\\bzr.exe', 'qsubprocess', '--bencode', "l5:merge54:bzr+ssh://bazaar.launchpad.net/~sketchy/sketchy/trunk/11:--directory42:C:/Users/D'Ango/Desktop/2501/sketchy/trunk7:--forcee"]
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrtools C:\Program Files\Bazaar\plugins\bzrtools [2.1.0]
  explorer C:\Program Files\Bazaar\plugins\explorer [1.0.0rc1]
  launchpad C:\Program Files\Bazaar\plugins\launchpad [2.1.0]
  netrc_credential_store C:\Program Files\Bazaar\plugins\netrc_credential_store [2.1.0]
  qbzr C:\Program Files\Bazaar\plugins\qbzr [0.18.1]
  rebase C:\Program Files\Bazaar\plugins\rebase [0.5.5]
  svn C:\Program Files\Bazaar\plugins\svn [1.0.2]
  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.