← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_get_parent_ids.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/workingtree_implementations/test_get_parent_ids.py
30
30
        t2 = t.bzrdir.sprout('t2').open_workingtree()
31
31
        rev2_id = t2.commit('foo', allow_pointless=True)
32
32
        self.assertEqual([rev2_id], t2.get_parent_ids())
33
 
        self.merge(t2.branch, t)
 
33
        t.merge_from_branch(t2.branch)
34
34
        self.assertEqual([rev1_id, rev2_id], t.get_parent_ids())
35
35
 
36
36
    def test_pending_merges(self):