← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

[merge] much integrated work from robert and john

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
63
63
    revisions_2 = br2.revision_history()
64
64
    
65
65
    fetch(from_branch=br2, to_branch=br1)
66
 
    br1.add_pending_merge(revisions_2[4])
 
66
    br1.working_tree().add_pending_merge(revisions_2[4])
67
67
    self.assertEquals(revisions_2[4], 'b@u-0-4')
68
68
    commit(br1, "Commit six", rev_id="a@u-0-3")
69
69
    commit(br1, "Commit seven", rev_id="a@u-0-4")
70
70
    commit(br2, "Commit eight", rev_id="b@u-0-5")
71
71
    
72
72
    fetch(from_branch=br2, to_branch=br1)
73
 
    br1.add_pending_merge(br2.revision_history()[5])
 
73
    br1.working_tree().add_pending_merge(br2.revision_history()[5])
74
74
    commit(br1, "Commit nine", rev_id="a@u-0-5")
75
75
    # DO NOT FETCH HERE - we WANT a GHOST.
76
76
    #fetch(from_branch=br1, to_branch=br2)
77
 
    br2.add_pending_merge(br1.revision_history()[4])
 
77
    br2.working_tree().add_pending_merge(br1.revision_history()[4])
78
78
    commit(br2, "Commit ten - ghost merge", rev_id="b@u-0-6")
79
79
    
80
80
    return br1, br2
144
144
        TestCaseInTempDir.setUp(self)
145
145
        self.br1, self.br2 = make_branches(self)
146
146
 
147
 
        self.br2.commit("Commit eleven", rev_id="b@u-0-7")
148
 
        self.br2.commit("Commit twelve", rev_id="b@u-0-8")
149
 
        self.br2.commit("Commit thirtteen", rev_id="b@u-0-9")
 
147
        self.br2.working_tree().commit("Commit eleven", rev_id="b@u-0-7")
 
148
        self.br2.working_tree().commit("Commit twelve", rev_id="b@u-0-8")
 
149
        self.br2.working_tree().commit("Commit thirtteen", rev_id="b@u-0-9")
150
150
 
151
151
        fetch(from_branch=self.br2, to_branch=self.br1)
152
 
        self.br1.add_pending_merge(self.br2.revision_history()[6])
153
 
        self.br1.commit("Commit fourtten", rev_id="a@u-0-6")
 
152
        self.br1.working_tree().add_pending_merge(self.br2.revision_history()[6])
 
153
        self.br1.working_tree().commit("Commit fourtten", rev_id="a@u-0-6")
154
154
 
155
155
        fetch(from_branch=self.br1, to_branch=self.br2)
156
 
        self.br2.add_pending_merge(self.br1.revision_history()[6])
157
 
        self.br2.commit("Commit fifteen", rev_id="b@u-0-10")
 
156
        self.br2.working_tree().add_pending_merge(self.br1.revision_history()[6])
 
157
        self.br2.working_tree().commit("Commit fifteen", rev_id="b@u-0-10")
158
158
 
159
159
        from bzrlib.revision import MultipleRevisionSources
160
160
        self.sources = MultipleRevisionSources(self.br1, self.br2)