/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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
114
114
        mergeable.install_revisions(tree.branch.repository)
115
115
        base_revision_id, other_revision_id, verified =\
116
116
            mergeable.get_merge_request(tree.branch.repository)
117
 
        if base_revision_id in tree.branch.repository.get_ancestry(
118
 
            tree.branch.last_revision(), topo_sorted=False):
 
117
        if (base_revision_id != _mod_revision.NULL_REVISION and
 
118
            tree.branch.repository.get_graph().is_ancestor(
 
119
            base_revision_id, tree.branch.last_revision())):
119
120
            base_revision_id = None
120
121
        merger = klass.from_revision_ids(pb, tree, other_revision_id,
121
122
                                         base_revision_id)