← Back to branch summary

~ubuntu-branches/ubuntu/karmic/bzr/karmic-proposed

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree_4.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2008-08-25 19:06:49 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20080825190649-pq87jonr4uvs7s0y
Tags: 1.6-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree_4.py
115
115
        rev2 = subtree2.commit('commit in subdir2')
116
116
 
117
117
        subtree.flush()
118
 
        subtree.merge_from_branch(subtree2.branch)
119
 
        rev3 = subtree.commit('merge from subdir2')
 
118
        subtree3 = subtree.bzrdir.sprout('subdir3').open_workingtree()
 
119
        rev3 = subtree3.commit('merge from subdir2')
120
120
 
121
121
        repo = tree.branch.repository
122
 
        repo.fetch(subtree.branch.repository, rev3)
 
122
        repo.fetch(subtree.branch.repository, rev1)
 
123
        repo.fetch(subtree2.branch.repository, rev2)
 
124
        repo.fetch(subtree3.branch.repository, rev3)
123
125
        # will also pull the others...
124
126
 
125
127
        # create repository based revision trees
126
 
        rev1_revtree = subtree.branch.repository.revision_tree(rev1)
127
 
        rev2_revtree = subtree2.branch.repository.revision_tree(rev2)
128
 
        rev3_revtree = subtree.branch.repository.revision_tree(rev3)
 
128
        rev1_revtree = repo.revision_tree(rev1)
 
129
        rev2_revtree = repo.revision_tree(rev2)
 
130
        rev3_revtree = repo.revision_tree(rev3)
129
131
        # tree doesn't contain a text merge yet but we'll just
130
132
        # set the parents as if a merge had taken place. 
131
133
        # this should cause the tree data to be folded into the