/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/branch_implementations/test_branch.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/branch_implementations/test_branch.py
233
233
    def test_record_initial_ghost(self):
234
234
        """Branches should support having ghosts."""
235
235
        wt = self.make_branch_and_tree('.')
236
 
        wt.add_pending_merge('non:existent@rev--ision--0--2')
 
236
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
 
237
            allow_leftmost_as_ghost=True)
237
238
        rev_id = wt.commit('commit against a ghost first parent.')
238
239
        rev = wt.branch.repository.get_revision(rev_id)
239
240
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
243
244
    def test_record_two_ghosts(self):
244
245
        """Recording with all ghosts works."""
245
246
        wt = self.make_branch_and_tree('.')
246
 
        wt.add_pending_merge('foo@azkhazan-123123-abcabc')
247
 
        wt.add_pending_merge('wibble@fofof--20050401--1928390812')
 
247
        wt.set_parent_ids([
 
248
                'foo@azkhazan-123123-abcabc',
 
249
                'wibble@fofof--20050401--1928390812',
 
250
            ],
 
251
            allow_leftmost_as_ghost=True)
248
252
        rev_id = wt.commit("commit from ghost base with one merge")
249
253
        # the revision should have been committed with two parents
250
254
        rev = wt.branch.repository.get_revision(rev_id)