From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: Re: New test files in emacs-25 branch Date: Thu, 3 Dec 2015 12:53:18 +0000 Message-ID: References: <83k2ovix06.fsf@gnu.org> Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1449147219 11190 80.91.229.3 (3 Dec 2015 12:53:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2015 12:53:39 +0000 (UTC) Cc: emacs-devel To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 03 13:53:39 2015 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 1a4TOE-0005LD-Q2 for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 13:53:38 +0100 Original-Received: from localhost ([::1]:35010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4TOD-0008V9-Oy for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 07:53:37 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4TNx-0008TD-G3 for emacs-devel@gnu.org; Thu, 03 Dec 2015 07:53:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4TNw-0005lA-Ng for emacs-devel@gnu.org; Thu, 03 Dec 2015 07:53:21 -0500 Original-Received: from mail-lb0-x233.google.com ([2a00:1450:4010:c04::233]:34998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4TNv-0005kk-8l; Thu, 03 Dec 2015 07:53:19 -0500 Original-Received: by lbcdv4 with SMTP id dv4so947661lbc.2; Thu, 03 Dec 2015 04:53:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=yUgap+tdpv7ko6ZVeY8GRohbj3Uc/SgPw3tmxlOxAd8=; b=ymyMRc3HwPCn7khckPAGOnOkoc7fZtMYU+MaOcbUeHaNeJtTGZbWzu9q4SM0BLMcLq r6QJc7GWrBPYx2wY8/r2ra5T4qBUtUqtTw6/wLbJjNovxW8OD3sUBssMeYFVTv+szbJh H6S5rD8FEHGpLcLwfi8mtOreQYjP6ovSDsmvi7t/+ubV7xdgTkX5UUCMLTEYAlWpsaaK BHHd+ptSvqr7ZJzvJZoPz6ucIBvhOIMczjzZQhpk12PV90cG98GZCfOC0b3biHkhfUVt A9y/mwcr/U+jFpI2pCiSvU2+D4AwHeECkPngpAKR2MzpcsF3KJ+9STP+By+CK5AV8A0C MEng== X-Received: by 10.112.168.133 with SMTP id zw5mr5577367lbb.95.1449147198381; Thu, 03 Dec 2015 04:53:18 -0800 (PST) Original-Received: by 10.112.202.99 with HTTP; Thu, 3 Dec 2015 04:53:18 -0800 (PST) In-Reply-To: <83k2ovix06.fsf@gnu.org> X-Google-Sender-Auth: WJX8s5wDFSUtK3_v3KrQaR5wBKw X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::233 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:195811 Archived-At: 2015-12-03 11:37 GMT+00:00 Eli Zaretskii : > I guess new test files introduced on the emacs-25 branch will have to > be manually added to the corresponding directory on master, since > gitmerge.el won't be able to pull such trickery, right? Are test files part of the release? If not, we should just add any new test files to master.