← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Martin Pool
  • Date: 2010-02-23 07:43:11 UTC
  • mfrom: (4797.2.20 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: mbp@sourcefrog.net-20100223074311-gnj55xdhrgz9l94e
Merge 2.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
2887
2887
                        base=False, other=False)
2888
2888
        return builder
2889
2889
 
 
2890
    def test_uses_this_branch(self):
 
2891
        builder = self.make_text_conflict()
 
2892
        tt = builder.make_preview_transform()
 
2893
        self.addCleanup(tt.finalize)
 
2894
 
2890
2895
    def test_affected_files_cached(self):
2891
2896
        """Ensures that the config variable is cached"""
2892
2897
        builder = self.make_text_conflict()