When is merge -r cherry-picking?

Eli Zaretskii eliz at gnu.org
Thu Nov 11 21:00:35 GMT 2010


> Date: Thu, 11 Nov 2010 14:56:56 -0500
> From: Aaron Bentley <aaron at aaronbentley.com>
> 
> >   When merging a branch, by default the tip will be merged. To pick a
> >   different revision, pass -–revision. If you specify two values, the
> >   first will be used as BASE and the second one as OTHER. Merging
> >   individual revisions, or a subset of available revisions, like this is
> >   commonly referred to as “cherrypicking”.
> > 
> > which seems to imply that whenever --revision is used the merge
> > becomes cherrypicking.
> 
> I think "like this" is meant to refer to "If you specify two values".

Thanks.  May I suggest to tell that explicitly in the docs?




More information about the bazaar mailing list