feature freeze decision needed + bzr cherrypick?

feature freeze decision needed + bzr cherrypick?

[Fabian Ezequiel Gallina]

Hi all,


Today I just pushed two commits to the trunk that fix some bugs
reported in the github bugtracker. Although I'm not sure if these
bugs were originally regressions I think they are pretty elegible
to be merged in the emacs 24 branch (especially the traceback
mixup one):

 1) https://github.com/fgallina/python.el/issues/122
 2) https://github.com/fgallina/python.el/issues/123

Now considering these are merged into the trunk, in the case any
of these is accepted to be put into the emacs-24 branch how would
I proceed to do such thing? Is there anything similar to git's
cherrypick?


Thanks in advance,
Fabián

Re: feature freeze decision needed + bzr cherrypick?

[Eli Zaretskii]

> Date: Sat, 29 Dec 2012 10:16:04 -0300
> From: Fabian Ezequiel Gallina <galli.87@gmail.com>
> 
> 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."

Re: feature freeze decision needed + bzr cherrypick?

[Eli Zaretskii]

> Date: Sat, 29 Dec 2012 15:23:07 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
> 
> > Date: Sat, 29 Dec 2012 10:16:04 -0300
> > From: Fabian Ezequiel Gallina <galli.87@gmail.com>
> > 
> > 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.

Re: feature freeze decision needed + bzr cherrypick?

[Fabian Ezequiel Gallina]

2012/12/29 Eli Zaretskii <eliz@gnu.org>:
>> Date: Sat, 29 Dec 2012 15:23:07 +0200
>> From: Eli Zaretskii <eliz@gnu.org>
>> Cc: emacs-devel@gnu.org
>>
>> > Date: Sat, 29 Dec 2012 10:16:04 -0300
>> > From: Fabian Ezequiel Gallina <galli.87@gmail.com>
>> >
>> > 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

Re: feature freeze decision needed + bzr cherrypick?

[Glenn Morris]

Fabian Ezequiel Gallina wrote:

> Today I just pushed two commits to the trunk that fix some bugs
> reported in the github bugtracker. Although I'm not sure if these
> bugs were originally regressions I think they are pretty elegible
> to be merged in the emacs 24 branch (especially the traceback
> mixup one):
>
>  1) https://github.com/fgallina/python.el/issues/122
>  2) https://github.com/fgallina/python.el/issues/123

Fine by me to put these in emacs-24.
Please give the new defcustom a :version "24.3" tag.
(I did wonder if the entire python defgroup should just get such a tag,
since it is essentially a new mode.)

> Now considering these are merged into the trunk, in the case any
> of these is accepted to be put into the emacs-24 branch how would
> I proceed to do such thing? Is there anything similar to git's
> cherrypick?

Eli already answered about "backport" being important. (It's generally
best to put things appropriate for emacs-24 in emacs-24 to start with,
then let them get merged to trunk "automatically".)

> cd emacs-24
> bzr merge -r 111365..111367 ../trunk

Remember to float the ChangeLog entry to the top of the file, with the
appropriate date (bzr's changelog_merge plugin can do the first part).

Re: feature freeze decision needed + bzr cherrypick?

[Fabian Ezequiel Gallina]

2012/12/29 Glenn Morris <rgm@gnu.org>:
> Fabian Ezequiel Gallina wrote:
>
> Eli already answered about "backport" being important. (It's generally
> best to put things appropriate for emacs-24 in emacs-24 to start with,
> then let them get merged to trunk "automatically".)
>
>> cd emacs-24
>> bzr merge -r 111365..111367 ../trunk
>
> Remember to float the ChangeLog entry to the top of the file, with the
> appropriate date (bzr's changelog_merge plugin can do the first part).

I just pushed this in revno 111102 and everything looks fine.

Now for the :version tag I just updated the defgroup's :version to
24.3, so IIUC that should be enough.


Thanks,
Fabián