← 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: Aaron Bentley
  • Date: 2010-02-17 23:40:51 UTC
  • mto: (4797.2.19 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: aaron@aaronbentley.com-20100217234051-z6u2i3yd0gizc12r
Fix merge when this_tree is not a WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
24
24
    memorytree,
25
25
    merge as _mod_merge,
26
26
    option,
27
 
    progress,
28
27
    tests,
29
28
    transform,
30
29
    versionedfile,
2894
2893
                        base=False, other=False)
2895
2894
        return builder
2896
2895
 
 
2896
    def test_uses_this_branch(self):
 
2897
        builder = self.make_text_conflict()
 
2898
        tt = builder.make_preview_transform()
 
2899
        self.addCleanup(tt.finalize)
 
2900
 
2897
2901
    def test_affected_files_cached(self):
2898
2902
        """Ensures that the config variable is cached"""
2899
2903
        builder = self.make_text_conflict()