← 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: Canonical.com Patch Queue Manager
  • Date: 2006-09-23 06:50:13 UTC
  • mfrom: (2027.4.6 inventory-takes-file-3631)
  • Revision ID: pqm@pqm.ubuntu.com-20060923065013-b8483dd421706cbe
(jam) allow 'bzr inventory filename' (bug #3631)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
316
316
        rev_nos = {'1': 1, '2': 2, '3': 3}
317
317
        return mainline_revs, rev_nos, wt
318
318
 
319
 
    def pseudo_merge(self, source, target):
320
 
        revision_id = source.last_revision()
321
 
        target.branch.fetch(source.branch, revision_id)
322
 
        target.add_pending_merge(revision_id)
323
 
 
324
319
    def make_tree_with_merges(self):
325
320
        """Create a tree with well-known revision ids and a merge"""
326
321
        mainline_revs, rev_nos, wt = self.make_tree_with_commits()
327
322
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
328
323
        tree2.commit('four-a', rev_id='4a')
329
 
        self.pseudo_merge(tree2, wt)
 
324
        wt.merge_from_branch(tree2.branch)
330
325
        wt.commit('four-b', rev_id='4b')
331
326
        mainline_revs.append('4b')
332
327
        rev_nos['4b'] = 4
340
335
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
341
336
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
342
337
        tree3.commit('commit three a', rev_id='3a')
343
 
        self.pseudo_merge(tree3, tree2)
 
338
        tree2.merge_from_branch(tree3.branch)
344
339
        tree2.commit('commit three b', rev_id='3b')
345
 
        self.pseudo_merge(tree2, wt)
 
340
        wt.merge_from_branch(tree2.branch)
346
341
        wt.commit('commit three c', rev_id='3c')
347
342
        tree2.commit('four-a', rev_id='4a')
348
 
        self.pseudo_merge(tree2, wt)
 
343
        wt.merge_from_branch(tree2.branch)
349
344
        wt.commit('four-b', rev_id='4b')
350
345
        mainline_revs = [None, '1', '2', '3c', '4b']
351
346
        rev_nos = {'1': 1, '2': 2, '3c': 3, '4b': 4}