From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: master f95bbe5 3/6: - Date: Tue, 22 Mar 2016 13:03:52 -0700 Organization: UCLA Computer Science Department Message-ID: <56F1A528.7050703@cs.ucla.edu> References: <20160322181316.18561.2201@vcs.savannah.gnu.org> <87wpoujolz.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1458677060 14556 80.91.229.3 (22 Mar 2016 20:04:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 20:04:20 +0000 (UTC) To: Michael Albinus , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 21:04:12 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aiSXD-0005jj-Tm for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 21:04:12 +0100 Original-Received: from localhost ([::1]:39378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSXD-0000Ak-9a for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 16:04:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSX0-0000AR-5s for emacs-devel@gnu.org; Tue, 22 Mar 2016 16:03:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiSWw-0002jd-Uw for emacs-devel@gnu.org; Tue, 22 Mar 2016 16:03:58 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:38126) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiSWw-0002jK-PR for emacs-devel@gnu.org; Tue, 22 Mar 2016 16:03:54 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 82989161232; Tue, 22 Mar 2016 13:03:53 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id OsiI_PN1ZoN0; Tue, 22 Mar 2016 13:03:52 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id A64C5161234; Tue, 22 Mar 2016 13:03:52 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id MfCHf_nRgnb1; Tue, 22 Mar 2016 13:03:52 -0700 (PDT) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 8D8B4161232; Tue, 22 Mar 2016 13:03:52 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 In-Reply-To: <87wpoujolz.fsf@gmx.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202103 Archived-At: 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)