From: Paul Eggert <eggert@cs.ucla.edu>
To: Michael Albinus <michael.albinus@gmx.de>, emacs-devel@gnu.org
Subject: Re: master f95bbe5 3/6: -
Date: Tue, 22 Mar 2016 13:03:52 -0700 [thread overview]
Message-ID: <56F1A528.7050703@cs.ucla.edu> (raw)
In-Reply-To: <87wpoujolz.fsf@gmx.de>
On 03/22/2016 12:31 PM, Michael Albinus wrote:
> 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.
Thanks for noticing that. I see you fixed that particular commit
already. I just now changed gitmerge.el so that this problem shouldn't
recur.
> And also no commit message in master, that
> means ChangeLog generation won't work.
When installing reverts like this, it's helpful to have a commit message
that contains details about it, e.g., something like the following. That
will make it easier for others to figure out later what happened.
-----
Keep some Tramp tests for OS X
This reverts commit dca240a70dcb1456a079a4738ac8e04c6698fc78,
which was mistakenly merged from emacs-25 earlier today.
* test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
All uses removed. (Bug#22145)
prev parent reply other threads:[~2016-03-22 20:03 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 ` master f95bbe5 3/6: - Michael Albinus
2016-03-22 20:03 ` Paul Eggert [this message]
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=56F1A528.7050703@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=michael.albinus@gmx.de \
/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).