[MERGE] Handle existing files cleanly in build_tree

[Aaron Bentley]

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

Hi all,

This patch addresses the need to handle existing content in directories
when creating checkouts.  It fixes #55460.

At first, I was really horrified by why Robert wanted to do in a
conflict resolver.  Then I started to look at the behaviour as a tree
merger, and it made a lot more sense like that.

So the conflict resolution section is really bare-bones.  It just
detects duplicate entries and renames the old files to 'foo.moved'.

The rest of it:
 - Ensures that bzrdirs are never replaced or populated by build_tree
 - Prevents conflicts when the file-to-add matches the already-present file
 - Merges the contents of directories

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFE9Igz0F+nu1YWqI0RAswbAJ9IFJRNdgW3s9kMja7VUr1B3cJ6VACcD1Ai
v6C2R8HxTUPAGnF1Pkr/mT8=
=21w/
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build_tree_conflicts.patch
Type: text/x-patch
Size: 12356 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060829/b9c90faa/attachment.bin