~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

• browse files at revision 1397
• compare with another revision
• compare with revision 4017
• download diff
• download tarball
• view history from revision 1397

Show diffs side-by-side

added

removed

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)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1