← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-04 08:44:08 UTC
  • mfrom: (1981.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060904084408-ebdbb37a1cdb0c53
(robertc) integrate merge_from_branch patch: 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_merge.py
48
48
                          wty.commit,
49
49
                          'no changes yet', rev_id='y@u-0-2',
50
50
                          allow_pointless=False)
51
 
        self.merge(bx, wty)
 
51
        wty.merge_from_branch(bx)
52
52
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
53
53
 
54
54
        self.assertEquals(by.revno(), 3)
74
74
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
75
75
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
76
76
 
77
 
        self.merge(bx, wty)
 
77
        wty.merge_from_branch(bx)
78
78
 
79
79
        # partial commit of merges is currently not allowed, because
80
80
        # it would give different merge graphs for each file which