/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_check.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_branch/test_check.py
19
19
from StringIO import StringIO
20
20
 
21
21
from bzrlib import errors, tests, ui
 
22
from bzrlib.symbol_versioning import deprecated_in
22
23
from bzrlib.tests.per_branch import TestCaseWithBranch
23
24
 
24
25
 
44
45
        r5 = tree.commit('five')
45
46
        # Now, try to set an invalid history
46
47
        try:
47
 
            tree.branch.set_revision_history([r1, r2b, r5])
 
48
            self.applyDeprecated(deprecated_in((2, 4, 0)),
 
49
                tree.branch.set_revision_history, [r1, r2b, r5])
48
50
            if tree.branch.last_revision_info() != (3, r5):
49
51
                # RemoteBranch silently corrects an impossible revision
50
52
                # history given to set_revision_history.  It can be tricked