← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

  • Committer: Martin Pool
  • Date: 2005-10-04 02:27:27 UTC
  • mfrom: (1399)
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1400.
  • Revision ID: mbp@sourcefrog.net-20051004022727-aee7064c62e039a7
[merge] merge robertc's format5 integration

 - test status on specific files
 - track x bit
 - baz2bzr fixes
 - remotebranch fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_commit_merge.py
91
91
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
92
92
        tree = by.revision_tree('y@u-0-2')
93
93
        inv = tree.inventory
94
 
        self.assertEquals(inv['ecks-id'].text_version, 'x@u-0-1')
95
 
        self.assertEquals(inv['why-id'].text_version, 'y@u-0-1')
 
94
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
95
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
96
96
 
97
97
        check(bx)
98
98
        check(by)