← 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

Update for review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_revert.py
18
18
 
19
19
import os
20
20
 
21
 
<<<<<<< TREE
22
 
from bzrlib.workingtree import WorkingTree
23
 
=======
24
21
import bzrlib.osutils
25
 
>>>>>>> MERGE-SOURCE
26
22
from bzrlib.tests.blackbox import ExternalBase
27
23
from bzrlib.trace import mutter
 
24
from bzrlib.workingtree import WorkingTree
28
25
 
29
26
 
30
27
class TestRevert(ExternalBase):
56
53
        self.run_bzr('commit', '-m', '1')
57
54
        wt = WorkingTree.open('.')
58
55
        wt.rename_one('a/b', 'f/b')
 
56
        wt.rename_one('a/d/e', 'f/e')
59
57
        wt.rename_one('a/d', 'f/d')
60
58
        wt.rename_one('f/g', 'a/g')
61
59
        wt.rename_one('f/h', 'h')
103
101
        self.run_bzr('revert', 'f')
104
102
        self.failIfExists('j')
105
103
        self.failIfExists('h')
 
104
        self.failUnlessExists('a/d/e')
106
105
 
107
106
    def test_revert(self):
108
107
        self.run_bzr('init')