/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
47
47
                          wty.commit,
48
48
                          'no changes yet', rev_id='y@u-0-2',
49
49
                          allow_pointless=False)
50
 
        wty.add_pending_merge('x@u-0-1')
 
50
        self.merge(bx, wty)
51
51
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
52
52
 
53
53
        self.assertEquals(by.revno(), 2)
72
72
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
73
73
        wty.commit('commit two', rev_id='y@u-0-1', allow_pointless=True)
74
74
 
75
 
        by.fetch(bx)
76
 
        # we haven't merged the texts, but let's fake it
77
 
        shutil.copyfile('x/ecks', 'y/ecks')
78
 
        wty.add(['ecks'], ['ecks-id'])
79
 
        wty.add_pending_merge('x@u-0-1')
 
75
        self.merge(bx, wty)
80
76
 
81
77
        # partial commit of merges is currently not allowed, because
82
78
        # it would give different merge graphs for each file which