← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

(gz) Fix test failure on alpha by correcting format string for
 gc_chk_sha1_record (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
20
20
from bzrlib import check, osutils
21
21
from bzrlib.errors import PointlessCommit
22
22
from bzrlib.tests import (
 
23
    SymlinkFeature,
23
24
    TestCaseWithTransport,
24
25
    )
25
 
from bzrlib.tests.features import (
26
 
    SymlinkFeature,
27
 
    )
28
26
 
29
27
 
30
28
class TestCommitMerge(TestCaseWithTransport):
91
89
 
92
90
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
93
91
        tree = by.repository.revision_tree('y@u-0-2')
94
 
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
95
 
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
 
92
        inv = tree.inventory
 
93
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
94
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
96
95
 
97
96
        check.check_dwim(bx.base, False, True, True)
98
97
        check.check_dwim(by.base, False, True, True)