Aaron's merge code question

[Aaron Bentley]

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

Hi Koen,

Koen Witters wrote:
> Why wasn't Aaron's merge code added to the main development tree? 

The last thing I said to Martin on the subject (in RL, not on the list)
was "Don't even look at 'merge'", because I've been doing cleanup work
offline.  However, I've mirrored that work now, and it's here:

aaron.bentley at utoronto.ca--lappy/bazaar-ng--0--patch-14
http://push.sourcecontrol.net/~abentley/archives/lappy/

(You can look at it now, Martin.)

> Where
> there any problems regarding this? 

Well, I wasn't able to record all the merge metadata because there
weren't sufficient APIs.  I could merge the files, but I couldn't record
the fact that particular revisions had been merged, which is essential
for doing the kind of history-sensitive merging that tla, baz, and
(AIUI) svk can do.

I'm just catching up, so I'm not sure whether Martin's added such APIs
since we last talked.

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

iD8DBQFCfJDj0F+nu1YWqI0RAvjpAJ9iJycWJ5/nF420Npxucm0XwM2/DwCfTzVO
ZZtueGZ00J/aivzAKiAJCZI=
=7LO5
-----END PGP SIGNATURE-----