← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_update.py
68
68
        # commit to the master making the child tree out of date and not a prefix.
69
69
        master_tree.commit('bar', rev_id='bar', allow_pointless=True)
70
70
        self.assertEqual('foo', child_tree.branch.update())
71
 
        self.assertEqual(['bar'], child_tree.branch.revision_history())
 
71
        self.assertEqual('bar', child_tree.branch.last_revision())
72
72
 
73
73
    def test_update_in_checkout_of_readonly(self):
74
74
        tree1 = self.make_branch_and_tree('tree1')