← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-15 03:58:20 UTC
  • mfrom: (4963 +trunk)
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: andrew.bennetts@canonical.com-20100115035820-ilb3t36swgzq6v1l
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_merge.py
34
34
        cmd = cmd_merge()
35
35
        # We don't care about the ouput but 'outf' should be defined
36
36
        cmd.outf = StringIOWrapper()
37
 
        cmd.run(self.get_url('branch1'), directory='branch2')
 
37
        cmd.run_direct(self.get_url('branch1'), directory='branch2')
38
38
        self.assertEquals(1, len(self.connections))
39
39