"bzr merge" and "bzr log -n0"

[Matthew D. Fuller]

On Sat, Aug 28, 2010 at 04:42:21PM -0500 I heard the voice of
Nils Ackermann, and lo! it spake thus:
> Eli Zaretskii <eliz at gnu.org> writes:
> 
> >   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.


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.