"bzr merge" and "bzr log -n0"

[Nils Ackermann]

Eli Zaretskii <eliz at gnu.org> writes:

If you change the following line 

>   bzr merge -r2..4 ../foo; bzr commit -m merge

to

    bzr merge -r4 ../foo; bzr commit -m merge

then you'll see the individual commits from foo.  The contents merged in
are the same.  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.

Cheers,
Nils