* emacs-24 and trunk
@ 2014-03-20 17:26 Stefan
0 siblings, 0 replies; 3+ messages in thread
From: Stefan @ 2014-03-20 17:26 UTC (permalink / raw)
To: emacs-devel
I have just pushed the current trunk onto the `emacs-24' branch which is
hence now the "tip" of the Emacs-24.4 release branch.
As a result the `trunk' is now re-opened for non-bugfix changes.
As usual, this doesn't mean "anything goes":
- Please focus on fixing bugs.
Check the debbugs database, especially the bugs flagged "important".
- Any bug-fix which applies to 24.4 should go into the `emacs-24' branch
and not into `trunk' (it'll be merged back into trunk via "bzr merge").
- Any change which would make it harder to merge changes from emacs-24
back into trunk should wait.
- Changes which cause trunk to crash are welcome, so as to try and get
more people to use `emacs-24'.
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Emacs-24 and trunk
@ 2014-06-18 17:12 Dmitry Antipov
2014-06-18 17:30 ` Eli Zaretskii
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Antipov @ 2014-06-18 17:12 UTC (permalink / raw)
To: Emacs development discussions; +Cc: Stefan Monnier
Can someone explain how the fixes are propagated between emacs-24 and trunk
branches? I believe that http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17771
is important enough to get it fixed everywhere as soon as possible; should
I fix it in both emacs-24 and trunk, or it will be merged from trunk somehow?
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Emacs-24 and trunk
2014-06-18 17:12 Emacs-24 and trunk Dmitry Antipov
@ 2014-06-18 17:30 ` Eli Zaretskii
0 siblings, 0 replies; 3+ messages in thread
From: Eli Zaretskii @ 2014-06-18 17:30 UTC (permalink / raw)
To: Dmitry Antipov; +Cc: monnier, emacs-devel
> Date: Wed, 18 Jun 2014 21:12:00 +0400
> From: Dmitry Antipov <dmantipov@yandex.ru>
> Cc: Stefan Monnier <monnier@IRO.UMontreal.CA>
>
> Can someone explain how the fixes are propagated between emacs-24 and trunk
> branches?
From time to time, someone merges from emacs-24 onto the trunk using
admin/bzrmerge.el.
> I believe that http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17771
> is important enough to get it fixed everywhere as soon as possible; should
> I fix it in both emacs-24 and trunk, or it will be merged from trunk somehow?
Fix in emacs-24, and it will be merged to trunk soon. Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-18 17:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-18 17:12 Emacs-24 and trunk Dmitry Antipov
2014-06-18 17:30 ` Eli Zaretskii
-- strict thread matches above, loose matches on Subject: below --
2014-03-20 17:26 emacs-24 " Stefan
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).