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

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF/v/40F+nu1YWqI0RAurvAJ9WAfxikRZH8jlYsVgzkqpuXs09WwCdFZiG
+OBvxQ8Ruat5DyED5GHRMAw=
=PikD
-----END PGP SIGNATURE-----