← 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-21 01:32:29 UTC
  • mfrom: (2727 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2736.
  • Revision ID: aaron.bentley@utoronto.ca-20070821013229-miopsemz249tv0bl
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
190
190
                    StringIO(self.get_raw_bundle()))
191
191
                # We don't use the bundle's target revision, because
192
192
                # MergeDirective.revision_id is authoritative.
193
 
                info.install_revisions(target_repo)
 
193
                info.install_revisions(target_repo, stream_input=False)
194
194
            else:
195
195
                source_branch = _mod_branch.Branch.open(self.source_branch)
196
196
                target_repo.fetch(source_branch.repository, self.revision_id)
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'