Bzr and cherrypicking (was Re: revert/shelf/undo/redo)

[Matthieu Moy]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> On the other hand, bzr's support for merging with cherrypicks is
> quite weak at the moment,

What the status for bzr and cherrypicking currently ?

>From the doc, bzr can do

  bzr merge -r 81..82 ../bzr.dev

which seems to correspond roughly to "baz replay a/c--b--v--82" except
it's a 3-way merge.

I suppose the merge itself is easy, but how is the merge history
recorded then? What happens if I do a "normal" merge afterwards? (will
rev 82 be considered as the common ancestor?)

AAUI, weaves will also allow better merging capabilities when
cherrypick and full merges are mixed. Is it true?

(I'm curious today ;-) ).

Thanks,

-- 
Matthieu