[MERGE] Explain --message and --mail-to in the help of merge-directive

[James Westby]

# Bazaar merge directive format 1
# revision_id: jw+debian at jameswestby.net-20070628191938-\
#   o5imvbs4xzi98s8b
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: 1f102e7511d417cb8af0bbd9b4430392dbe78388
# timestamp: 2007-06-28 20:20:09 +0100
# message: [MERGE] Explain --message and --mail-to in the help of\
#    merge-directive
# 
# Bazaar revision bundle v0.9
#
# message:
#   Explain --message and --mail-to in the help of merge-directive
# committer: James Westby <jw+debian at jameswestby.net>
# date: Thu 2007-06-28 20:19:38.404000044 +0100

=== modified file NEWS
--- NEWS
+++ NEWS
@@ -53,6 +53,9 @@
       library users and plugins. See the ``bzrlib.api`` module for details.
       (Robert Collins)
 
+    * Explain --message and --mail-to in the help of merge-directive.
+      (James Westby)
+
   INTERNALS:
 
     * New SMTPConnection class to unify email handling.  (Adeodato Simó)

=== modified file bzrlib/builtins.py
--- bzrlib/builtins.py
+++ bzrlib/builtins.py
@@ -3518,6 +3518,13 @@
     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.
+
+    If the --message option is used then the specified message will be used
+    as the commit message when the merge is performed.
+
+    --mail-to can be used to send the merge directive directly to the
+    recipient. If a message is supplied with --message then it will be used
+    as the subject of the mail.
     """
 
     takes_args = ['submit_branch?', 'public_branch?']

=== modified directory  // last-changed:jw+debian at jameswestby.net-2007062819193
... 8-o5imvbs4xzi98s8b
# revision id: jw+debian at jameswestby.net-20070628191938-o5imvbs4xzi98s8b
# sha1: 1f102e7511d417cb8af0bbd9b4430392dbe78388
# inventory sha1: 58223d8c9e9e61e8931621c41c9b2ba963903197
# parent ids:
#   pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
# base id: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
# properties:
#   branch-nick: bzr.dev