bzr help cherrypick would be useful

[Ian Clatworthy]

As bzr merge occasionally reports 'Performing cherrypick', it would be good to have 'bzr help cherrypick' provide some more information about exactly what a cherrypick is.

We could add a normal help topic for this. Alternatively, perhaps we ought to have a glossary topic, and for help to implicitly search it if a matching topic isn't found.

[John C Barstow (jbowtie)]

So a cherrypick as I understand it is merging in a specific revision (or set of revisions). Do we need any more documentation than this? Any caveats or issues that should be taken into consideration when writing this documentation up?

I see looking at the code that the weave algorithm doesn't handle cherrypicks, but merge3 does - however the practical implications are lost on me.

Feel free to point me at a bunch of links, I can work something out from there.

[Martin Pool (mbp)]

I'm not sure this belongs in the online help, but perhaps we could
discuss it in the user guide and glossary.