← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patches.py

  • Committer: Martin Pool
  • Date: 2006-06-20 07:55:43 UTC
  • mfrom: (1798 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1799.
  • Revision ID: mbp@sourcefrog.net-20060620075543-b10f6575d4a4fa32
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patches.py
319
319
    for line in iter_lines:
320
320
        if line.startswith('=== ') or line.startswith('*** '):
321
321
            continue
 
322
        if line.startswith('#'):
 
323
            continue
322
324
        elif line.startswith('--- '):
323
325
            if len(saved_lines) > 0:
324
326
                yield saved_lines
354
356
 
355
357
 
356
358
def difference_index(atext, btext):
357
 
    """Find the indext of the first character that differs betweeen two texts
 
359
    """Find the indext of the first character that differs between two texts
358
360
 
359
361
    :param atext: The first text
360
362
    :type atext: str