← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-17 21:55:49 UTC
  • mfrom: (5877.3.1 merge-cherrypick-help)
  • Revision ID: pqm@pqm.ubuntu.com-20110517215549-utp7a0cko8vc0bb8
(mbp) merge help: disclaimer about untracked cherry picks (bug 783992) (Matt
 Giuca)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3846
3846
    through OTHER, excluding BASE but including OTHER, will be merged.  If this
3847
3847
    causes some revisions to be skipped, i.e. if the destination branch does
3848
3848
    not already contain revision BASE, such a merge is commonly referred to as
3849
 
    a "cherrypick".
 
3849
    a "cherrypick". Unlike a normal merge, Bazaar does not currently track
 
3850
    cherrypicks. The changes look like a normal commit, and the history of the
 
3851
    changes from the other branch is not stored in the commit.
3850
3852
 
3851
3853
    Revision numbers are always relative to the source branch.
3852
3854