[MERGE REVIEW] Tweaks to bundle merging

[Aaron Bentley]

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

John Arbash Meinel wrote:
> What I've been thinking about for a future bundle format is to actually
> just stream the knit hunks at the bottom, ungzipped, bzipped, and base64
> encoded, rather than re-creating them.
> 
> Then we can just create a nice looking rollup patch at the top, which
> the merge code can verify. I think it is very important to have a patch
> that can be reviewed, and which is verified at the time it is merged.

I think this hurts in the case of a single-revision bundle.  Which is
not uncommon.

Knit hunks are close enough to patches that I'd be okay with mailing
them, and if we come up with a new format, we would be able to leverage
our knit-to-foo converter then.

> The whole point is to read something, and know that it is what is going
> to be applied. If you split each diff up, you may end up with one diff
> that looks quite good, but it is secretly hiding a later diff which adds
> a bug/rootkit.

Yes, if we do something like this, verification is essential.  On the
other hand, if the roll-up isn't authoritative, then we can handle
line-endings and whitespace munging more gracefully.

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

iD8DBQFElBlV0F+nu1YWqI0RAs2iAJ4yXjsH0l+8QyA5M5z1fW6CpNpXEQCfUAbf
rxpOswTxE1De/OiAlryp5z4=
=NSNI
-----END PGP SIGNATURE-----