← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_modified.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_modified.py
50
50
        # with unknown file, still nothing modified
51
51
        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
52
52
        check_modified('')
53
 
        
 
53
 
54
54
        # after add, not modified
55
55
        tree.add(name)
56
56
        check_modified('')
60
60
        check_modified('')
61
61
 
62
62
        # modify the file
63
 
        self.build_tree_contents([(name, 'changed\n')]) 
 
63
        self.build_tree_contents([(name, 'changed\n')])
64
64
        check_modified(output + '\n')
65
 
        
 
65
 
66
66
        # check null seps - use the unquoted raw name here
67
67
        check_modified(name + '\0', null=True)
68
68