← 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: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
2863
2863
 
2864
2864
    def get_merger_factory(self):
2865
2865
        # Allows  the inner methods to access the test attributes
2866
 
        test = self
 
2866
        calls = self.calls
2867
2867
 
2868
2868
        class FooMerger(_mod_merge.ConfigurableFileMerger):
2869
2869
            name_prefix = "foo"
2870
2870
            default_files = ['bar']
2871
2871
 
2872
2872
            def merge_text(self, params):
2873
 
                test.calls.append('merge_text')
 
2873
                calls.append('merge_text')
2874
2874
                return ('not_applicable', None)
2875
2875
 
2876
2876
        def factory(merger):