← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/benchmarks/tree_creator/heavily_merged.py

  • Committer: Carl Friedrich Bolz
  • Date: 2006-09-06 21:17:22 UTC
  • mfrom: (1977 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2026.
  • Revision ID: cfbolz@gmx.de-20060906211722-b04f9c3ad1f53ef1
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/tree_creator/heavily_merged.py
59
59
                for i in xrange(250):
60
60
                    revision_id = tree.commit('no-changes commit %d-a' % i)
61
61
                    tree2.branch.fetch(tree.branch, revision_id)
62
 
                    tree2.set_pending_merges([revision_id])
 
62
                    tree2.add_parent_tree_id(revision_id)
63
63
                    revision_id = tree2.commit('no-changes commit %d-b' % i)
64
64
                    tree.branch.fetch(tree2.branch, revision_id)
65
 
                    tree.set_pending_merges([revision_id])
66
 
                tree.set_pending_merges([])
 
65
                    tree.add_parent_tree_id(revision_id)
 
66
                tree.set_parent_ids(tree.get_parent_ids()[:1])
67
67
            finally:
68
68
                tree2.unlock()
69
69
        finally: