/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_uncommit.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-03 14:50:03 UTC
  • mfrom: (6183 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6184.
  • Revision ID: jelmer@samba.org-20111003145003-6x5mqsdb2csqoxz7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
119
119
        t_a.commit('commit 3')
120
120
        b = t_a.branch.create_checkout('b').branch
121
121
        uncommit.uncommit(b)
122
 
        self.assertEqual(len(b.revision_history()), 2)
123
 
        self.assertEqual(len(t_a.branch.revision_history()), 2)
 
122
        self.assertEqual(b.last_revision_info()[0], 2)
 
123
        self.assertEqual(t_a.branch.last_revision_info()[0], 2)
124
124
        # update A's tree to not have the uncommitted revision referenced.
125
125
        t_a.update()
126
126
        t_a.commit('commit 3b')