← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_too_much.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/blackbox/test_too_much.py
564
564
        url = self.get_readonly_url('from')
565
565
        self.run_bzr(['branch', url, 'to'])
566
566
        branch = Branch.open('to')
567
 
        self.assertEqual(1, len(branch.revision_history()))
 
567
        self.assertEqual(1, branch.last_revision_info()[0])
568
568
        # the branch should be set in to to from
569
569
        self.assertEqual(url + '/', branch.get_parent())
570
570