[MERGE REVIEW] Tweaks to bundle merging

[Michael Ellerman]

On 6/16/06, John Arbash Meinel <john at arbash-meinel.com> wrote:
> Matthew D. Fuller wrote:
> > On Thu, Jun 15, 2006 at 03:27:50PM +1000 I heard the voice of
> > Michael Ellerman, and lo! it spake thus:
> >> Or always encode it, and have the patch there purely for human
> >> consumption.
> >
> > This is my thought.
> >
> > We've already got all the other patches base64'd, just have ALL of
> > them base64'd, with a "cumulative" at the top for the human-readable
> > part of it (and/or for a best-effort sort of 'patch' fallback if
> > necessary).
> >
> >
>
> Part of the problem is that we want to make sure the thing a human
> reviews is the thing we commit to their tree.
> Otherwise it is far to easy to sneak in a rootkit in the base64 encoded
> patches.

Yeah, I agree, that's a real problem.

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

cheers