Comment 0 for bug 477475

bzr 2.0.2 on Windows. I did wrong merge then trying to revert. Revert failed to remove newly added directories, because it should remove entries in different order: children at first then parents.

C:\work\MyCode\xxx>:\work\MyCode\yyy\src\common\key_func.c --unco
+N src/
+N src/common/
+N src/common/key_func.c.OTHER
Conflict adding files to src. Created directory.
Conflict because src is not versioned, but has versioned children. Versioned directory.
Conflict adding files to src/common. Created directory.
Conflict because src/common is not versioned, but has versioned children. Versioned directory.
Contents conflict in src/common/key_func.c
5 conflicts encountered.

C:\work\MyCode\xxx>bzr revert
- src/
- src/common/
-D src/common/key_func.c.OTHER
Conflict: can't delete src because it is not empty. Not deleting.
Conflict: can't delete src/common because it is not empty. Not deleting.

C:\work\MyCode\xxx\src\common>dir
 Volume in drive C is XP
 Volume Serial Number is B47B-BD42

 Directory of C:\work\MyCode\xxx\src\common

07.11.2009 16:33 <DIR> .
07.11.2009 16:33 <DIR> ..
               0 File(s) 0 bytes
               2 Dir(s) 28 078 374 912 bytes free

As you can see src/common is empty after revert.
The last 2 conflicts (unable to delete directory) should not be here really. It's so silly.