/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_pull.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
from cStringIO import StringIO
19
19
import os
21
21
from bzrlib import errors
22
22
from bzrlib.errors import NotBranchError, NotVersionedError
23
23
from bzrlib.osutils import basename
24
 
from bzrlib.tests import TestSkipped
25
24
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
26
25
from bzrlib.trace import mutter
27
26
from bzrlib.transport import get_transport
36
35
        tree.commit('foo', rev_id='A')
37
36
        tree_b = self.make_branch_and_tree('to')
38
37
        return tree, tree_b
39
 
 
 
38
 
40
39
    def test_pull(self):
41
40
        tree_a, tree_b = self.get_pullable_trees()
42
41
        tree_b.pull(tree_a.branch)