/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/blackbox/test_merge.py

  • Committer: Aaron Bentley
  • Date: 2006-05-12 20:52:25 UTC
  • mto: (1185.82.108 w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: abentley@panoramicfeedback.com-20060512205225-82ea9c76d3d6b135
Start getting changeset merging under test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
167
167
        # re-open tree as external runbzr modified it
168
168
        tree_b = branch_b.bzrdir.open_workingtree()
169
169
        tree_b.commit('merge branch_c')
 
170
 
 
171
    def test_merge_changeset(self):
 
172
        # Changesets actually represent a revision plus its ancestors, so
 
173
        # they can be merged.
 
174
        tree_a = self.make_branch_and_tree('branch_a')
 
175
        f = file('branch_a/a', 'wb')
 
176
        f.write('hello')
 
177
        f.close()
 
178
        tree_a.add('a')
 
179
        # f.close()
 
180
        tree_a.commit('message')
 
181
 
 
182
        tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
 
183
        f = file('branch_b/a', 'wb')
 
184
        f.write('goodbye')
 
185
        f.close()
 
186
        tree_b.commit('message')
 
187
        os.chdir('branch_b')
 
188
        file('cset', 'wb').write(self.runbzr('changeset ../branch_a')[0])