~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merged bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
103
103
        self.failIfExists('h')
104
104
        self.failUnlessExists('a/d/e')
105
105
 
 
106
    def test_revert_chatter(self):
 
107
        self._prepare_rename_mod_tree()
 
108
        chatter = self.run_bzr('revert')[1]
 
109
        self.assertEqualDiff('R   j/ => f/\n'
 
110
                             'R   j/b => a/b\n'
 
111
                             'R   j/d/ => a/d/\n'
 
112
                             'R   j/e => a/d/e\n'
 
113
                             'R   a/g => f/g\n'
 
114
                             'R   h => f/h\n', chatter)
106
115
    def test_revert(self):
107
116
        self.run_bzr('init')
108
117
 
152
161
        os.chdir('revertdir')
153
162
        self.run_bzr('revert')
154
163
        os.chdir('..')
155