← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_branch.py

  • Committer: Aaron Bentley
  • Date: 2007-02-12 23:01:49 UTC
  • mto: (2230.3.47 branch6)
  • mto: This revision was merged to the branch mainline in revision 2290.
  • Revision ID: abentley@panoramicfeedback.com-20070212230149-cdoq27bpnuilvljc
Rename strict_revision_history to append_revisions_only

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
670
670
    def test_strict_history(self):
671
671
        tree1 = self.make_branch_and_tree('tree1')
672
672
        try:
673
 
            tree1.branch.set_strict_history(True)
 
673
            tree1.branch.set_append_revisions_only(True)
674
674
        except errors.UpgradeRequired:
675
675
            raise TestSkipped('Format does not support strict history')
676
676
        tree1.commit('empty commit')
682
682
        self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch)
683
683
        tree2.merge_from_branch(tree1.branch)
684
684
        tree2.commit('empty commit 5')
685
 
        self.assertRaises(errors.StrictHistoryViolation, tree1.pull,
 
685
        self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull,
686
686
                          tree2.branch)
687
687
        tree3 = tree1.bzrdir.sprout('tree3').open_workingtree()
688
688
        tree3.merge_from_branch(tree2.branch)