← 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

merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
29
29
from bzrlib.branch import Branch
30
30
from bzrlib.directory_service import directories
31
31
from bzrlib.osutils import pathjoin
32
 
from bzrlib.tests import TestCaseWithTransport
 
32
from bzrlib.tests import (
 
33
    fixtures,
 
34
    TestCaseWithTransport,
 
35
    )
33
36
from bzrlib.uncommit import uncommit
34
37
from bzrlib.workingtree import WorkingTree
35
38
 
148
151
        """
149
152
        # Make a source, sprout a target off it
150
153
        builder = self.make_branch_builder('source')
151
 
        builder.build_commit(message="Rev 1", rev_id='rev-1')
152
 
        source = builder.get_branch()
 
154
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
153
155
        target_bzrdir = source.bzrdir.sprout('target')
154
 
        # Add a non-ancestry tag to source
155
 
        builder.build_commit(message="Rev 2", rev_id='rev-2')
156
156
        source.tags.set_tag('tag-a', 'rev-2')
157
 
        source.set_last_revision_info(1, 'rev-1')
158
157
        # Pull from source
159
158
        self.run_bzr('pull -d target source')
160
159
        target = target_bzrdir.open_branch()