← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
390
390
        self.assertLength(18, self.hpss_calls)
391
391
        remote = Branch.open('stacked')
392
392
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
393
 
    
394
 
    def test_pull_cross_format_warning(self):
395
 
        """You get a warning for probably slow cross-format pulls.
396
 
        """
397
393
 
398
 
        from_tree = self.make_branch_and_tree('from', format='2a')
399
 
        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')
400
 
        from_tree.commit(message='first commit')
401
 
        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])
402
 
        self.assertContainsRe(err,
403
 
            "(?m)Fetching between repositories with different formats.*")