← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_merger.py
209
209
    """Tests that the 'merge_file_content' hook is invoked."""
210
210
 
211
211
    def setUp(self):
212
 
        super(TestHookMergeFileContent, self).setUp()
 
212
        TestCaseWithTransport.setUp(self)
213
213
        self.hook_log = []
214
214
 
215
215
    def install_hook_inactive(self):