[BUG][0.15] merging a removed directory unversions children

[John Arbash Meinel]

Aaron Bentley wrote:
> John Arbash Meinel wrote:
>> I was trying to debug: https://launchpad.net/bzr/+bug/93681
> 
>> And in doing so, I came across a different problem. Specifically, if I
>> have 2 branches, and one of them deletes a directory, and the other one
>> adds a new file in that directory.
> 
>> Then when you merge the deleted directory, it properly gives a path
>> conflict and doesn't unversion the directory. But for some reason it
>> *does* mark the files in that directory as unversioned.
> 
> That looks like a bug.  Possibly in TreeTransform-- it's conceivable
> that unversioning and re-versioning a parent could have the effect of
> unversioning the child.  I'll investigate.
> 
> Aaron

I can confirm that it happens with bzr-0.11. So whatever the bug, it has
been with us a while.

So I wouldn't block 0.15 on fixing this (it isn't a regression). But it
does seem like a bug.

John
=:->