Rev 2342: Small tweaks for merge directives in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2342
revision-id: pqm at pqm.ubuntu.com-20070312164621-d96558dc43d9c1b6
parent: pqm at pqm.ubuntu.com-20070312163121-a8078e3704c91ffe
parent: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:46:21 +0000
message:
  Small tweaks for merge directives
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/gpg.py                  gpg.py-20051017065112-8654536d415dacc6
  bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
  bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
    parent: aaron.bentley at utoronto.ca-20070311161600-hvtsmkf3d2z72562
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: mergedirective
    timestamp: Mon 2007-03-12 09:31:42 -0400
    message:
      speling fix
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070311161600-hvtsmkf3d2z72562
    parent: aaron.bentley at utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: mergedirective
    timestamp: Sun 2007-03-11 12:16:00 -0400
    message:
      Allow leading junk before merge directive header
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
    parent: aaron.bentley at utoronto.ca-20070311004707-nvgm18l7xx9md7hg
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: mergedirective
    timestamp: Sat 2007-03-10 20:22:51 -0500
    message:
      Use public location of submit branch if possible
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070311004707-nvgm18l7xx9md7hg
    parent: abentley at panoramicfeedback.com-20070309224147-m7or85t0o86c0t34
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: mergedirective
    timestamp: Sat 2007-03-10 19:47:07 -0500
    message:
      Proper error when deserializing junk