From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: New test files in emacs-25 branch Date: Thu, 03 Dec 2015 17:52:22 +0000 Message-ID: <87lh9bo1wp.fsf@russet.org.uk> References: <83k2ovix06.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1449165176 27780 80.91.229.3 (3 Dec 2015 17:52:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2015 17:52:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 03 18:52:52 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 1a4Y3m-00070K-DS for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 18:52:50 +0100 Original-Received: from localhost ([::1]:36736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Y3l-0000EY-Qn for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 12:52:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Y3V-0000DV-1c for emacs-devel@gnu.org; Thu, 03 Dec 2015 12:52:36 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4Y3Q-0004v2-TG for emacs-devel@gnu.org; Thu, 03 Dec 2015 12:52:32 -0500 Original-Received: from cheviot12.ncl.ac.uk ([128.240.234.12]:54371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Y3M-0004rH-5V; Thu, 03 Dec 2015 12:52:24 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot12.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1a4Y3K-0002zW-AX; Thu, 03 Dec 2015 17:52:22 +0000 Original-Received: from jangai.ncl.ac.uk ([10.66.67.223] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1a4Y3K-0005xU-4l; Thu, 03 Dec 2015 17:52:22 +0000 In-Reply-To: <83k2ovix06.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 3 Dec 2015 13:37:13 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 128.240.234.12 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:195822 Archived-At: Eli Zaretskii writes: > 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? I guess this crossed my mind sometime after I offered to move all the file locations. Probably it would have made sense to leave things till after the emacs-25. If this is going to be a major PITA (and it probably is), one solution would be to create a "test/automated" directory on master. The make files will already pick this up correctly and run any tests in it (on master). These files can then be moved enmass after the emacs-25 release. Is git is intelligent enough to work through a file move? Will new tests added to existing test files in the automated directory of emacs-25 merge into the moved files on master? If not, I fear, new tests in existing files is likely to be more of an issue. If so, then new files in emacs-25 test/automated can be merged to master, and then moved to the new directory structure any time on master, and new tests or changes should follow. Phil