/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: Wouter van Heyst
  • Date: 2006-06-06 12:06:20 UTC
  • mfrom: (1740 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: larstiq@larstiq.dyndns.org-20060606120620-50066b0951e4ef7c
merge bzr.dev 1740

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
170
170
        # re-open tree as external runbzr modified it
171
171
        tree_b = branch_b.bzrdir.open_workingtree()
172
172
        tree_b.commit('merge branch_c')
 
173
 
 
174
    def test_merge_bundle(self):
 
175
        from bzrlib.testament import Testament
 
176
        tree_a = self.make_branch_and_tree('branch_a')
 
177
        f = file('branch_a/a', 'wb')
 
178
        f.write('hello')
 
179
        f.close()
 
180
        tree_a.add('a')
 
181
        tree_a.commit('message')
 
182
 
 
183
        tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
 
184
        f = file('branch_a/a', 'wb')
 
185
        f.write('hey there')
 
186
        f.close()
 
187
        tree_a.commit('message')
 
188
 
 
189
        f = file('branch_b/a', 'wb')
 
190
        f.write('goodbye')
 
191
        f.close()
 
192
        tree_b.commit('message')
 
193
        os.chdir('branch_b')
 
194
        file('../bundle', 'wb').write(self.runbzr('bundle ../branch_a')[0])
 
195
        os.chdir('../branch_a')
 
196
        self.runbzr('merge ../bundle', retcode=1)
 
197
        testament_a = Testament.from_revision(tree_a.branch.repository, 
 
198
                                              tree_b.last_revision())
 
199
        testament_b = Testament.from_revision(tree_b.branch.repository,
 
200
                                              tree_b.last_revision())
 
201
        self.assertEqualDiff(testament_a.as_text(),
 
202
                         testament_b.as_text())