/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-16 13:12:40 UTC
  • mfrom: (6071 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6076.
  • Revision ID: v.ladeuil+lp@free.fr-20110816131240-gcyn9cik86dxwgz3
Merge into trunk

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
    TestCaseWithTransport,
 
24
    )
 
25
from bzrlib.tests.features import (
23
26
    SymlinkFeature,
24
 
    TestCaseWithTransport,
25
27
    )
26
28
 
27
29
 
89
91
 
90
92
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
93
        tree = by.repository.revision_tree('y@u-0-2')
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')
 
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')
95
96
 
96
97
        check.check_dwim(bx.base, False, True, True)
97
98
        check.check_dwim(by.base, False, True, True)