← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_workingtree.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/per_workingtree/test_workingtree.py
327
327
        # because some formats mutate the branch to set it on the tree
328
328
        # we need to alter the branch to let this pass.
329
329
        try:
330
 
            wt.branch.set_revision_history(['A', 'B'])
 
330
            wt.branch._set_revision_history(['A', 'B'])
331
331
        except errors.NoSuchRevision, e:
332
332
            self.assertEqual('B', e.revision)
333
333
            raise TestSkipped("Branch format does not permit arbitrary"