/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/branch_implementations/test_branch.py

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
54
54
 
55
55
class TestBranch(TestCaseWithBranch):
56
56
 
57
 
    def test_append_revision(self):
58
 
        # note that append_revision is now deprecated; new code should call
59
 
        # set_last_revision_info instead.
60
 
        wt = self.make_branch_and_tree('tree')
61
 
        wt.commit('f', rev_id='rev1')
62
 
        wt.commit('f', rev_id='rev2')
63
 
        wt.commit('f', rev_id='rev3')
64
 
 
65
 
        br = self.get_branch()
66
 
        br.fetch(wt.branch)
67
 
        self.applyDeprecated(zero_ninetyone,
68
 
            br.append_revision, "rev1")
69
 
        self.assertEquals(br.revision_history(), ["rev1",])
70
 
 
71
 
        # can append more than one revision
72
 
        self.applyDeprecated(zero_ninetyone,
73
 
            br.append_revision, "rev2", "rev3")
74
 
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
75
 
 
76
 
        # reserved ids are reserved
77
 
        self.assertRaises(errors.ReservedId,
78
 
            self.applyDeprecated, zero_ninetyone,
79
 
                br.append_revision, 'current:')
80
 
 
81
57
    def test_create_tree_with_merge(self):
82
58
        tree = self.create_tree_with_merge()
83
59
        ancestry_graph = tree.branch.repository.get_revision_graph('rev-3')