← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_pull.py

  • Committer: Robey Pointer
  • Date: 2006-09-08 18:52:17 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060908185217-6a4406e1d41753f5
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_pull.py
32
32
        parent.commit('1st post', rev_id='P1', allow_pointless=True)
33
33
        mine = parent.bzrdir.sprout('mine').open_workingtree()
34
34
        mine.commit('my change', rev_id='M1', allow_pointless=True)
35
 
        self.merge(mine.branch, parent)
 
35
        parent.merge_from_branch(mine.branch)
36
36
        parent.commit('merge my change', rev_id='P2')
37
37
        mine.pull(parent.branch)
38
38
        self.assertEqual(['P1', 'P2'], mine.branch.revision_history())
47
47
        mine = parent.bzrdir.sprout('mine').open_workingtree()
48
48
        mine.commit('my change', rev_id='M1', allow_pointless=True)
49
49
        other = parent.bzrdir.sprout('other').open_workingtree()
50
 
        self.merge(mine.branch, other)
 
50
        other.merge_from_branch(mine.branch)
51
51
        other.commit('merge my change', rev_id='O2')
52
 
        self.merge(other.branch, parent)
 
52
        parent.merge_from_branch(other.branch)
53
53
        parent.commit('merge other', rev_id='P2')
54
54
        mine.pull(parent.branch)
55
55
        self.assertEqual(['P1', 'P2'], mine.branch.revision_history())