[MERGE/RFC] Merge directive support

[Aaron Bentley]

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

Aaron Bentley wrote:
> Nicholas Allen wrote:
>> Shouldn't that be "Generate a merge directive *for* auto-merge tools."
> 
> Yes.  Fixed.
> 
>> Also what is the default patch type if one is not specified. It does not say in the help output...
> 
> Bundle.  I've changed it to:
> 
> Patch type:
>     --bundle            Bazaar revision bundle (default)

Here is a revised version that
1. addresses the help text concerns
2. avoids checking the contents of the public location if the patch-type
is "bundle".

Aaron

$ ./bzr merge-directive -h
usage: bzr merge-directive [SUBMIT_BRANCH] [PUBLIC_BRANCH]

Generate a merge directive for auto-merge tools.

A directive requests a merge to be performed, and also provides all the
information necessary to do so.  This means it must either include a
revision bundle, or the location of a branch containing the desired
revision.

A submit branch (the location to merge into) must be supplied the first
time the command is issued.  After it has been supplied once, it will
be remembered as the default.

A public branch is optional if a revision bundle is supplied, but required
if --diff or --plain is specified.  It will be remembered as the default
after the first use.

options:
  -h, --help            show help message
  --mail-to=ARG         Instead of printing the directive, email to this
                        address
  --sign                GPG-sign the directive
  -m ARG, --message=ARG
                        Message to use when committing this merge
  -r ARG, --revision=ARG
                        See 'help revisionspec' for details

  Patch type:
    --bundle            Bazaar revision bundle (default)
    --diff              Normal unified diff
    --plain             No patch, just directive
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF7auI0F+nu1YWqI0RAolPAJwKfIikwUCY51jJKwSoee8J4nShmgCghNhP
9yU5+l1yoJ6xe5lsHqlTr3g=
=D8E7
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-directive2.patch
Type: text/x-patch
Size: 50904 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070306/5c91317f/attachment-0001.bin