← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_logformats.py
114
114
 
115
115
    def setup_config(self):
116
116
        if os.path.isfile(config_filename()):
117
 
                # Something is wrong in environment, 
118
 
                # we risk overwriting users config 
 
117
                # Something is wrong in environment,
 
118
                # we risk overwriting users config
119
119
                self.assert_(config_filename() + "exists, abort")
120
 
            
 
120
 
121
121
        ensure_config_dir_exists()
122
122
        CONFIG=("[DEFAULT]\n"
123
123
                "email=Joe Foo <joe@foo.com>\n"