~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_update_revisions.py

  • Committer: Johan Walles
  • Date: 2009-05-06 05:36:28 UTC
  • mfrom: (4332 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090506053628-tbf1wz4a0m9t684g
MergeĀ fromĀ upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
        super(TestUpdateRevisions, self).setUp()
29
29
        self.tree1 = self.make_branch_and_tree('tree1')
30
30
        rev1 = self.tree1.commit('one')
31
 
        dir2 = self.make_to_bzrdir('tree2')
32
 
        dir2.create_repository().fetch(self.tree1.branch.repository)
33
 
        branch2 = self.tree1.branch.sprout(dir2)
34
 
        self.tree2 = dir2.create_workingtree()
 
31
        branch2 = self.make_to_branch('tree2')
 
32
        branch2.repository.fetch(self.tree1.branch.repository)
 
33
        self.tree1.branch.copy_content_into(branch2)
 
34
        self.tree2 = branch2.bzrdir.create_workingtree()
35
35
 
36
36
    def test_accepts_graph(self):
37
37
        # An implementation may not use it, but it should allow a 'graph' to be