[MERGE REVIEW] Tweaks to bundle merging

[Aaron Bentley]

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

Michael Ellerman wrote:
> Come to think of it, why do we need the roll-up diff at all? Aren't
> all the individual diffs sufficient?

No, the roll-up contains the data to produce the target revision, which
none of the other diffs contains.

It doesn't have to be a roll-up, though-- it could be just like the
other diffs.  We made it a roll-up so that you could review the combined
changes using it.

Plus it means that we can check the target revision's signature without
having to install anything.

Aaron

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

iD8DBQFEkqA20F+nu1YWqI0RArHOAJ4/sYEOl5zuQ/1sx6I/vMzXog/ntQCgiCNA
X6fV6d4LJgqtULoI0KHFuWY=
=VY1P
-----END PGP SIGNATURE-----