When is merge -r cherry-picking?
Eli Zaretskii
eliz at gnu.org
Thu Nov 11 18:49:32 GMT 2010
I'm confused about when "bzr merge -r" is cherry-picking and when it
isn't. On the one hand, the docs of merge says:
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. OTOH, it keeps silent about the use-case where
the argument to --revision specifies less than 2 values, and one of
the examples says:
To merge changes up to and including revision 82 from bzr.dev:
bzr merge -r 82 ../bzr.dev
which seems to imply that "bzr merge -r 82" is a real merge, not
cherrypicking.
Can someone please shed some light on this?
TIA
More information about the bazaar
mailing list