How to reject revisions, i.e. make them disappear from the missing list

[John A Meinel]

Robert Widhopf-Fenk wrote:
> In arch one could "reject" a patch by merging only the patch
> logs (sync tree), thus keeping a record about rejecting the
> patch and make it disappear from the list of missing
> patches.
>
> IMHO this is quite useful when doing cherry picking.
>
> Is there something similar in or planed for bzr?

There is no specific support for cherry picking yet in bzr. But you
could do this:

bzr merge -r 11..10 ../other/tree

or even
bzr merge -r 11..10 .


That should undo the change which was introduced from 10 to 11. And it
should not remove the actual entry in the store, so it would appear that
you still have revision 11 in your ancestry.

This is at the expense that a cherry pick is currently not recorded. So
while:
bzr merge -r 10..11 ../other/tree
Will actually 'cherry pick' that change, it just won't record it.

As the weave changes propagate throughout the rest of the codebase, I
think it will end up that a cherry picked changes will show up per-file,
though not in the actual history of the branch.

John
=:->

>
> Robert.
>
>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051021/026d42a4/attachment.pgp