← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2007-06-28 15:45:06 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070628154506-v0f2y8979irc3dal
Make cherry-pick merge directives possible

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
311
311
    def write_directive(self, filename, source, target, revision_id,
312
312
                        base_revision_id=None, mangle_patch=False):
313
313
        md = merge_directive.MergeDirective2.from_objects(
314
 
            source.repository, revision_id, 0, 0, target)
315
 
        if base_revision_id is not None:
316
 
            md.base_revision_id = base_revision_id
 
314
            source.repository, revision_id, 0, 0, target,
 
315
            base_revision_id=base_revision_id)
317
316
        if mangle_patch:
318
317
            md.patch = 'asdf\n'
319
318
        self.build_tree_contents([(filename, ''.join(md.to_lines()))])