← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~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-17 04:04:33 UTC
mfrom: (1458)
mto: (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1460.
Revision ID: mbp@sourcefrog.net-20051017040433-79379c10856d7b83

[merge] from robert

Show diffs side-by-side

added added

removed removed

bzrlib/selftest/test_commit_merge.py

94

94

self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')

95

95

self.assertEquals(inv['why-id'].revision, 'y@u-0-1')

96

96

97

check(bx)

98

check(by)

97

check(bx, False)

98

check(by, False)

Older »