From: Michael Albinus <michael.albinus@gmx.de>
To: emacs-devel@gnu.org
Cc: Paul Eggert <eggert@cs.ucla.edu>
Subject: Re: master f95bbe5 3/6: -
Date: Tue, 22 Mar 2016 20:31:52 +0100 [thread overview]
Message-ID: <87wpoujolz.fsf@gmx.de> (raw)
In-Reply-To: <E1aiQnt-0004qe-FN@vcs.savannah.gnu.org> (Paul Eggert's message of "Tue, 22 Mar 2016 18:13:17 +0000")
Paul Eggert <eggert@cs.ucla.edu> writes:
> branch: master
> commit f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd
> Merge: 4869e0d b8ea08b
> Author: Paul Eggert <eggert@cs.ucla.edu>
> Commit: Paul Eggert <eggert@cs.ucla.edu>
>
> -
> ---
> admin/release-process | 4 ++--
> doc/emacs/abbrevs.texi | 9 +++++----
> doc/lispref/abbrevs.texi | 9 ++++++---
> doc/misc/eshell.texi | 4 +++-
> etc/themes/tsdh-light-theme.el | 7 ++++---
> lisp/doc-view.el | 2 +-
> lisp/forms.el | 2 +-
> lisp/mail/rmail.el | 2 ++
> lisp/progmodes/cc-defs.el | 2 +-
> lisp/progmodes/ruby-mode.el | 4 ++--
> lisp/progmodes/xref.el | 11 +++++------
> lisp/simple.el | 36 +++++++++++++++++++++---------------
> src/bidi.c | 2 +-
> src/emacsgtkfixed.c | 3 +--
> src/emacsgtkfixed.h | 1 -
> src/floatfns.c | 3 +--
> src/gtkutil.c | 12 ++++--------
> src/lisp.h | 3 ++-
> src/nsterm.m | 30 +++++++++++++++++++++++++++++-
> test/lisp/net/tramp-tests.el | 13 +++++++++++--
> 20 files changed, 102 insertions(+), 57 deletions(-)
Hmm. In the commit message of tramp-tests.el in the emacs-25 branch, I wrote
Suppress some Tramp tests for OSX, do not merge with master
Now it has arrived master. And also no commit message in master, that
means ChangeLog generation won't work.
Merges are going worse :-(
Best regards, Michael.
PS: I'll revert that change in master.
next parent reply other threads:[~2016-03-22 19:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160322181316.18561.2201@vcs.savannah.gnu.org>
[not found] ` <E1aiQnt-0004qe-FN@vcs.savannah.gnu.org>
2016-03-22 19:31 ` Michael Albinus [this message]
2016-03-22 20:03 ` master f95bbe5 3/6: - Paul Eggert
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wpoujolz.fsf@gmx.de \
--to=michael.albinus@gmx.de \
--cc=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 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).