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

[Jan Hudec]

On Wed, Oct 19, 2005 at 20:57:13 +0200, Matthieu Moy wrote:
> 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.

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.

--
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051020/9192ae22/attachment.pgp