← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-04 14:08:14 UTC
  • mfrom: (6187 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6189.
  • Revision ID: jelmer@samba.org-20111004140814-cltag93d2l5j9zyf
Merge lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_reconcile.py
84
84
        tree.branch.set_last_revision_info(2, r2)
85
85
 
86
86
        reconciler = tree.branch.reconcile()
87
 
        self.assertEquals([r1, r2], tree.branch.revision_history())
 
87
        self.assertEquals(r2, tree.branch.last_revision())