-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Jakub Narebski wrote: > Aaron Bentley wrote: >>In Bazaar bundles, the text of the diff is an integral part of the data. >> It is used to generate the text of all the files in the revision. > > > I thought that the diff was combined diff of changes. It is. It's a description of how to produce revision X given revision Y, where Y is the last-merged mainline revision. >>Bazaar bundles were designed to be used on mailing lists. So you can >>review the changes from the diff, comment on them, and if it seems >>suitable, merge them. > > > If you have only mega-diff, you can comment only on this mega-diff. That is what we prefer to review. >>>Although that might just make the email bigger for not a lot of >>>gain. >> >>It's my understanding that most changes discussed on lkml are provided >>as a series of patches. Bazaar bundles are intended as a direct >>replacement for patches in that use case. > > > As _series_ of patches. You have git-format-patch + git-send-email > to format and send them, git-am to apply them (as patches, not as branch). If you want to do it exactly the same way, you send a series of bundles. The bundle format can also support sending a single bundles that displays the series of patches, though there's currently no UI to select this. > I was under an impression that user sees only mega-patch of all the > revisions in bundle together, and rest is for machine consumption only. All of it is for machine consumption. The MIME-encoded sections are a series of patches. They're usually MIME-encoded to avoid confusion with the overview patch, but this is optional. I've attached an example of what a combined patch-by-patch bundle looks like. Aaron -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFFOOyB0F+nu1YWqI0RAtU6AKCJndTNlTTPNnzxZX53lkBUUHTYkwCfePlG 7x3cjpYwh8LXEb5ZWXXmu6s= =6Lgv -----END PGP SIGNATURE-----
# Bazaar revision bundle v0.8 # # message: # Added 'world' # committer: Aaron Bentley <abentley@xxxxxxxxxxxxxxxxxxxxx> # date: Fri 2006-10-20 11:30:21.903000116 -0400 === modified file world --- world +++ world @@ -1,1 +1,1 @@ -Hello +Hello, world === modified directory // last-changed:abentley@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ... 153021-b5fcea14e9cd2b34 # revision id: abentley@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # sha1: 6d553e72158aaa76c258d98c15cd24922d171cd9 # inventory sha1: 64af82c4d81d9d6ad4f33fc734d32c2a1eaa0df5 # parent ids: # abentley@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # properties: # branch-nick: bar # message: # Capitalized # committer: Aaron Bentley <abentley@xxxxxxxxxxxxxxxxxxxxx> # date: Fri 2006-10-20 11:29:51.953999996 -0400 === modified file world --- world +++ world @@ -1,1 +1,1 @@ -hello +Hello === modified directory // last-changed:abentley@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ... 152951-10cff5ff5a51e9a2 # revision id: abentley@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # sha1: f7b79934bc3b0a944e35168b5df6b106c5b29ebf # inventory sha1: 1400d56451752300cc31c9c94ff7ee2188e8ef8c # parent ids: # abentley@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # properties: # branch-nick: bar # message: # initial commit # committer: Aaron Bentley <abentley@xxxxxxxxxxxxxxxxxxxxx> # date: Fri 2006-10-20 11:29:35.536999941 -0400 === added directory // file-id:TREE_ROOT === added file world // file-id:world-20061020152929-12bknd8mm9mx48as-1 --- /dev/null +++ world @@ -0,0 +1,1 @@ +hello # revision id: abentley@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # sha1: 0728f761b891b257f0a71e2e360799eec080cd21 # inventory sha1: e52e030ea40f6bf5da78f4e8eb8efcd072b0930a # properties: # branch-nick: bar