← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 16:25:28 UTC
  • mfrom: (5020.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
        on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_push.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
30
30
        cmd = cmd_push()
31
31
        # We don't care about the ouput but 'outf' should be defined
32
32
        cmd.outf = tests.StringIOWrapper()
33
 
        cmd.run(self.get_url('remote'), directory='branch')
 
33
        cmd.run_direct(self.get_url('remote'), directory='branch')
34
34
        self.assertEquals(1, len(self.connections))
35
35
 
36
36
    def test_push_onto_stacked(self):
41
41
 
42
42
        cmd = cmd_push()
43
43
        cmd.outf = tests.StringIOWrapper()
44
 
        cmd.run(self.get_url('remote'), directory='source',
 
44
        cmd.run_direct(self.get_url('remote'), directory='source',
45
45
                stacked_on=self.get_url('base'))
46
46
        self.assertEqual(1, len(self.connections))