Assertion failure in _process_entry

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

Dirstate doesn't seem to handle comparisons involving absent files very
well.  Personally, I don't understand why dirstate is recording absent
files at all.  But anyhow...

Steps to reproduce:

~$ bzr init sandbox
~$ cd sandbox
~/sandbox$ touch foo
~/sandbox$ bzr add foo
added foo
~/sandbox$ bzr commit -m "added foo"
added foo
Committed revision 1.
~/sandbox$ bzr branch . ../sandbox2
Branched 1 revision(s).
~/sandbox$ rm foo
~/sandbox$ bzr commit -m "removed foo"
missing foo
deleted foo
Committed revision 2.
~/sandbox$ cd ../sandbox2
~/sandbox2$ echo "new contents" > foo
~/sandbox2$ bzr commit -m "changed foo"
modified foo
Committed revision 2.
~/sandbox2$ cd ../sandbox
~/sandbox$ bzr merge ../sandbox2
+N  foo.OTHER
Contents conflict in foo
1 conflicts encountered.
~/sandbox$ bzr status
bzr: ERROR: exceptions.AssertionError: don't know how to compare
source_minikind='a', target_minikind='r'

Traceback (most recent call last):
  File "/home/abentley/bzr/bzr.dev/bzrlib/commands.py", line 650, in
run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/abentley/bzr/bzr.dev/bzrlib/commands.py", line 612, in run_bzr
    ret = run(*run_argv)
  File "/home/abentley/bzr/bzr.dev/bzrlib/commands.py", line 304, in
run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/abentley/bzr/bzr.dev/bzrlib/commands.py", line 622, in
ignore_pipe
    result = func(*args, **kwargs)
  File "/home/abentley/bzr/bzr.dev/bzrlib/builtins.py", line 195, in run
    short=short)
  File "/home/abentley/bzr/bzr.dev/bzrlib/status.py", line 150, in
show_tree_status
    _mod_delta.report_changes(changes, reporter)
  File "/home/abentley/bzr/bzr.dev/bzrlib/delta.py", line 390, in
report_changes
    for (file_id, path, content_change, versioned, parent_id, name, kind,
  File "/home/abentley/bzr/bzr.dev/bzrlib/workingtree_4.py", line 2144,
in _iter_changes
    for result in _process_entry(current_entry, None):
  File "/home/abentley/bzr/bzr.dev/bzrlib/workingtree_4.py", line 1948,
in _process_entry
    raise AssertionError("don't know how to compare "
AssertionError: don't know how to compare source_minikind='a',
target_minikind='r'

bzr 0.16.0dev0 on python 2.4.1.final.0 (linux2)
arguments: ['/home/abentley/bin/bzr', 'status']
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF8YzW0F+nu1YWqI0RAq2/AJ0dpWt640oEnUHiHvAnmE1XiisWtACaA0/Q
ZNjgyur7nVUU+L6c3WTWAmo=
=ZjXw
-----END PGP SIGNATURE-----