← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.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_commit.py
436
436
        # do a merge into the bound branch from other, and then change the
437
437
        # content file locally to force a new revision (rather than using the
438
438
        # revision from other). This forces extra processing in commit.
439
 
        self.merge(other_tree.branch, bound_tree)
 
439
        bound_tree.merge_from_branch(other_tree.branch)
440
440
        self.build_tree_contents([('bound/content_file', 'change in bound\n')])
441
441
 
442
442
        # before #34959 was fixed, this failed with 'revision not present in
490
490
            other_tree.commit('modify all sample files and dirs.')
491
491
        finally:
492
492
            other_tree.unlock()
493
 
        self.merge(other_tree.branch, this_tree)
 
493
        this_tree.merge_from_branch(other_tree.branch)
494
494
        reporter = CapturingReporter()
495
495
        this_tree.commit('do the commit', reporter=reporter)
496
496
        self.assertEqual([