← 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-09-21 08:57:00 UTC
  • Revision ID: mbp@sourcefrog.net-20050921085700-7bced0881f2a6ddf
- check branch after commit in merge tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_commit_merge.py
24
24
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
25
25
from bzrlib.selftest.testrevision import make_branches
26
26
from bzrlib.fetch import fetch
 
27
from bzrlib.check import check
27
28
 
28
29
 
29
30
class TestCommitMerge(TestCaseInTempDir):
91
92
        tree = by.revision_tree('y@u-0-2')
92
93
        inv = tree.inventory
93
94
        self.assertEquals(inv['ecks-id'].text_version, 'x@u-0-1')
94
 
        self.assertEquals(inv['why-id'].text_version, 'y@u-0-1')        
 
95
        self.assertEquals(inv['why-id'].text_version, 'y@u-0-1')
 
96
 
 
97
        check(bx)
 
98
        check(by)
95
99
 
96
100
 
97
101
if __name__ == '__main__':