/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_revision_history.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_revision_history.py
21
21
    errors,
22
22
    revision as _mod_revision,
23
23
    )
 
24
from bzrlib.symbol_versioning import deprecated_in
24
25
from bzrlib.tests import per_branch
25
26
 
26
27
 
112
113
        # Lock the branch, set the revision history, then repeatedly call
113
114
        # revision_history.
114
115
        branch.lock_write()
115
 
        branch.set_revision_history([])
 
116
        self.applyDeprecated(deprecated_in((2, 4, 0)),
 
117
            branch.set_revision_history, [])
116
118
        try:
117
119
            branch.revision_history()
118
120
            self.assertEqual([], calls)
124
126
        cause the revision history to be cached.
125
127
        """
126
128
        branch, calls = self.get_instrumented_branch()
127
 
        branch.set_revision_history([])
 
129
        self.applyDeprecated(deprecated_in((2, 4, 0)),
 
130
            branch.set_revision_history, [])
128
131
        branch.revision_history()
129
132
        self.assertEqual(['_gen_revision_history'], calls)
130
133