Re: [ANNOUNCE] Example Cogito Addon - cogito-bundle
- From
Petr Baudis <pasky@suse.cz>
- Date
- Oct 20, 2006, 22:40 UTC
- Message-ID
- <20061020224030.GL20017@pasky.or.cz>
- In-Reply-To
- <4538EC8F.7020502@utoronto.ca>
Dear diary, on Fri, Oct 20, 2006 at 05:34:39PM CEST, I got a letter where Aaron Bentley <aaron.bentley@utoronto.ca> said that...
Show 13 quoted lines
> -----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.
Aha, so by default a bundle can carry just a _single_ revision?
That doesn't sound right either, because then it wouldn't make sense to talk about "combined" or "simple" diffs. So I guess sending a bundle really is taking n revisions at your side, bundling them to a single diff and when the other side takes it, it will result in a single revision? That is basically what our merge --squash does.
Hmm, but that doesn't sound right either, that's certainly no revolting functionality and seems to be in contradiction with previous bundles description. But if it doesn't squash the changes, I don't see how the combined diff can be integral part of the data. Sorry, I don't get it.
> 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.
..snip..
Show 9 quoted lines
> > 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.
But that's the one there's no UI to select? Or where is the combined diff?
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)