~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2007-06-26 10:12:33 UTC
  • mto: This revision was merged to the branch mainline in revision 2555.
  • Revision ID: mbp@sourcefrog.net-20070626101233-hrmvl09320gt6b8m
Deprecate run_bzr_captured in favour of just  run_bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
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_captured(['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_captured(['find-merge-base', '.', '../a'])[0]
 
33
        r = self.run_bzr(['find-merge-base', '.', '../a'])[0]
34
34
        self.assertEqual(q, r)
35
35