← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_uncommit.py

Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
131
131
        tree2.commit('unchanged', rev_id='b3')
132
132
        tree2.commit('unchanged', rev_id='b4')
133
133
 
134
 
        wt.branch.fetch(tree2.branch)
135
 
        wt.set_pending_merges(['b4'])
 
134
        self.merge(tree2.branch, wt)
136
135
        wt.commit('merge b4', rev_id='a3')
137
136
 
138
137
        self.assertEqual('a3', wt.last_revision())
150
149
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
151
150
 
152
151
        tree2.commit('unchanged', rev_id='b3')
153
 
        wt.branch.fetch(tree2.branch)
154
 
        wt.set_pending_merges(['b3'])
 
152
 
 
153
        self.merge(tree2.branch, wt)
155
154
        wt.commit('merge b3', rev_id='a3')
156
155
 
157
156
        tree2.commit('unchanged', rev_id='b4')
158
 
        wt.branch.fetch(tree2.branch)
159
 
        wt.set_pending_merges(['b4'])
 
157
 
 
158
        self.merge(tree2.branch, wt)
160
159
        wt.commit('merge b4', rev_id='a4')
161
160
 
162
161
        self.assertEqual('a4', wt.last_revision())
177
176
 
178
177
        tree2.commit('unchanged', rev_id='b3')
179
178
        tree3.commit('unchanged', rev_id='c3')
180
 
        wt.branch.fetch(tree2.branch)
181
 
        wt.branch.fetch(tree3.branch)
182
 
        wt.set_pending_merges(['b3', 'c3'])
 
179
        
 
180
        self.merge(tree2.branch, wt)
 
181
        self.merge(tree3.branch, wt)
183
182
        wt.commit('merge b3, c3', rev_id='a3')
184
183
 
185
184
        tree2.commit('unchanged', rev_id='b4')
186
185
        tree3.commit('unchanged', rev_id='c4')
187
 
        wt.branch.fetch(tree2.branch)
188
 
        wt.branch.fetch(tree3.branch)
189
 
        wt.set_pending_merges(['c4', 'b4'])
 
186
 
 
187
        self.merge(tree3.branch, wt)
 
188
        self.merge(tree2.branch, wt)
190
189
        wt.commit('merge b4, c4', rev_id='a4')
191
190
 
192
191
        self.assertEqual('a4', wt.last_revision())