bzr revert left a directory around

[Steve Alexander]

I did a bzr merge. I got conflicts, and decided to merge something different instead, so I did a bzr revert.

Then I was confused, because bzr status showed one of the directories added by the merge still around, as an empy directory, not under revision control.

I'd have expected bzr revert to remove that directory, as it wasn't there before I did the merge, and I asked bzr to revert the merge.

[David Allouche (ddaa)]

Steps to reproduce (might not be absolutely minimal, but works here):

bzr init a
cd a
echo hello > foo
bzr add
bzr commit -m 'first commit'
cd ..
bzr branch a b
cd b
mkdir bar
echo hello > bar/baz
bzr add
bzr commit -m 'added bar/baz'
cd ../a
bzr merge
bzr revert

Observed result:
$ bzr st
unknown:
  bar

The bar directory is empty.

Expected result: bzr revert should delete bar/.

[David Allouche (ddaa)]

$ bzr --version
Bazaar (bzr) 0.10.0

From bzr-0.10-0ubuntu2.

[John A Meinel (jameinel)]

Just to clarify, that bug was fixed by Aaron in bzr-0.11.