← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

(jelmer) Merge 2.3. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
33
33
    LockContention,
34
34
    )
35
35
from bzrlib.tests import (
 
36
    SymlinkFeature,
36
37
    TestCaseWithTransport,
37
38
    test_foreign,
38
39
    )
39
 
from bzrlib.tests.features import (
40
 
    SymlinkFeature,
41
 
    )
42
40
from bzrlib.tests.matchers import MatchesAncestry
43
41
 
44
42
 
161
159
        wt.commit(message='add hello')
162
160
 
163
161
        os.remove('hello')
164
 
        reporter = CapturingReporter()
165
 
        wt.commit('removed hello', rev_id='rev2', reporter=reporter)
166
 
        self.assertEquals(
167
 
            [('missing', u'hello'), ('deleted', u'hello')],
168
 
            reporter.calls)
 
162
        wt.commit('removed hello', rev_id='rev2')
169
163
 
170
164
        tree = b.repository.revision_tree('rev2')
171
165
        self.assertFalse(tree.has_id('hello-id'))