← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_pull.py
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
from cStringIO import StringIO
19
 
import os
20
 
 
21
 
from bzrlib import errors
22
 
from bzrlib.errors import NotBranchError, NotVersionedError
23
 
from bzrlib.osutils import basename
24
 
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
25
 
from bzrlib.trace import mutter
26
 
 
27
 
 
28
 
class TestPull(TestCaseWithWorkingTree):
 
19
 
 
20
from bzrlib.tests import per_workingtree
 
21
 
 
22
 
 
23
class TestPull(per_workingtree.TestCaseWithWorkingTree):
29
24
 
30
25
    def get_pullable_trees(self):
31
26
        self.build_tree(['from/', 'from/file', 'to/'])