* feature freeze decision needed + bzr cherrypick?
@ 2012-12-29 13:16 Fabian Ezequiel Gallina
2012-12-29 13:23 ` Eli Zaretskii
2012-12-30 1:31 ` Glenn Morris
0 siblings, 2 replies; 6+ messages in thread
From: Fabian Ezequiel Gallina @ 2012-12-29 13:16 UTC (permalink / raw)
To: Emacs-Devel devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: feature freeze decision needed + bzr cherrypick?
2012-12-29 13:16 feature freeze decision needed + bzr cherrypick? Fabian Ezequiel Gallina
@ 2012-12-29 13:23 ` Eli Zaretskii
2012-12-29 13:28 ` Eli Zaretskii
2012-12-30 1:31 ` Glenn Morris
1 sibling, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2012-12-29 13:23 UTC (permalink / raw)
To: Fabian Ezequiel Gallina; +Cc: emacs-devel
> 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."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: feature freeze decision needed + bzr cherrypick?
2012-12-29 13:23 ` Eli Zaretskii
@ 2012-12-29 13:28 ` Eli Zaretskii
2012-12-29 13:34 ` Fabian Ezequiel Gallina
0 siblings, 1 reply; 6+ messages in thread
From: Eli Zaretskii @ 2012-12-29 13:28 UTC (permalink / raw)
To: galli.87; +Cc: emacs-devel
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: feature freeze decision needed + bzr cherrypick?
2012-12-29 13:28 ` Eli Zaretskii
@ 2012-12-29 13:34 ` Fabian Ezequiel Gallina
0 siblings, 0 replies; 6+ messages in thread
From: Fabian Ezequiel Gallina @ 2012-12-29 13:34 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: feature freeze decision needed + bzr cherrypick?
2012-12-29 13:16 feature freeze decision needed + bzr cherrypick? Fabian Ezequiel Gallina
2012-12-29 13:23 ` Eli Zaretskii
@ 2012-12-30 1:31 ` Glenn Morris
2012-12-31 19:35 ` Fabian Ezequiel Gallina
1 sibling, 1 reply; 6+ messages in thread
From: Glenn Morris @ 2012-12-30 1:31 UTC (permalink / raw)
To: Fabian Ezequiel Gallina; +Cc: Emacs-Devel devel
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).
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: feature freeze decision needed + bzr cherrypick?
2012-12-30 1:31 ` Glenn Morris
@ 2012-12-31 19:35 ` Fabian Ezequiel Gallina
0 siblings, 0 replies; 6+ messages in thread
From: Fabian Ezequiel Gallina @ 2012-12-31 19:35 UTC (permalink / raw)
To: Glenn Morris; +Cc: Emacs-Devel devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-12-31 19:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-29 13:16 feature freeze decision needed + bzr cherrypick? Fabian Ezequiel Gallina
2012-12-29 13:23 ` Eli Zaretskii
2012-12-29 13:28 ` Eli Zaretskii
2012-12-29 13:34 ` Fabian Ezequiel Gallina
2012-12-30 1:31 ` Glenn Morris
2012-12-31 19:35 ` Fabian Ezequiel Gallina
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.