[MERGE] Handle a file turning in to a directory in TreeTransform.

[Ian Clatworthy]

James Westby wrote:
> Hi,
> 
> Thanks for the  speedy review. The attached patch should be much
> better.

I tried merging this and the test fails so it needs a bit more TLC.

BB:resubmit

Traceback (most recent call last):
  File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/test_transform.py", line 1229, in test_file_to_directory
    tt.apply()
  File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/transform.py", line 1205, in apply
    raise MalformedTransform(conflicts=conflicts)
MalformedTransform: Tree transform is malformed [('duplicate', 'new-1', 'new-2', 'foo'), ('missing parent', 'new-1')]

Ian C.