← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.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_upgrade.py
25
25
from bzrlib import (
26
26
    branch,
27
27
    bzrdir,
28
 
    repository,
29
28
    tests,
30
29
    upgrade,
31
30
    workingtree,
42
41
 
43
42
    def test_convert_branch5_branch6(self):
44
43
        b = self.make_branch('branch', format='knit')
45
 
        b.set_revision_history(['AB', 'CD'])
 
44
        b._set_revision_history(['CD'])
46
45
        b.set_parent('file:///EF')
47
46
        b.set_bound_location('file:///GH')
48
47
        b.set_push_location('file:///IJ')