← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

Merge bzr.dev

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)
504
505
            if self._verify_patch(repository):
505
506
                return 'verified'
506
507
            else:
507
 
                #FIXME patch verification is broken for CRLF files
508
 
                return 'inapplicable'
509
508
                return 'failed'
510
509
        else:
511
510
            return 'inapplicable'