← 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: Aaron Bentley
  • Date: 2005-10-13 21:29:09 UTC
  • mfrom: (1451)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@troll-20051013212909-cfde7d2d05ccd47e
Merged latest from robert collins

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)