unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* emacs-25 merge pushed, please confirm
@ 2016-01-12  7:09 John Wiegley
  2016-01-12 11:12 ` Alex Bennée
  2016-01-17 23:04 ` Next release from master Stefan Monnier
  0 siblings, 2 replies; 120+ messages in thread
From: John Wiegley @ 2016-01-12  7:09 UTC (permalink / raw)
  To: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

I just pushed up another emacs-25 -> master merge, this time using gitmerge.
This is just a request to check that everything looks as it should.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 629 bytes --]

^ permalink raw reply	[flat|nested] 120+ messages in thread
* Re: Next release from master
@ 2016-02-11 16:28 Angelo Graziosi
  2016-02-11 17:09 ` John Wiegley
  2016-02-11 19:36 ` Stefan Monnier
  0 siblings, 2 replies; 120+ messages in thread
From: Angelo Graziosi @ 2016-02-11 16:28 UTC (permalink / raw)
  To: Emacs developers

Mark Oteiza wrote:
> I have been watching this thread and I still have the question: what is
> wrong with the status quo?
>
> AIUI, this is:
>
> - 25.1 lives in emacs-25
> - after 25.1 is released, emacs-25 becomes 25.2 and receives bug fixes and
>   non-breaking features, either by merging from master or simply being
>   applied to emacs-25. Bug fixes applied to emacs-25 periodically get
>   merged back into master when appropriate
> - 26.1 is master

the only simple, clear, right, acceptable written in this thread...



^ permalink raw reply	[flat|nested] 120+ messages in thread

end of thread, other threads:[~2016-02-12 12:34 UTC | newest]

Thread overview: 120+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-12  7:09 emacs-25 merge pushed, please confirm John Wiegley
2016-01-12 11:12 ` Alex Bennée
2016-01-12 16:19   ` John Wiegley
2016-01-17 23:04 ` Next release from master Stefan Monnier
2016-01-17 23:10   ` John Wiegley
2016-01-18  9:06     ` Michael Albinus
2016-01-18 15:55       ` Eli Zaretskii
2016-01-18 20:06         ` Michael Albinus
2016-01-18 20:25           ` Eli Zaretskii
2016-01-18 15:55     ` Eli Zaretskii
2016-01-18 21:13       ` John Wiegley
2016-01-18 21:31         ` Daniel Colascione
2016-01-18 21:43           ` John Wiegley
2016-01-18 21:45             ` Daniel Colascione
2016-01-18 21:51               ` John Wiegley
2016-01-18 22:15                 ` Stefan Monnier
2016-01-18 22:18                   ` John Wiegley
2016-01-19  3:36               ` Eli Zaretskii
2016-01-18 15:54   ` Eli Zaretskii
2016-01-21 17:35   ` Glenn Morris
2016-01-21 17:58     ` Eli Zaretskii
2016-02-04 17:39       ` Glenn Morris
2016-02-04 20:31         ` John Wiegley
2016-02-08 13:41           ` Stefan Monnier
2016-02-08 15:54             ` John Wiegley
2016-02-08 16:47               ` Dmitry Gutov
2016-02-09 14:55                 ` John Wiegley
2016-02-09 15:15                   ` Dmitry Gutov
2016-02-09 14:57               ` Stefan Monnier
2016-02-09 22:38                 ` Lars Ingebrigtsen
2016-02-09 23:42                   ` Rasmus
2016-02-10  0:09                     ` Kaushal Modi
2016-02-10  0:38                       ` Óscar Fuentes
2016-02-10  2:04                         ` Lars Ingebrigtsen
2016-02-10  2:42                           ` Óscar Fuentes
2016-02-10  3:00                             ` Lars Ingebrigtsen
2016-02-10  3:43                               ` Óscar Fuentes
2016-02-10  4:01                                 ` Lars Ingebrigtsen
2016-02-10  3:28                             ` Alexis
2016-02-10  3:33                               ` Dmitry Gutov
2016-02-10  4:02                                 ` Óscar Fuentes
2016-02-10  4:13                                   ` Dmitry Gutov
2016-02-10  4:51                                     ` Alexis
2016-02-10  5:28                                       ` Dmitry Gutov
2016-02-10 18:10                                         ` Eli Zaretskii
2016-02-10  4:58                                     ` Óscar Fuentes
2016-02-10  5:07                                       ` Lars Ingebrigtsen
2016-02-10  5:16                                         ` Dmitry Gutov
2016-02-10 18:09                                           ` Eli Zaretskii
2016-02-10 18:09                                         ` Eli Zaretskii
2016-02-10  5:08                                       ` Alexis
2016-02-10  5:10                                       ` Dmitry Gutov
2016-02-10 18:08                                       ` Eli Zaretskii
2016-02-10 18:03                                     ` Eli Zaretskii
2016-02-10  4:04                                 ` Alexis
2016-02-10  4:23                                   ` Dmitry Gutov
2016-02-10 18:07                                     ` Eli Zaretskii
2016-02-10 17:58                                 ` Eli Zaretskii
2016-02-11 17:21                                   ` Paul Eggert
2016-02-11 18:11                                     ` John Wiegley
2016-02-10 17:56                               ` Eli Zaretskii
2016-02-11  3:35                             ` Daniel Colascione
2016-02-11  3:55                               ` Óscar Fuentes
2016-02-11 15:24                                 ` John Wiegley
2016-02-11 16:07                                   ` Mark Oteiza
2016-02-11 16:20                                   ` Óscar Fuentes
2016-02-11 16:59                                   ` Teemu Likonen
2016-02-11 19:33                                   ` Daniel Colascione
2016-02-10  2:34                         ` Kaushal Modi
2016-02-10  3:24                           ` Óscar Fuentes
2016-02-10 21:46                         ` Rasmus
2016-02-10 16:40                   ` John Wiegley
2016-02-10 17:18                     ` Dmitry Gutov
2016-02-10 16:41                 ` John Wiegley
2016-02-10 17:07                   ` Dmitry Gutov
2016-02-10 18:06                   ` Óscar Fuentes
2016-02-11  3:47                     ` Daniel Colascione
2016-01-22  1:01     ` John Wiegley
2016-01-22  1:28       ` Dmitry Gutov
2016-01-22  1:42         ` Paul Eggert
2016-01-22  3:50           ` Xue Fuqiao
2016-01-22  1:46         ` John Wiegley
2016-01-22  1:48           ` Dmitry Gutov
2016-01-22  1:56             ` John Wiegley
2016-01-22  7:32               ` Eli Zaretskii
2016-01-22  7:38                 ` John Wiegley
2016-01-22 14:59                   ` Barry Fishman
2016-01-22 17:45                     ` John Wiegley
2016-01-22 21:27                       ` Barry Fishman
2016-01-23  1:47                         ` John Wiegley
2016-01-25 10:38                           ` Alex Bennée
2016-01-25 15:56                             ` Eli Zaretskii
2016-01-23  5:17                         ` Stefan Monnier
2016-01-23 17:09                           ` Barry Fishman
2016-01-23 20:06                             ` John Wiegley
2016-01-24  4:26                               ` Stefan Monnier
2016-01-24 14:11                                 ` Eli Zaretskii
2016-01-24 18:04                                   ` Stefan Monnier
2016-01-24 18:35                                     ` Eli Zaretskii
2016-01-25  2:20                                       ` Stefan Monnier
2016-01-22  7:26           ` Eli Zaretskii
2016-01-22  8:10             ` Michael Albinus
2016-01-22  8:25               ` Eli Zaretskii
2016-01-22  8:58                 ` Nicolas Petton
2016-01-22  9:02                   ` Michael Albinus
2016-01-22 17:42                     ` John Wiegley
2016-01-22 19:02                       ` Michael Albinus
2016-01-22 19:16                         ` Alan Mackenzie
2016-01-22 21:22                           ` Eli Zaretskii
2016-01-22  7:11       ` Eli Zaretskii
2016-01-23  5:25       ` Stefan Monnier
  -- strict thread matches above, loose matches on Subject: below --
2016-02-11 16:28 Angelo Graziosi
2016-02-11 17:09 ` John Wiegley
2016-02-11 17:26   ` Paul Eggert
2016-02-11 17:27   ` Angelo Graziosi
2016-02-11 21:08     ` Eli Zaretskii
2016-02-11 21:04   ` Eli Zaretskii
2016-02-11 19:36 ` Stefan Monnier
2016-02-11 19:40   ` John Wiegley
2016-02-12 12:34   ` Richard Stallman

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).