[MERGE REVIEW] Tweaks to bundle merging

[Michael Ellerman]

On 6/16/06, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> -----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.

Yeah, that's what I meant, show each diff individually. That has the
other nice property that the messages correspond to the diff hunks.

I think this would work even better if all the trailing blocks
(revision_id/sha1/etc) could drop to the bottom. And maybe be
base64'ed there too.

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

Ok, that's nice I guess. But not sure if it justifies the slight
strangness of the current format.

cheers