Conflicts in removed files

[Aaron Bentley]

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

Stephen J. Turnbull wrote:
> The problem here is that to the extent that we know what he wants,
> too, bzr should just do it.  But when we don't, we should ask.

The literal interpretation of "ask" would be interactivity, and we were
strongly against interactivity when I wrote the conflict mechanism.
Instead of asking, we explain that something is wrong and record all the
information that should be necessary to do what the user wants.

The idea was always that *after* the merge (or other transformation) had
taken place, tools could query the conflicts and let the user decide how
to resolve them.  Unfortunately, no one has stepped up to write such tools.

It has been suggested that we could have hooks to handle conflicts as
they're being generated.  I think that's okay, but the old order of
operations still makes a lot of sense to me.  Better to deal with all of
the conflicts at once than to deal with them piecemeal.  Perhaps we
should have a hook after we've finished calculating conflicts.

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

iEYEARECAAYFAksnP5oACgkQ0F+nu1YWqI33ZgCfcNK4FQEnK5SGIxrxA3xu4rHJ
I3EAn35LjObAHBJib6BDQr2xssmjoF/P
=QTMy
-----END PGP SIGNATURE-----