← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
932
932
        # its repository.
933
933
        self.make_tree_with_two_commits()
934
934
        rev_id_utf8 = u'\xc8'.encode('utf-8')
935
 
        self.tree.branch.set_revision_history([])
 
935
        self.tree.branch.set_last_revision_info(0, 'null:')
936
936
        self.assertEqual(
937
937
            (0, 'null:'), self.tree.branch.last_revision_info())
938
938
        # We can update the branch to a revision that is present in the