← 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

  • Committer: Vincent Ladeuil
  • Date: 2011-02-10 12:37:27 UTC
  • mto: This revision was merged to the branch mainline in revision 5661.
  • Revision ID: v.ladeuil+lp@free.fr-20110210123727-8e0pu4wtlt6fj7nf
thread is already a python module, avoid confusion and use cethread instead.

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 (
33
 
    fixtures,
34
 
    TestCaseWithTransport,
35
 
    )
 
32
from bzrlib.tests import TestCaseWithTransport
36
33
from bzrlib.uncommit import uncommit
37
34
from bzrlib.workingtree import WorkingTree
38
35
 
151
148
        """
152
149
        # Make a source, sprout a target off it
153
150
        builder = self.make_branch_builder('source')
154
 
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
 
151
        builder.build_commit(message="Rev 1", rev_id='rev-1')
 
152
        source = builder.get_branch()
155
153
        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')
157
158
        # Pull from source
158
159
        self.run_bzr('pull -d target source')
159
160
        target = target_bzrdir.open_branch()