/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

Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
still a little bit of breakage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
267
267
        self.pullable_branch()
268
268
        os.chdir('a')
269
269
        (out, err) = self.run_bzr('merge', '--pull', '../b')
270
 
        self.assertContainsRe(err, '1 revision\\(s\\) pulled')
 
270
        self.assertContainsRe(err, 'Now on revision 2\\.')
271
271
        tree_a = WorkingTree.open('.')
272
272
        self.assertEqual([self.id2], tree_a.get_parent_ids())
273
273