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

[Aaron Bentley]

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

Robert Collins wrote:
| On Mon, 2006-04-03 at 08:08 -0400, Aaron Bentley wrote:
|>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.
|
|
| I hadn't seen this mail when I merged it on the basis of Martins +1.
| Does it need reverting ?

Well, it definitely needs fixing before we release.  There's no chance
of dataloss, just unfriendly behavior when conflicts are encountered.

| I would like constructing a tree here to have the following properties:
| If the tree contains a .bzr dir - bail.
| If the tree contains a subdir that is present on disk, merge the
| contents thereof

So where a file has the same name as a versioned file, we would treat it
as if it were that versioned file?

~ and generate conflicts with the contents of the
| directory, but never the directory itself

Or are you saying we should move existing files out of the way here?

~ - so that the .bzr dir of
| nested branches is not moved out of the way.
|
| How does that sound?

I think it sounds okay.  It sounds like a new resolution scheme, though.
~ So far, we've gotten by with just one.

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

iD8DBQFEMg0K0F+nu1YWqI0RAqwCAJ0RFzqpjRsc/rB4ZuseCN8R20KdVQCeOCrQ
+GzmQOamjUvzirLTyuioKtk=
=gfVt
-----END PGP SIGNATURE-----