← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

[merge] much integrated work from robert and john

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_commit_merge.py
52
52
                          commit,
53
53
                          by, 'no changes yet', rev_id='y@u-0-2',
54
54
                          allow_pointless=False)
55
 
        by.add_pending_merge('x@u-0-1')
 
55
        by.working_tree().add_pending_merge('x@u-0-1')
56
56
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
57
57
 
58
58
        self.assertEquals(by.revno(), 2)
80
80
        # we haven't merged the texts, but let's fake it
81
81
        shutil.copyfile('x/ecks', 'y/ecks')
82
82
        by.add(['ecks'], ['ecks-id'])
83
 
        by.add_pending_merge('x@u-0-1')
 
83
        by.working_tree().add_pending_merge('x@u-0-1')
84
84
 
85
85
        # partial commit of merges is currently not allowed, because
86
86
        # it would give different merge graphs for each file which