← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_revert.py
106
106
    def test_revert_chatter(self):
107
107
        self._prepare_rename_mod_tree()
108
108
        chatter = self.run_bzr('revert')[1]
109
 
        self.assertEqualDiff('R   j/b => a/b\n'
110
 
                             'R   j/d/ => a/d/\n'
111
 
                             'R   j/e => a/d/e\n'
112
 
                             'R   j/ => f/\n'
113
 
                             'R   a/g => f/g\n'
114
 
                             'R   h => f/h\n', chatter)
 
109
        self.assertEqualDiff(
 
110
            'R   a/g => f/g\n'
 
111
            'R   h => f/h\n'
 
112
            'R   j/ => f/\n'
 
113
            'R   j/b => a/b\n'
 
114
            'R   j/d/ => a/d/\n'
 
115
            'R   j/e => a/d/e\n',
 
116
            chatter)
 
117
 
115
118
    def test_revert(self):
116
119
        self.run_bzr('init')
117
120