help merge should explain the difference between a normal merge and a cherrypick

[Matt Giuca]

The help page on "merge" currently says that if the base revision is not in the current branch, it will create a "cherrypick", and doesn't explain it. I think the fact that the semantics of the merge result is so different deserves a bit more explanation. I have summarised the section in the Bazaar User's Guide under "Pseudo merging" which explains cherrypicking, and added it to the help text for "merge":

I added the following text:

"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."

The change is available in lp:~mgiuca/bzr/merge-cherrypick-help.

[Martin Pool (mbp)]

Thanks for contributing. When you're ready, please propose your
branch be merged into trunk.

Martin

[Matt Giuca (mgiuca)]

Done. Sorry, I wasn't sure if I should file a bug or a merge request. For such a minor change, is a bug necessary, or should I just make a branch and merge request?

[Martin Pool (mbp)]

Just a spontaneous mp is fine, unless

- you identify the problem separately from fixing it
- you want a discussion at the level of agreeing on the problem, not the code
- you expect it to be really long-running work and want it to show up
on your assigned bugs

None of those seem to be the case here.

Martin