← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-05 18:11:19 UTC
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111005181119-temwjtxkgnt3jybm
Fix tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
60
60
 
61
61
        self.assertEquals(by.revno(), 3)
62
62
        graph = wty.branch.repository.get_graph()
 
63
        self.addCleanup(wty.lock_read().unlock)
63
64
        self.assertEquals(list(
64
65
            graph.iter_lefthand_ancestry(by.last_revision(),
65
66
                [_mod_revision.NULL_REVISION])),