'bzr checkout transform conflict policy'

[Aaron Bentley]

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

Hi Robert,

I don't think I got a reply to my last email about this, where I
described the conflict resolver.  I have some questions:

- - Should this resolver be used when building all trees, or just for
creating checkouts?

- - Your examples seem assume that the file on disk is not versioned.  Can
we assume that?

Robert Collins wrote:
> So the behaviour I'd like is (in order of checks):
>  * if a path being made is contained by a sub-branch raise an error.
> [that is, if the path being made is dir/foo, and dir has a .bzr dir or
> other control structure - if its recognised by
> BzrDirFormat.probe_on_transport - then dont make it, - report a conflict
> about the path being in a nested branch and throw the path contents away
> (the user can use revert if the really want it back)

Yeesh, throwing data away in the conflict resolver feels icky.  We can't
just put it somewhere else?

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

iD8DBQFE9D+j0F+nu1YWqI0RAhi5AKCEqPl5/lkwOK3Ur+znHxKLe+K7uQCeMoYm
2kqY8GBfiMp2smAOKJi4zzQ=
=l04k
-----END PGP SIGNATURE-----