From: Paul Eggert <eggert@cs.ucla.edu>
To: Eli Zaretskii <eliz@gnu.org>
Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Tue, 22 Mar 2016 13:26:04 -0700 [thread overview]
Message-ID: <56F1AA5C.9080304@cs.ucla.edu> (raw)
In-Reply-To: <834mby47uk.fsf@gnu.org>
On 03/22/2016 12:42 PM, Eli Zaretskii wrote:
>> OK, I can install the attached instead. It won't fix mistakes in
>> Perl, and it will still be better than what we have now (where
>> ChangeLog.2 is plainly bogus in the 'master' branch). It's intended
>> as a stopgap measure until we come up with something better.
> Isn't it easier and simpler just to delete ChangeLog.2 from the master
> branch, and leave everything else intact?
No, as that would erase the relevant emacs-25 history from the master
branch. Also, it would leave intact the procedure for updating
ChangeLog.2 in the master branch, even though we should not be using
that procedure there as things stand, and Murphy's law would apply if we
left it in there (someone would go ahead and use the procedure anyway).
next prev parent reply other threads:[~2016-03-22 20:26 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-20 11:36 Missing changes in merges from emacs-25 to master martin rudalics
2016-03-20 17:32 ` Eli Zaretskii
2016-03-20 18:38 ` martin rudalics
2016-03-20 18:50 ` Eli Zaretskii
2016-03-20 19:15 ` martin rudalics
2016-03-21 7:36 ` Paul Eggert
2016-03-21 9:22 ` martin rudalics
2016-03-21 17:55 ` Paul Eggert
2016-03-22 10:22 ` martin rudalics
2016-03-22 10:36 ` Andreas Schwab
2016-03-22 10:58 ` martin rudalics
2016-03-22 11:32 ` Andreas Schwab
2016-03-22 11:47 ` martin rudalics
2016-03-22 15:20 ` Óscar Fuentes
2016-03-22 17:08 ` martin rudalics
2016-03-22 15:24 ` Noam Postavsky
2016-03-22 17:08 ` martin rudalics
2016-03-21 16:06 ` Eli Zaretskii
2016-03-21 17:55 ` John Wiegley
2016-03-21 17:57 ` Paul Eggert
2016-03-21 18:16 ` Eli Zaretskii
2016-03-21 21:27 ` John Wiegley
2016-03-22 0:17 ` Paul Eggert
2016-03-22 0:52 ` Paul Eggert
2016-03-22 3:35 ` Eli Zaretskii
2016-03-22 16:18 ` Eli Zaretskii
2016-03-22 16:30 ` Stefan Monnier
2016-03-22 16:45 ` Eli Zaretskii
2016-03-22 16:52 ` Stefan Monnier
2016-03-22 17:03 ` Eli Zaretskii
2016-03-22 18:21 ` Paul Eggert
2016-03-22 18:33 ` Eli Zaretskii
2016-03-23 13:10 ` Stefan Monnier
2016-03-22 18:41 ` Stefan Monnier
2016-03-22 18:58 ` Eli Zaretskii
2016-03-23 2:08 ` Stefan Monnier
2016-03-23 8:07 ` Andreas Schwab
2016-03-22 19:34 ` Lars Magne Ingebrigtsen
2016-03-22 19:49 ` Eli Zaretskii
2016-03-24 7:18 ` Phillip Lord
2016-03-22 18:32 ` Paul Eggert
2016-03-22 18:37 ` Eli Zaretskii
2016-03-22 19:15 ` Paul Eggert
2016-03-22 19:42 ` Eli Zaretskii
2016-03-22 20:26 ` Paul Eggert [this message]
2016-03-22 22:57 ` David Engster
2016-03-22 23:45 ` Paul Eggert
2016-03-25 8:52 ` Eli Zaretskii
2016-03-25 9:14 ` Andreas Schwab
2016-03-25 10:48 ` Eli Zaretskii
2016-03-25 11:50 ` Andreas Schwab
2016-03-25 13:55 ` Eli Zaretskii
2016-03-25 9:15 ` David Engster
2016-03-25 10:50 ` Eli Zaretskii
2016-03-25 11:38 ` David Engster
2016-03-25 14:15 ` Eli Zaretskii
2016-03-25 16:00 ` David Engster
2016-03-25 16:27 ` David Engster
2016-03-25 17:33 ` Eli Zaretskii
2016-03-25 17:52 ` David Engster
2016-03-25 18:43 ` Eli Zaretskii
2016-03-25 19:29 ` Óscar Fuentes
2016-03-25 19:42 ` Paul Eggert
2016-03-26 21:34 ` Stefan Monnier
2016-03-22 17:00 ` Phillip Lord
2016-03-22 18:24 ` Eli Zaretskii
2016-03-22 19:21 ` John Wiegley
2016-03-22 19:46 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56F1AA5C.9080304@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.