← 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

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
20
20
 
21
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.branch import Branch
23
 
from bzrlib.commit import commit
24
23
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
25
24
from bzrlib.tests.test_revision import make_branches
26
25
from bzrlib.fetch import fetch
58
57
        self.assertEquals(by.revno(), 2)
59
58
        self.assertEquals(list(by.revision_history()),
60
59
                          ['y@u-0-1', 'y@u-0-2'])
61
 
        rev = by.get_revision('y@u-0-2')
 
60
        rev = by.repository.get_revision('y@u-0-2')
62
61
        self.assertEquals(rev.parent_ids,
63
62
                          ['y@u-0-1', 'x@u-0-1'])
64
63
 
92
91
                          specific_files=['ecks'])
93
92
        
94
93
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
95
 
        tree = by.revision_tree('y@u-0-2')
 
94
        tree = by.repository.revision_tree('y@u-0-2')
96
95
        inv = tree.inventory
97
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
98
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')