"bzr merge" and "bzr log -n0"

[Eli Zaretskii]

> Date: Sat, 28 Aug 2010 20:23:01 -0500
> From: "Matthew D. Fuller" <fullermd at over-yonder.net>
> Cc: bazaar at lists.canonical.com
> 
> > >   bzr merge -r2..4 ../foo; bzr commit -m merge
> >
> > [...]
> >
> > I believe the first form is considered by bzr to be a cherrypick,
> > which isn't tracked and could cause conflicts in future merges from
> > foo.
> 
> It's not because of the form, it's because of what you're asking for.
> 
> -r2..4 means "from state 2 to state 4", which means the changes 2->3
> and 3->4.  Since you're starting at 1, not asking for the change 1->2,
> you're not merging rev 2.  THAT'S why it's a cherrypick.

Thanks, Nils and Matthew.  May I suggest that this fact (that
cherrypicks are not tracked) be mentioned in the documentation of "bzr
merge"?  AFAICS, it is currently only mentioned in a separate section
of the User Guide that introduces cherrypicking.

Also, is there a particular reason why cherrypicks are not tracked, or
was it a more or less arbitrary design decision?