attn: abentley Re: [BUG] Merging repositories with a directory deleted

[Aaron Bentley]

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

Robert Collins wrote:
> Now, there is an interesting thing here, the last step of baz2bzr
> applies a delta to change its starting point into the current head, but
> this can fail due to conflicts - is it possible to tell merge 'just do
> it' as opposed to 'conflicts can happen' ?

We can handle conflicts whatever way we like and vary it by command (in
fact, I've got an Arch-style conflict handler somwhere), but I'm not
sure what you mean here.

baz2bzr should be doing just a two-way transform, i.e.
base_tree=branch.revision_tree(last_rev), this_tree=base_tree
other_tree=branch.basis_tree().

That simplification (this_tree=base_tree) assumes that the user hasn't
changed the working tree such that it differs from the last revision.
If they have, why wouldn't we use normal conflict handling?  (And yes,
not throw an exception.)

That behaviour is in line with pull, which seems like the closest
equivalent to baz-import.

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

iD8DBQFDKXOm0F+nu1YWqI0RAj9RAKCJGuyodwHnvKJV2oGRMRZgkvUJTwCdEy7v
5IHDXFz0u7a7tPmuNRd3J2Q=
=swjz
-----END PGP SIGNATURE-----