Rev 2359: Fixes for merge directives in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2359
revision-id: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
parent: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 15:50:44 +0000
message:
  Fixes for merge directives
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
  bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
  bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
    parent: abentley at panoramicfeedback.com-20070314145434-9zsxjc8t80ktvdrd
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: mergedirective-fixes
    timestamp: Wed 2007-03-14 11:22:51 -0400
    message:
      Clean up NEWS
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070314145434-9zsxjc8t80ktvdrd
    parent: abentley at panoramicfeedback.com-20070314144622-b2jm4ml8t1jbdn6f
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: mergedirective-fixes
    timestamp: Wed 2007-03-14 10:54:34 -0400
    message:
      Ensure server default works, too
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070314144622-b2jm4ml8t1jbdn6f
    parent: abentley at panoramicfeedback.com-20070314144257-t8v7w2ezvphv9k4t
    parent: v.ladeuil+lp at free.fr-20070314103718-zg7lmw9jc584l1xd
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: mergedirective-fixes
    timestamp: Wed 2007-03-14 10:46:22 -0400
    message:
      Merge fix from Vincent
        ------------------------------------------------------------
        merged: v.ladeuil+lp at free.fr-20070314103718-zg7lmw9jc584l1xd
        parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 92195
        timestamp: Wed 2007-03-14 11:37:18 +0100
        message:
          Fix bug #92195.
          
          * tests/blackbox/test_merge_directive.py:
          (TestMergeDirective.prepare_merge_directive): Set smtp_server in
          branch config.
          (TestMergeDirective.test_mail): Check that the smtp_server is
          taken into account.
          
          * builtins.py:
          (cmd_merge_directive.run): Provide config smtp_server to
          SMTP.connect().
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070314144257-t8v7w2ezvphv9k4t
    parent: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
    parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: mergedirective-fixes
    timestamp: Wed 2007-03-14 10:42:57 -0400
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
    parent: abentley at panoramicfeedback.com-20070313161851-b5ixqt362m870bg4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: mergedirective
    timestamp: Tue 2007-03-13 12:59:44 -0400
    message:
      Decoded revision ids are utf-8
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070313161851-b5ixqt362m870bg4
    parent: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: mergedirective
    timestamp: Tue 2007-03-13 12:18:51 -0400
    message:
      Fix deserialization of merge directives with no patch