How to reject revisions, i.e. make them disappear from the missing list
Robert Collins
robertc at robertcollins.net
Sun Oct 23 07:32:22 BST 2005
On Sat, 2005-10-22 at 01:02 +0200, 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?
Right now you can merge just the patch log, though there is no ui for
it.
bzr merge $otherbranch
cp .bzr/pending-merges{,.temp}
bzr revert
cp .bzr/pending-merges{.temp,}
bzr commit -m 'pretend to merge $otherbranch'
-Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051023/dc8298cb/attachment.pgp
More information about the bazaar
mailing list