← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_delta.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/test_delta.py
116
116
            old_path=None, versioned_change='unversioned',
117
117
            renamed=False, modified='created', exe_change=False,
118
118
            kind=(None, 'file'))
119
 
        # but we can choose to filter these. Probably that should be done 
 
119
        # but we can choose to filter these. Probably that should be done
120
120
        # close to the tree, but this is a reasonable starting point.
121
121
        self.assertReport(None, file_id=None, path='subdir/foo~',
122
122
            old_path=None, versioned_change='unversioned',