← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

Merge fetch-spec-everything-not-in-other.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
1
 
# Copyright (C) 2005, 2007, 2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
import os
18
 
import re
19
 
import sys
20
 
 
21
 
import bzrlib
22
17
from bzrlib import (
23
18
    bzrdir,
24
19
    errors,
25
20
    osutils,
26
 
    merge,
27
 
    repository,
28
21
    versionedfile,
29
22
    )
30
23
from bzrlib.branch import Branch
31
 
from bzrlib.bzrdir import BzrDir
32
24
from bzrlib.repofmt import knitrepo
33
25
from bzrlib.tests import TestCaseWithTransport
34
26
from bzrlib.tests.test_revision import make_branches
35
 
from bzrlib.trace import mutter
36
27
from bzrlib.upgrade import Convert
37
28
from bzrlib.workingtree import WorkingTree
38
29