I haven't been able to replicate this locally, though I did find a different bug. This is what I tried
% bzr init a
% cd a
% bzr
% mkdir foo; echo bar > foo/bar
% bzr add
added foo
added foo/bar
% bzr commit -m "init"
added foo
added foo/bar
Committed revision 1.
% cd ..
% bzr branch a b
cd b
Branched 1 revision(s).
% cd b
% echo baz > foo/baz
% bzr add
added foo/baz
% bzr commit -m "foo/baz"
added foo/baz
Committed revision 2.
% cd ../a
% rm -rf fo
% bzr rm foo; rm -rf foo
% bzr commit -m "rm foo"
deleted foo
deleted foo/bar
Committed revision 2.
% cd ../b
% bzr merge ../a
-D foo/bar
Conflict: can't delete foo because it is not empty. Not deleting.
Conflict because foo is not versioned, but has versioned children. Versioned directory.
2 conflicts encountered.
% bzr st
removed:
foo/bar
foo/baz
conflicts:
Conflict: can't delete foo because it is not empty. Not deleting.
Conflict because foo is not versioned, but has versioned children. Versioned directory.
pending merges:
John Arbash Meinel 2007-03-19 rm foo
Is it possible to get access to the branches in question (possibly privately). It would certainly be helpful to have a reproducible test case.
I haven't been able to replicate this locally, though I did find a different bug. This is what I tried
% bzr init a
% cd a
% bzr
% mkdir foo; echo bar > foo/bar
% bzr add
added foo
added foo/bar
% bzr commit -m "init"
added foo
added foo/bar
Committed revision 1.
% cd ..
% bzr branch a b
cd b
Branched 1 revision(s).
% cd b
% echo baz > foo/baz
% bzr add
added foo/baz
% bzr commit -m "foo/baz"
added foo/baz
Committed revision 2.
% cd ../a
% rm -rf fo
% bzr rm foo; rm -rf foo
% bzr commit -m "rm foo"
deleted foo
deleted foo/bar
Committed revision 2.
% cd ../b
% bzr merge ../a
-D foo/bar
Conflict: can't delete foo because it is not empty. Not deleting.
Conflict because foo is not versioned, but has versioned children. Versioned directory.
2 conflicts encountered.
% bzr st
removed:
foo/bar
foo/baz
conflicts:
Conflict: can't delete foo because it is not empty. Not deleting.
Conflict because foo is not versioned, but has versioned children. Versioned directory.
pending merges:
John Arbash Meinel 2007-03-19 rm foo
Is it possible to get access to the branches in question (possibly privately). It would certainly be helpful to have a reproducible test case.