$ bzr log --include-merges



------------------------------------------------------------
revno: 4715 [merge]
committer: Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>
branch nick: 2.0
timestamp: Tue 2009-12-22 06:18:55 +0000
message:
  (mbp) better message if lockdir disappears after apparently succeeding
    ------------------------------------------------------------
    revno: 4713.1.2 [merge]
    committer: Martin Pool <mbp@sourcefrog.net>
    branch nick: 2.0-498378-peek-lock
    timestamp: Tue 2009-12-22 15:10:41 +1100
    message:
      merge news
    ------------------------------------------------------------
    revno: 4713.1.1
    committer: Martin Pool <mbp@sourcefrog.net>
    branch nick: 2.0-498378-peek-lock
    timestamp: Mon 2009-12-21 17:17:05 +1100
    message:
      Better message when lockdir goes missing after rename succeeds
------------------------------------------------------------
revno: 4714 [merge]
committer: Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>
branch nick: 2.0
timestamp: Mon 2009-12-21 18:50:59 +0000
message:
  (jam) Fix part of bug #495000 so that 2a formats restart concurrent
        autopack as appropriate.
    ------------------------------------------------------------
    revno: 4710.2.4 [merge]
    committer: John Arbash Meinel <john@arbash-meinel.com>
    branch nick: 2.0.4-495000-win32-autopack
    timestamp: Mon 2009-12-21 10:45:39 -0600
    message:
    message:
      Merge bzr.stable 4713, resolve NEWS
    ------------------------------------------------------------
    revno: 4710.2.3
    committer: John Arbash Meinel <john@arbash-meinel.com>
    branch nick: 2.0.4-495000-win32-autopack
    timestamp: Wed 2009-12-16 16:02:31 -0600
    message:
      NEWS about fixing bug #495000
    ------------------------------------------------------------
    revno: 4710.2.2
    committer: John Arbash Meinel <john@arbash-meinel.com>
    branch nick: 2.0.4-495000-win32-autopack
    timestamp: Wed 2009-12-16 16:00:39 -0600
    message:
      Add a test which triggers the behavior.

      It is a bit more monkey patching than ideal, but works and is stable
      for now.
    ------------------------------------------------------------
    revno: 4710.2.1
    committer: John Arbash Meinel <john@arbash-meinel.com>
    branch nick: 2.0.4-495000-win32-autopack
    timestamp: Wed 2009-12-16 14:20:04 -0600
    message:
      handle when content goes missing during an autopack (bug #495000)

      This is the trivial fix, which is to pass down the reload func
      while we are packing. Manual testing shows that this works, need
      to figure out why the test suite missed it. Probably because
      it invasively grabs part of the code to inject the concurrency,
      which is sub-ideal, but I don't have a great alternative in mind.
------------------------------------------------------------
revno: 4713 [merge]
committer: Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>
branch nick: 2.0
timestamp: Mon 2009-12-21 02:06:07 +0000
message:
  (jam) Fix a memory leak w/ bencode.Encoder() not cleaning up
        allocated mem.
    ------------------------------------------------------------
    revno: 4712.1.2
    committer: John Arbash Meinel <john@arbash-meinel.com>
    branch nick: 2.0.4-494406-serve-memory-leak
    timestamp: Fri 2009-12-18 16:03:09 -0600
    message:
      NEWS entry about fixing bug #494406
    ------------------------------------------------------------
    revno: 4712.1.1
    committer: John Arbash Meinel <john@arbash-meinel.com>
    branch nick: 2.0.4-494406-serve-memory-leak
    timestamp: Fri 2009-12-18 15:58:32 -0600
    message:
      bencode.Encoder should use __dealloc__ to free C level resources.
------------------------------------------------------------
revno: 4712 [merge]
committer: Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>
branch nick: 2.0
timestamp: Fri 2009-12-18 17:00:35 +0000
message:
  (jam) Address bug #343218 by batching file texts request during
        export.

(etc.)