From: Paul Eggert <eggert@cs.ucla.edu>
To: emacs-devel@gnu.org
Subject: Re: Need review of emacs-25-merge branch
Date: Tue, 29 Dec 2015 23:46:59 -0800 [thread overview]
Message-ID: <56838BF3.1060904@cs.ucla.edu> (raw)
In-Reply-To: <m2bn98o57r.fsf@newartisans.com>
John Wiegley wrote:
> The resulting merge fails to build for me for the same reason that emacs-25
> does: the ucs-normalize.el build failure.
That build failure was fixed in emacs-25 on Fri Dec 25 13:23:17 2015 +0200, by
Eli in commit 94a3606243d3923ac457aeff33f3ce82b65ef6cd “Fix bootstrap broken by
changes related to OS X file-name encoding”. I don’t observe it in a fresh build
now on either emacs-25 (commit ce106f3de6b016a474e2591dea9226a3741effee) or
emacs-25-merge (commit ec0a80cc283badc7f7fd5ef78512dde6d34b1355). My guess is
that you need to build from scratch rather than rely on ‘make’ to figure out
exactly which files are obsolete.
One problem I noticed with the merge is ChangeLog.2. I don't see how ‘make
change-history’ will work in the master branch now. For example, if you are in a
directory where emacs-25-merge is current and rename that branch to master with
‘git branch -m emacs-25-merge master’ and then run ‘make
change-history-nocommit’, you should observe duplicate entries in ChangeLog.2,
which is not good.
next prev parent reply other threads:[~2015-12-30 7:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-30 5:50 Need review of emacs-25-merge branch John Wiegley
2015-12-30 7:46 ` Paul Eggert [this message]
2015-12-30 17:23 ` Eli Zaretskii
2015-12-30 16:20 ` Eli Zaretskii
2015-12-30 19:07 ` John Wiegley
2015-12-30 19:15 ` Lars Magne Ingebrigtsen
2015-12-30 19:26 ` Eli Zaretskii
2015-12-30 19:35 ` John Wiegley
2015-12-30 19:39 ` Lars Magne Ingebrigtsen
2015-12-30 19:59 ` Eli Zaretskii
2015-12-30 20:17 ` Lars Magne Ingebrigtsen
2015-12-30 20:52 ` Eli Zaretskii
2015-12-30 19:49 ` John Wiegley
2015-12-30 19:52 ` Lars Magne Ingebrigtsen
2015-12-30 19:59 ` John Wiegley
2016-01-02 3:32 ` Lars Magne Ingebrigtsen
2015-12-30 19:53 ` Paul Eggert
2015-12-30 19:59 ` John Wiegley
[not found] ` <CABr8ebbF7JYoGPV5gtmAuVsOWamoCdmpq+tqoLqyuoM8OYOCcg@mail.gmail.com>
[not found] ` <m2vb7gml15.fsf@newartisans.com>
2015-12-30 17:38 ` Eli Zaretskii
[not found] ` <CABr8ebacCsM15oWN55Zhg9ACBh-iy5n9nTF5wDj53=F7Ns25Jw@mail.gmail.com>
2015-12-30 19:10 ` John Wiegley
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=56838BF3.1060904@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
/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.