[RFC] [MERGE] Draft 2 of revised mini-tutorial

Aaron Bentley aaron.bentley at utoronto.ca
Tue Oct 16 13:54:13 BST 2007


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

Matthew Revell wrote:
> On 16/10/2007, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Matthew Revell wrote:
>>> In that bzr send section, I've also expanded the description of what a
>>> bundle is. Does that go far enough to explain how they improve on
>>> patches, without overdoing it for a five minute tutorial?
>> I don't know how important this is, but `bzr send` does not merely
>> produce a bundle-- it produces a merge directive that (optionally)
>> contains a bundle.
> 
> Would it be better to stick with a simple bzr bundle?

Not really.  A bundle is just a collection of revisions.  It contains no
information on what merge to perform.  It contains no patch preview of
what the merge would look like.

Merge directives
1. are signable and can expire
2. provide an explicit merge revision and an explicit base revision
3. provide an (optional) preview of the merge that will be performed
4. can be used with either branches or bundles

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

iD8DBQFHFLR10F+nu1YWqI0RAkBtAJkBIIprTq7PN9JFt6ZbZSMDgILOVwCeJDql
kNTxYUVA9uhDcfkEc8AmNew=
=kJ3h
-----END PGP SIGNATURE-----



More information about the bazaar mailing list