/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/test_revision.py

  • Committer: Robey Pointer
  • Date: 2006-09-08 18:52:17 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060908185217-6a4406e1d41753f5
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
72
72
    revisions_2 = br2.revision_history()
73
73
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
74
74
    
75
 
    self.merge(br2, tree1)
 
75
    tree1.merge_from_branch(br2)
76
76
    tree1.commit("Commit six", rev_id="a@u-0-3")
77
77
    tree1.commit("Commit seven", rev_id="a@u-0-4")
78
78
    tree2.commit("Commit eight", rev_id="b@u-0-5")
79
79
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
80
80
    
81
 
    self.merge(br2, tree1)
 
81
    tree1.merge_from_branch(br2)
82
82
    tree1.commit("Commit nine", rev_id="a@u-0-5")
83
83
    # DO NOT MERGE HERE - we WANT a GHOST.
84
84
    tree2.add_parent_tree_id(br1.revision_history()[4])
156
156
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
157
157
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
158
158
 
159
 
        self.merge(self.br2, wt1)
 
159
        wt1.merge_from_branch(self.br2)
160
160
        wt1.commit("Commit fourtten", rev_id="a@u-0-6")
161
161
 
162
 
        self.merge(self.br1, wt2)
 
162
        wt2.merge_from_branch(self.br1)
163
163
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
164
164
 
165
165
        from bzrlib.revision import MultipleRevisionSources
234
234
        """
235
235
        br1, br2 = make_branches(self)
236
236
        source = MultipleRevisionSources(br1.repository, br2.repository)
237
 
        combined_1 = combined_graph(br1.last_revision(), 
 
237
        combined_1 = combined_graph(br1.last_revision(),
238
238
                                    br2.last_revision(), source)
239
239
        combined_2 = combined_graph(br2.last_revision(),
240
240
                                    br1.last_revision(), source)