← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Aaron Bentley
  • Date: 2007-07-24 01:39:52 UTC
  • mto: This revision was merged to the branch mainline in revision 2699.
  • Revision ID: aaron.bentley@utoronto.ca-20070724013952-isph0r8pe5hgavw1
Fix benign off-by-one error generating mpdiffs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
106
106
                if block is None:
107
107
                    continue
108
108
                i, j, n = block
109
 
                while j + n < cur_line:
 
109
                while j + n <= cur_line:
110
110
                    block = cur_block[p] = next_block(p)
111
111
                    if block is None:
112
112
                        break