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