← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_reconcile.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_reconcile.py
17
17
"""Tests for branch implementations - test reconcile() functionality"""
18
18
 
19
19
from bzrlib import errors, reconcile
 
20
from bzrlib.symbol_versioning import deprecated_in
20
21
from bzrlib.tests.per_branch import TestCaseWithBranch
21
22
 
22
23
 
42
43
        r5 = tree.commit('five')
43
44
        # Now, try to set an invalid history
44
45
        try:
45
 
            tree.branch.set_revision_history([r1, r2b, r5])
 
46
            self.applyDeprecated(deprecated_in((2, 4, 0)),
 
47
                tree.branch.set_revision_history, [r1, r2b, r5])
46
48
            if tree.branch.last_revision_info() != (3, r5):
47
49
                # RemoteBranch silently corrects an impossible revision
48
50
                # history given to set_revision_history.  It can be tricked