Merging 2 branches which create the same directory causes confusion

This is an example of the situation where this bug can occur, there are no conflicting files, the only conflict is the directory itself.

Confirmed; agree that more information on the conflict would help.

Ideally we would also note a file-id join to allow better future merges.

Right now, this is what happens:

$ bzr init a
$ cd a
$ echo a > a
$ bzr add a
$ bzr commit -m a
$ cd ..
$ bzr branch a b
$ cd b
$ bzr mkdir foo
$ bzr commit -m 'b foo'
$ cd ../a
$ bzr mkdir foo
$ bzr commit -m 'a foo'
$ bzr merge ../b
Conflict adding file foo. Moved existing file to foo.moved.
1 conflicts encountered.

$ bzr status
removed:
  a
added:
  foo/
renamed:
  foo => foo.moved
conflicts:
  Conflict adding file foo. Moved existing file to foo.moved.
pending merges:
  John Arbash Meinel 2006-07-21 foo

I think this is the exact same thing that happens when merging files where both trees added the same filename.

I don't see it as any more or less confusing than the other case, so I would like to close this bug.
Martin, would you care to comment, since you agreed with the bug?

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

John A Meinel wrote:
> $ bzr status
> removed:
> a
> added:
> foo/
> renamed:
> foo => foo.moved
> conflicts:
> Conflict adding file foo. Moved existing file to foo.moved.
> pending merges:
> John Arbash Meinel 2006-07-21 foo

Wait a sec-- why's 'a' listed as removed?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEwUHf0F+nu1YWqI0RAicVAJ9WgizQMD+47FUlyKot8c3gyToRwQCfU//K
xjp2p7uGnMtYgqz42Hil/xE=
=QTNV
-----END PGP SIGNATURE-----

From an earlier test. Please ignore it.