[rfc] cherrypicking merge (revision range)

[Martin Pool]

On 20 Nov 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:
> Alexander Belchenko wrote:
> > Recently I do much cherrypicking and actually revision range looks not
> > so good.
> > 
> > If I need changes from revision 10, I need 'bzr merge -r9..10'
> > Not so good if you need to repeat it tn times. I remember there was
> > plans about '-c N' flag that could be equivalent to -r N-1..N.
> > 
> > But things really ugly when I need cherrypick 9-11, then 12-15, then
> > 16-18. Each time I need to calculate in my mind N-1. (If you ask me why
> > I need cherrypick sequent ranges: because in each range revisions
> > together represent logical union of changes).
> > 
> > Why 'merge -rN-1..M' and not 'merge -rN..M'?
> > 
> > This revisions range is similar to diff command, but merge is very
> > different command, is not?
> > 
> > (I understand that we can't change this for merge because of backward
> > compatibility.)

Well, I think we could add -c, and extend it so that -c M..N is
equivalent to -r M-1..N.  In other words, it brings in the changes
within that range.

I agree with John that diff with a -r argument should preview what merge
with the same argument will do.

-- 
Martin