/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: John Arbash Meinel
  • Date: 2011-05-06 14:53:40 UTC
  • mfrom: (5835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5846.
  • Revision ID: john@arbash-meinel.com-20110506145340-whf3chalcyhar9ag
Merge bzr.dev 5835 in prep for release-notes updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
89
89
 
90
90
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
91
        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')
 
92
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
93
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
95
94
 
96
95
        check.check_dwim(bx.base, False, True, True)
97
96
        check.check_dwim(by.base, False, True, True)