[RFC] [MERGE] Draft 2 of revised mini-tutorial
Aaron Bentley
aaron.bentley at utoronto.ca
Tue Oct 16 14:33:03 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Matthew Revell wrote:
> Following our conversation on irc, how I've changed this to:
>
> "A merge directive is a machine-readable request to perform a
> particular merge. It usually contains a patch preview of the merge
> and either contains the necessary revisions, or provides a branch
> where they can be found.
>
> Replacing ``mycode.patch``, create your merge directive::
>
> $ bzr send -o mycode.patch
> Using saved location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk
>
> You can now email the bundle to the upstream project who can, if they
^^^ should be "email the merge directive"
> choose, merge it back into trunk, i.e. the parent branch."
>
> My concern is that we don't introduce bundles
But bundles are, at the moment, only an implementation detail of merge
directives. Bazaar has no way to emit a raw bundle.
So I don't think new users need to know about them. Only developers
implementing new bundle/merge directive formats would need to know that.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHFL2P0F+nu1YWqI0RAquiAJ0czHJQXa8o3MYK0F9l6qUN1311OQCfVG5o
dOU9P6K0UV7XQwmtT0RTTxA=
=29Gl
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list