← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revert.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revert.py
134
134
        self.assertPathDoesNotExist('file')
135
135
        self.assertEqual({}, tree.merge_modified())
136
136
 
137
 
    def test_empty_deprecated(self):
138
 
        tree = self.make_branch_and_tree('.')
139
 
        self.build_tree(['file'])
140
 
        tree.add('file')
141
 
        self.callDeprecated(['Using [] to revert all files is deprecated'
142
 
            ' as of bzr 0.91.  Please use None (the default) instead.'],
143
 
            tree.revert, [])
144
 
        self.assertIs(None, tree.path2id('file'))
145
 
 
146
137
    def test_revert_file_in_deleted_dir(self):
147
138
        tree = self.make_branch_and_tree('.')
148
139
        self.build_tree(['dir/', 'dir/file1', 'dir/file2'])