bad merge?

[Aaron Bentley]

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

Aaron Bentley wrote:
> Aaron Bentley wrote:
>> Robert Collins wrote:
>>>> I assume this was user error on my part. But how I could have surgically
>>>> removed just the changes you would have done... I have no idea.
>> revno 2635 seems to have also also removed other changes, e.g. 2632 and
>> 2633, which introduced Bundle format 4.
> 
> Guys, I don't think the way you're addressing this is remotely
> appropriate.

My apologies.  From the log messages, it wasn't clear, but it looks like
you've remove the old 2635 and replaced it with a better one.  Good job.

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

iD8DBQFGoK3/0F+nu1YWqI0RAlCfAJ9rVRax/MGWsTOn79xxVdzEWTYNdwCeN432
ofcomfCCZ5Icu8OlJl4M4lo=
=W3mg
-----END PGP SIGNATURE-----