← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-20 03:27:35 UTC
  • mfrom: (1551.19.23 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20071220032735-fldmkfcg632g4uez
Warn when merge directives cause cherrypicks (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
119
119
            tree.branch.repository.get_graph().is_ancestor(
120
120
            base_revision_id, tree.branch.last_revision())):
121
121
            base_revision_id = None
 
122
        else:
 
123
            warning('Performing cherrypick')
122
124
        merger = klass.from_revision_ids(pb, tree, other_revision_id,
123
125
                                         base_revision_id)
124
126
        return merger, verified