Rev 3182: Fix typo, (thanks Ian) in http://bzr.arbash-meinel.com/branches/bzr/1.2-dev/optim_annotate

John Arbash Meinel john at arbash-meinel.com
Wed Jan 30 18:15:35 GMT 2008


At http://bzr.arbash-meinel.com/branches/bzr/1.2-dev/optim_annotate

------------------------------------------------------------
revno: 3182
revision-id:john at arbash-meinel.com-20080130181024-fu7u323c9paee4n5
parent: john at arbash-meinel.com-20080124225422-atibw1m93vdmtjw9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: optim_annotate
timestamp: Wed 2008-01-30 12:10:24 -0600
message:
  Fix typo, (thanks Ian)
modified:
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
-------------- next part --------------
=== modified file 'bzrlib/annotate.py'
--- a/bzrlib/annotate.py	2008-01-24 22:54:22 +0000
+++ b/bzrlib/annotate.py	2008-01-30 18:10:24 +0000
@@ -206,7 +206,7 @@
                 if len(origins) == 2 and new_revision_id in origins:
                     origins.remove(new_revision_id)
                 if len(origins) == 1:
-                    lines.append(origins.pop(), line))
+                    lines.append((origins.pop(), line))
                 else:
                     lines.append((new_revision_id, line))
     return lines



More information about the bazaar-commits mailing list