emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master f95bbe5 3/6: -


From: Paul Eggert
Subject: Re: master f95bbe5 3/6: -
Date: Tue, 22 Mar 2016 13:03:52 -0700
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0

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)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]