← 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

  • Committer: Aaron Bentley
  • Date: 2007-07-17 13:27:14 UTC
  • mfrom: (2624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_find_merge_base.py
26
26
        self.run_bzr('init')
27
27
        self.run_bzr('commit -m foo --unchanged')
28
28
        self.run_bzr('branch . ../b')
29
 
        q = self.run_bzr(['find-merge-base', '.', '../b'])[0]
 
29
        q = self.run_bzr('find-merge-base . ../b')[0]
30
30
        self.run_bzr('commit -m bar --unchanged')
31
31
        os.chdir('../b')
32
32
        self.run_bzr('commit -m baz --unchanged')
33
 
        r = self.run_bzr(['find-merge-base', '.', '../a'])[0]
 
33
        r = self.run_bzr('find-merge-base . ../a')[0]
34
34
        self.assertEqual(q, r)
35
35
        
36
36
    def test_find_null_merge_base(self):
37
37
        tree = self.make_branch_and_tree('foo')
38
38
        tree.commit('message')
39
39
        tree2 = self.make_branch_and_tree('bar')
40
 
        r = self.run_bzr('find-merge-base', 'foo', 'bar')[0]
 
40
        r = self.run_bzr('find-merge-base foo bar')[0]
41
41
        self.assertEqual('merge base is revision null:\n', r)