← 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 from jam-integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
17
17
import os
18
18
import sys
19
19
 
 
20
from bzrlib.branch import Branch
 
21
from bzrlib.builtins import merge
20
22
import bzrlib.errors
 
23
from bzrlib.fetch import greedy_fetch
21
24
from bzrlib.tests.test_revision import make_branches
22
 
from bzrlib.trace import mutter
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.fetch import greedy_fetch
25
 
from bzrlib.merge import merge
26
 
 
27
25
from bzrlib.tests import TestCaseInTempDir
28
26
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
 
27
from bzrlib.trace import mutter
29
28
 
30
29
 
31
30
def has_revision(branch, revision_id):