← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2008-05-08 04:12:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080508041206-tkrr8ucmcyrlzkum
Some review cleanups for assertion removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1231
1231
            yield status_a(revision, text)
1232
1232
        for revision, text in annotated_b[b_cur:bi]:
1233
1233
            yield status_b(revision, text)
1234
 
 
1235
1234
        # and now the matched section
1236
1235
        a_cur = ai + l
1237
1236
        b_cur = bi + l
1238
 
        for text_a, text_b in zip(plain_a[ai:a_cur], plain_b[bi:b_cur]):
 
1237
        for text_a in plain_a[ai:a_cur]:
1239
1238
            yield "unchanged", text_a
1240
1239
 
1241
1240