← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2006-05-30 15:18:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: abentley@panoramicfeedback.com-20060530151812-0e3e9b78cc15a804
Rename changesets to revision bundles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
168
168
        tree_b = branch_b.bzrdir.open_workingtree()
169
169
        tree_b.commit('merge branch_c')
170
170
 
171
 
    def test_merge_changeset(self):
172
 
        # Changesets actually represent a revision (plus its ancestors), so
173
 
        # they can be merged.
 
171
    def test_merge_bundle(self):
174
172
        from bzrlib.testament import Testament
175
173
        tree_a = self.make_branch_and_tree('branch_a')
176
174
        f = file('branch_a/a', 'wb')
190
188
        f.close()
191
189
        tree_b.commit('message')
192
190
        os.chdir('branch_b')
193
 
        file('../cset', 'wb').write(self.runbzr('changeset ../branch_a')[0])
 
191
        file('../bundle', 'wb').write(self.runbzr('bundle ../branch_a')[0])
194
192
        os.chdir('../branch_a')
195
 
        self.runbzr('merge ../cset', retcode=1)
 
193
        self.runbzr('merge ../bundle', retcode=1)
196
194
        testament_a = Testament.from_revision(tree_a.branch.repository, 
197
195
                                              tree_b.last_revision())
198
196
        testament_b = Testament.from_revision(tree_b.branch.repository,