Rev 3944: apply jam's log --short fix (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3944
revision-id: pqm at pqm.ubuntu.com-20090119030630-3xdyyi4xj69md8e4
parent: pqm at pqm.ubuntu.com-20090115233242-4bxyn4zcj2a0ksfk
parent: ian.clatworthy at canonical.com-20090119022415-mo0mcfeiexfktgwt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-01-19 03:06:30 +0000
message:
  apply jam's log --short fix (Ian Clatworthy)
modified:
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
    ------------------------------------------------------------
    revno: 3943.1.1
    revision-id: ian.clatworthy at canonical.com-20090119022415-mo0mcfeiexfktgwt
    parent: pqm at pqm.ubuntu.com-20090115233242-4bxyn4zcj2a0ksfk
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Mon 2009-01-19 12:24:15 +1000
    message:
      apply jam's log --short fix (Ian Clatworthy)
    modified:
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py	2009-01-15 14:05:13 +0000
+++ b/bzrlib/log.py	2009-01-19 02:24:15 +0000
@@ -620,7 +620,7 @@
     :return: an iterator of (revision_id, revno, merge_depth)
     (if there is no revno for a revision, None is supplied)
     """
-    if include_merges is False:
+    if not include_merges:
         revision_ids = mainline_revs[1:]
         if direction == 'reverse':
             revision_ids.reverse()