← 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: 2007-12-15 04:44:54 UTC
  • mto: This revision was merged to the branch mainline in revision 3132.
  • Revision ID: aaron.bentley@utoronto.ca-20071215044454-43118sh0ptmkfojx
Add warning when merge directives cause cherrypicks

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