crash while retrying a merging from another branch

Merging a different branch of code into my current branch and I get a "text conflict in .bzrignore". I then tried the RETRY button and got this dump -

 7376] 2010-09-02 14:44:16.438 INFO: -D test/VSH/VSH_UnitTest.ide
[ 7376] 2010-09-02 14:44:16.438 INFO: -D test/VSH/vsh_UnitTests.c
[ 7376] 2010-09-02 14:44:16.438 WARNING: Text conflict in .bzrignore
[ 7376] 2010-09-02 14:44:22.562 INFO: 1 conflicts encountered.
60.171 Transferred: 0KiB (0.0K/s r:0K w:0K)
60.171 return code 1
[ 4356] 2010-09-02 14:48:22.655 INFO: Discarding watch for D:\Projects\MetroNorth\M8\bzr - it has expired

Thu 2010-09-02 14:49:50 -0400
0.187 bazaar version: 2.1.0
0.187 bzr arguments: [u'qsubprocess', u'--bencode', u'l5:merge53:T:/PROD_DEV/Repo/Projects/MetroNorth/M8/bzr/forReview11:--directory49:D:/Projects/MetroNorth/M8/bzr/dev/AcsesMergeTask17:--forcee']
0.219 looking for plugins in D:/Documents and Settings/e_rapps/Application Data/bazaar/2.0/plugins
0.219 looking for plugins in D:/Program Files/Bazaar/plugins
0.453 encoding stdout as osutils.get_user_encoding() 'cp1252'
0.531 bazaar version: 2.1.0
0.531 bzr arguments: [u'merge', u'T:/PROD_DEV/Repo/Projects/MetroNorth/M8/bzr/forReview', u'--directory', u'D:/Projects/MetroNorth/M8/bzr/dev/AcsesMergeTask1', u'--force']
0.547 encoding stdout as osutils.get_user_encoding() 'cp1252'
0.609 opening working tree 'D:/Projects/MetroNorth/M8/bzr/dev/AcsesMergeTask1'
0.703 Using fetch logic to copy between CHKInventoryRepository('file:///T:/PROD_DEV/Repo/Projects/MetroNorth/M8/bzr/.bzr/repository/')(<RepositoryFormat2a>) and CHKInventoryRepository('file:///D:/Projects/MetroNorth/M8/bzr/dev/AcsesMergeTask1/.bzr/repository/')(<RepositoryFormat2a>)
0.703 fetch up to rev {<email address hidden>}
0.750 Base revid: 'e_deddy@cnroc1gc0t-20100818144617-d8u9d176a55iovzw'
1.000 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 "D:/Program Files/Bazaar/plugins\qbzr\lib\commands.py", line 788, in run
  File "D:/Program Files/Bazaar/plugins\qbzr\lib\subprocess.py", line 786, 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'

1.000 couldn't find apport bug-reporting library: No module named apport
1.015 Transferred: 0KiB (0.0K/s r:0K w:0K)
1.015 return code 4

Thu 2010-09-02 14:59:29 -0400
0.156 bazaar version: 2.1.0
0.156 bzr arguments: [u'--version']
0.219 encoding stdout as sys.stdout encoding 'cp437'
0.328 Transferred: 0KiB (0.0K/s r:0K w:0K)
0.328 return code 0