← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2008-05-23 21:45:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3450.
  • Revision ID: aaron@aaronbentley.com-20080523214550-am926ey6mus29bu9
Fix handling of old merge directives with stricter get_parent_map

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
151
151
        base_revision_id, other_revision_id, verified =\
152
152
            mergeable.get_merge_request(tree.branch.repository)
153
153
        revision_graph = tree.branch.repository.get_graph()
154
 
        if (base_revision_id != _mod_revision.NULL_REVISION and
155
 
            revision_graph.is_ancestor(
156
 
            base_revision_id, tree.branch.last_revision())):
157
 
            base_revision_id = None
158
 
        else:
159
 
            warning('Performing cherrypick')
 
154
        if base_revision_id is not None:
 
155
            if (base_revision_id != _mod_revision.NULL_REVISION and
 
156
                revision_graph.is_ancestor(
 
157
                base_revision_id, tree.branch.last_revision())):
 
158
                base_revision_id = None
 
159
            else:
 
160
                warning('Performing cherrypick')
160
161
        merger = klass.from_revision_ids(pb, tree, other_revision_id,
161
162
                                         base_revision_id, revision_graph=
162
163
                                         revision_graph)