[MERGE] allow 'bzr checkout' to reconstitute working trees.

[Aaron Bentley]

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

Robert Collins wrote:
| This patch allows working trees to be recreated when they do not exist
| for some reason - such as sftp pushing a branch to a machine.

- -1 I like the idea, but this patch doesn't go far enough.

build_tree was intended to be used against empty directories, and so it
doesn't do any conflict resolution.  This means that if there are
conflicts, it will raise an exception.

That was by design, since it's handling cases that should never exist
can mask bugs (e.g. for Arch, inexact patching when building revision
libraries masks flaws in archive storage).

But if we're going to allow checkouts to be produced in existing
directories that may have files, we should resolve at least
duplicate-entry conflicts.  Or alternatively, refuse to operate in
non-empty directories.

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

iD8DBQFEMRAw0F+nu1YWqI0RArFeAJsGyyopd2qoUNEwrYB7fRtXlnxAuwCeNuCx
CxWeEC4+uROU+Tdp0uRlfBs=
=wDK9
-----END PGP SIGNATURE-----