Comment 3 for bug 34956

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?