[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: feature freeze decision needed + bzr cherrypick?
From: |
Fabian Ezequiel Gallina |
Subject: |
Re: feature freeze decision needed + bzr cherrypick? |
Date: |
Sat, 29 Dec 2012 10:34:52 -0300 |
2012/12/29 Eli Zaretskii <address@hidden>:
>> Date: Sat, 29 Dec 2012 15:23:07 +0200
>> From: Eli Zaretskii <address@hidden>
>> Cc: address@hidden
>>
>> > Date: Sat, 29 Dec 2012 10:16:04 -0300
>> > From: Fabian Ezequiel Gallina <address@hidden>
>> >
>> > Is there anything similar to git's cherrypick?
>>
>> Yes. Something like this:
>>
>> cd emacs-24
>> bzr merge -r 111365..111367 ../trunk
>> bzr ci -m "Backported revisions 111366 and 111367 from trunk."
>
> Btw, bzr doesn't track cherrypicks, so the "Backported" part of the
> commit message is important, as it is used by admin/bzrmerge.el to
> exclude such revisions when the branch is merged onto the trunk.
That's good, thanks for the tip.
Regards,
Fabián