Rev 5882: (mbp) merge help: disclaimer about untracked cherry picks (bug 783992) (Matt in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5882 [merge]
revision-id: pqm at pqm.ubuntu.com-20110517215549-utp7a0cko8vc0bb8
parent: pqm at pqm.ubuntu.com-20110517182229-74afrc912mdd96l1
parent: matt.giuca at gmail.com-20110517130656-ojk5ywoe5fzqiktk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-05-17 21:55:49 +0000
message:
  (mbp) merge help: disclaimer about untracked cherry picks (bug 783992) (Matt
   Giuca)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2011-05-17 01:55:21 +0000
+++ b/bzrlib/builtins.py	2011-05-17 13:06:56 +0000
@@ -3846,7 +3846,9 @@
     through OTHER, excluding BASE but including OTHER, will be merged.  If this
     causes some revisions to be skipped, i.e. if the destination branch does
     not already contain revision BASE, such a merge is commonly referred to as
-    a "cherrypick".
+    a "cherrypick". Unlike a normal merge, Bazaar does not currently track
+    cherrypicks. The changes look like a normal commit, and the history of the
+    changes from the other branch is not stored in the commit.
 
     Revision numbers are always relative to the source branch.