tree-less merges

[Aaron Bentley]

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

Michael Hudson wrote:
> Replying to two mails at once here...
> I think TT would be helped by a little more documentation about what
> all of the _new_id, _r_new_id, _new_contents, ... mappings are all
> about, and also short explanations of what concepts like 'transaction
> id', 'limbo', etc are.

Okay.  Will do.

> I think I care about all conflicts, but it has to be said that in
> Launchpad's pending branches page (which is more or less my motivating
> example here) text conflicts are massively overwhelmingly the
> commonest type of conflict.

Yes, that's the usual pattern.  People often ignore the other types
entirely.

> Here's a diff

Actually I think you forgot to attach the diff.


> (not a bundle as I merged in both your
> transform-preview.patch and differ.patch bundles first and it wasn't
> then instantly obvious how to generate a bundle against this

If you merged my stuff before making any other changes, then, "bzr send
- -r x..-1" would be good.  But if the changes are intermingled, then -r
ancestor: is usually the best you can do.

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

iD8DBQFHRJF80F+nu1YWqI0RAnmtAJ9YV/I2j+t9uXCeB2ClFWo6zMWIsQCfdkHW
elh3EjnGP6ZpkmtZkQPg5jI=
=Lv9R
-----END PGP SIGNATURE-----