← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
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_branch.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
from bzrlib.builtins import cmd_branch
28
28
 
29
29
    def test_branch_remote_local(self):
30
30
        cmd = cmd_branch()
31
 
        cmd.run(self.get_url('branch'), 'local')
 
31
        cmd.run_direct(self.get_url('branch'), 'local')
32
32
        self.assertEquals(1, len(self.connections))
33
33
 
34
34
    def test_branch_local_remote(self):
35
35
        cmd = cmd_branch()
36
 
        cmd.run('branch', self.get_url('remote'))
 
36
        cmd.run_direct('branch', self.get_url('remote'))
37
37
        self.assertEquals(1, len(self.connections))
38
38
 
39
39
    def test_branch_remote_remote(self):
40
40
        cmd = cmd_branch()
41
 
        cmd.run(self.get_url('branch'), self.get_url('remote'))
 
41
        cmd.run_direct(self.get_url('branch'), self.get_url('remote'))
42
42
        self.assertEquals(2, len(self.connections))
43
43