← 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

  • Committer: Robert Collins
  • Date: 2006-09-04 08:00:00 UTC
  • mto: (1981.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1982.
  • Revision ID: robertc@robertcollins.net-20060904080000-1152da5eed765694
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
132
132
        tree2.commit('unchanged', rev_id='b3')
133
133
        tree2.commit('unchanged', rev_id='b4')
134
134
 
135
 
        self.merge(tree2.branch, wt)
 
135
        wt.merge_from_branch(tree2.branch)
136
136
        wt.commit('merge b4', rev_id='a3')
137
137
 
138
138
        self.assertEqual(['a3'], wt.get_parent_ids())
162
162
 
163
163
        tree2.commit('unchanged', rev_id='b3')
164
164
 
165
 
        self.merge(tree2.branch, wt)
 
165
        wt.merge_from_branch(tree2.branch)
166
166
        wt.commit('merge b3', rev_id='a3')
167
167
 
168
168
        tree2.commit('unchanged', rev_id='b4')
169
169
 
170
 
        self.merge(tree2.branch, wt)
 
170
        wt.merge_from_branch(tree2.branch)
171
171
        wt.commit('merge b4', rev_id='a4')
172
172
 
173
173
        self.assertEqual(['a4'], wt.get_parent_ids())
210
210
        tree2.commit('unchanged', rev_id='b3')
211
211
        tree3.commit('unchanged', rev_id='c3')
212
212
        
213
 
        self.merge(tree2.branch, wt)
214
 
        self.merge(tree3.branch, wt)
 
213
        wt.merge_from_branch(tree2.branch)
 
214
        wt.merge_from_branch(tree3.branch)
215
215
        wt.commit('merge b3, c3', rev_id='a3')
216
216
 
217
217
        tree2.commit('unchanged', rev_id='b4')
218
218
        tree3.commit('unchanged', rev_id='c4')
219
219
 
220
 
        self.merge(tree3.branch, wt)
221
 
        self.merge(tree2.branch, wt)
 
220
        wt.merge_from_branch(tree3.branch)
 
221
        wt.merge_from_branch(tree2.branch)
222
222
        wt.commit('merge b4, c4', rev_id='a4')
223
223
 
224
224
        self.assertEqual(['a4'], wt.get_parent_ids())