← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2007-08-15 20:49:22 UTC
  • mto: This revision was merged to the branch mainline in revision 2747.
  • Revision ID: abentley@panoramicfeedback.com-20070815204922-sm909246487o1thf
Restore patch verification for CR, CRLF files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
486
486
                                               self.base_revision_id)
487
487
        # Convert line-endings to UNIX
488
488
        stored_patch = re.sub('\r\n?', '\n', self.patch)
 
489
        calculated_patch = re.sub('\r\n?', '\n', calculated_patch)
489
490
        # Strip trailing whitespace
490
491
        calculated_patch = re.sub(' *\n', '\n', calculated_patch)
491
492
        stored_patch = re.sub(' *\n', '\n', stored_patch)