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

[Martin Pool]

On 21/10/05, Jan Hudec <bulb at ucw.cz> wrote:

> Except it can't be a 3-way merge, because there is no common base for the
> 3-way merge. 3-way merge and cherrypicks don't play well together and can't
> be forced to do it.

You can abuse 3-way merge to do it by setting the base to revision 81.
 This will treat only changes from 81 to 82 as new in OTHER.

--
Martin