/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/merge.py

Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
181
181
        ancestry = self.this_branch.repository.get_ancestry(self.this_basis)
182
182
        if self.other_rev_id in ancestry:
183
183
            return
184
 
        self.this_tree.add_pending_merge(self.other_rev_id)
 
184
        self.this_tree.add_parent_tree((self.other_rev_id, self.other_tree))
185
185
 
186
186
    def set_other(self, other_revision):
187
187
        other_branch, self.other_tree = _get_tree(other_revision,