← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: John Arbash Meinel
  • Date: 2008-01-30 18:10:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3209.
  • Revision ID: john@arbash-meinel.com-20080130181024-fu7u323c9paee4n5
Fix typo, (thanks Ian)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
206
206
                if len(origins) == 2 and new_revision_id in origins:
207
207
                    origins.remove(new_revision_id)
208
208
                if len(origins) == 1:
209
 
                    lines.append(origins.pop(), line))
 
209
                    lines.append((origins.pop(), line))
210
210
                else:
211
211
                    lines.append((new_revision_id, line))
212
212
    return lines