← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: Robert Collins
  • Date: 2006-09-04 08:00:00 UTC
  • mto: (1981.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1982.
  • Revision ID: robertc@robertcollins.net-20060904080000-1152da5eed765694
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
321
321
        mainline_revs, rev_nos, wt = self.make_tree_with_commits()
322
322
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
323
323
        tree2.commit('four-a', rev_id='4a')
324
 
        self.merge(tree2.branch, wt)
 
324
        wt.merge_from_branch(tree2.branch)
325
325
        wt.commit('four-b', rev_id='4b')
326
326
        mainline_revs.append('4b')
327
327
        rev_nos['4b'] = 4
335
335
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
336
336
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
337
337
        tree3.commit('commit three a', rev_id='3a')
338
 
        self.merge(tree3.branch, tree2)
 
338
        tree2.merge_from_branch(tree3.branch)
339
339
        tree2.commit('commit three b', rev_id='3b')
340
 
        self.merge(tree2.branch, wt)
 
340
        wt.merge_from_branch(tree2.branch)
341
341
        wt.commit('commit three c', rev_id='3c')
342
342
        tree2.commit('four-a', rev_id='4a')
343
 
        self.merge(tree2.branch, wt)
 
343
        wt.merge_from_branch(tree2.branch)
344
344
        wt.commit('four-b', rev_id='4b')
345
345
        mainline_revs = [None, '1', '2', '3c', '4b']
346
346
        rev_nos = {'1': 1, '2': 2, '3c': 3, '4b': 4}