[MERGE] Handle existing files cleanly in build_tree

[John Arbash Meinel]

Aaron Bentley wrote:
> John Arbash Meinel wrote:

...

> On the other hand, the 'target3' test shows that if I have "dir1/.bzr",
> and I try to create "dir1/file", I get "dir1.diverted/file"
> 
> Aaron

Okay, that is what I was hoping to see. When I read through it, I saw
dir1/file.diverted, but I could have been reading the wrong test.

+1 from me.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060830/847cb666/attachment.pgp