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: merge from emacs-25 to master lost a line Date: Thu, 07 Jan 2016 22:31:18 +0000 Message-ID: <87egdtja2x.fsf@russet.org.uk> References: <568B1FAA.2000302@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452205899 24852 80.91.229.3 (7 Jan 2016 22:31:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 7 Jan 2016 22:31:39 +0000 (UTC) Cc: Emacs development discussions To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 07 23:31:31 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 1aHJ5d-0001YJ-Ss for ged-emacs-devel@m.gmane.org; Thu, 07 Jan 2016 23:31:30 +0100 Original-Received: from localhost ([::1]:33071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHJ5d-0007eX-1T for ged-emacs-devel@m.gmane.org; Thu, 07 Jan 2016 17:31:29 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHJ5Z-0007eE-Uo for emacs-devel@gnu.org; Thu, 07 Jan 2016 17:31:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHJ5W-00031R-Jg for emacs-devel@gnu.org; Thu, 07 Jan 2016 17:31:25 -0500 Original-Received: from cheviot12.ncl.ac.uk ([128.240.234.12]:60051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHJ5W-00030E-EI for emacs-devel@gnu.org; Thu, 07 Jan 2016 17:31:22 -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 1aHJ5U-0005Io-BU; Thu, 07 Jan 2016 22:31:20 +0000 Original-Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1aHJ5T-00078b-Tl; Thu, 07 Jan 2016 22:31:20 +0000 In-Reply-To: <568B1FAA.2000302@cs.ucla.edu> (Paul Eggert's message of "Mon, 4 Jan 2016 17:43:06 -0800") 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:197774 Archived-At: Paul Eggert writes: > The recent merge from emacs-25 to master lost the attached one-line spelling > fix for test/automated/url-parse-tests.el that was originally installed in > emacs-25 commit c9dfe5121cb31aa1e8cf352e5088940fc5dd7106 dated 2015-12-26. > This fix was lost even though the commit and change is listed in the master > branch now. I fixed the problem in master as part of commit > 61e83e902b388490b609677a76f3d49740439f24 dated 2016-01-04. > > Although this particular bug is both minor and fixed now, I worry that there > may be similar problems elsewhere. > > I suspect the problem arose due to the big renaming of tests in commit > 22bbf7ca22f11cc33d887d0162cf2ec6661c3a3e dated 2015-11-23, which renamed a > bunch of test files, e.g., from test/automated/url-util-tests.el to > test/lisp/url/url-util-tests.el. It looks like this renaming means that if > emacs-25 adds a test (under the old naming scheme) and then later changes the > test (also under the old naming scheme), the later change will be lost when be > merging to master. Hmmm. I was hoping that git was clever enough to understand the file move, or that, at least, this would produce a conflict, url-util-tests.el was modified on one branch and deleted (i.e. moved) in another. > If my analysis is correct, I suggest two things: > > * First, when merging to master we have to be careful about the renamed tests. > I suppose somone (I hope it's not me) could go through all the emacs-25 > changes to tests renamed in master, and check that the changes are properly > merged to master. As this is my fault, I will work on this, or at least start to. It should at least allow me to understand if this is just url-util-tests.el or general problem as you fear. > * Second, to help avoid this problem in the future we should avoid making > wholesale renames to master right now. They're not worth the hassle. That is, > it's OK to add stuff to master, but let's not rename files in master unless we > really need to. Yes, it looks like I should have waited till after the emacs-25 release was made. Oh dear, I was ever over-enthusiastic. Phil