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 22:41:31 +0000 Message-ID: <878u5bxihw.fsf@russet.org.uk> References: <83k2ovix06.fsf@gnu.org> <87lh9bo1wp.fsf@russet.org.uk> <83fuzji93v.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1449182517 26681 80.91.229.3 (3 Dec 2015 22:41:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2015 22:41:57 +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 23:41:44 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 1a4cZK-0007U8-T0 for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 23:41:43 +0100 Original-Received: from localhost ([::1]:37732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4cZK-0001rc-2P for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 17:41:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4cZG-0001pT-2D for emacs-devel@gnu.org; Thu, 03 Dec 2015 17:41:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4cZF-0008Pq-37 for emacs-devel@gnu.org; Thu, 03 Dec 2015 17:41:37 -0500 Original-Received: from cheviot22.ncl.ac.uk ([128.240.234.22]:39919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4cZB-0008N5-86; Thu, 03 Dec 2015 17:41:33 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot22.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1a4cZA-0006hq-EE; Thu, 03 Dec 2015 22:41:32 +0000 Original-Received: from cpc6-benw10-2-0-cust45.gate.cable.virginm.net ([92.238.179.46] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1a4cZA-0004Ln-87; Thu, 03 Dec 2015 22:41:32 +0000 In-Reply-To: <83fuzji93v.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 3 Dec 2015 22:13:24 +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.22 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:195837 Archived-At: Eli Zaretskii writes: >> 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. > > It wouldn't have mattered. Emacs 25.1 is not going to be the only > version delivered from the emacs-25 branch. Really? I assumed 25.2 was going to fork from current master. >> 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? > > That should work, but I wasn't talking about this. I was talking > about adding new files to emacs-25. Sure, I understand that. I was thinking of the situation where a new file is added to emacs-25, merged to master and then more tests are added (i.e. the new files is subsequently updated). As you say, the addition of a file into two places is not so bad. But it would be nice if subsequent updates to the file worked. >> 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. > > That's error prone, so I'd rather we avoided it. I'm at the limit of my git knowledge, I fear. Phil