← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_find_merge_base.py
32
32
        r = self.run_bzr('find-merge-base', '.', '../a', backtick=True)
33
33
        self.assertEqual(q, r)
34
34
        
 
35
    def test_find_null_merge_base(self):
 
36
        tree = self.make_branch_and_tree('foo')
 
37
        tree.commit('message')
 
38
        tree2 = self.make_branch_and_tree('bar')
 
39
        r = self.run_bzr('find-merge-base', 'foo', 'bar')[0]
 
40
        self.assertEqual('merge base is revision null:\n', r)