Rev 1692: (mbp) small fixes in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1692
revision-id: pqm at pqm.ubuntu.com-20060519061438-6300caf3926c3cff
parent: pqm at pqm.ubuntu.com-20060519061020-91373a33de6fa675
parent: mbp at sourcefrog.net-20060519060400-df4657a818d9008a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-05-19 07:14:38 +0100
message:
  (mbp) small fixes
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060519060400-df4657a818d9008a
    parent: mbp at sourcefrog.net-20060518083148-c16a7967a537af76
    parent: pqm at pqm.ubuntu.com-20060518085327-89822346d9321aba
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Fri 2006-05-19 16:04:00 +1000
    message:
      merge bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060518083148-c16a7967a537af76
    parent: mbp at sourcefrog.net-20060518082934-4511c14f6ea1587a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-05-18 18:31:48 +1000
    message:
      Fix misplaced try/finally (Debian #352791, madduck)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060518082934-4511c14f6ea1587a
    parent: mbp at sourcefrog.net-20060518061910-cbcb6b00b5dcd2f5
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-05-18 18:29:34 +1000
    message:
      Fix unbound local when handling failure to write message template
      
      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=352707
      (Bob Tanner)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060518061910-cbcb6b00b5dcd2f5
    parent: mbp at sourcefrog.net-20060517105049-7e52ece8f7e35f74
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Thu 2006-05-18 16:19:10 +1000
    message:
      log --line shows revision numbers (Alexander)
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060517105049-7e52ece8f7e35f74
    parent: mbp at sourcefrog.net-20060517084150-f618b89d118e3cc3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Wed 2006-05-17 20:50:49 +1000
    message:
      Remove duplicated NEWS line