From owner-svn-ports-head@freebsd.org Thu Jul 2 11:36:47 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 78369352DCE; Thu, 2 Jul 2020 11:36:47 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from hamza.pair.com (hamza.pair.com [209.68.5.143]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49yGJt51NZz3SZn; Thu, 2 Jul 2020 11:36:46 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from hamza.pair.com (localhost [127.0.0.1]) by hamza.pair.com (Postfix) with ESMTP id 1C15E33E43; Thu, 2 Jul 2020 07:36:40 -0400 (EDT) Received: from [192.168.1.5] (unknown [77.118.218.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hamza.pair.com (Postfix) with ESMTPSA id 1710633E40; Thu, 2 Jul 2020 07:36:38 -0400 (EDT) Date: Thu, 2 Jul 2020 13:36:29 +0200 (CEST) From: Gerald Pfeifer To: Mathieu Arnold , Kyle Evans , Alexey Dokuchaev , ports-committers cc: svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r540489 - in head/devel/fhist: . files In-Reply-To: Message-ID: References: <202006261034.05QAYaDe038059@repo.freebsd.org> <20200626124105.GA65385@FreeBSD.org> <20200626132841.kytmjwquonpwkrhr@aching.in.mat.cc> <20200626133811.GA60522@FreeBSD.org> <20200626134752.i4ygenf4cc6we6nk@aching.in.mat.cc> <20200626135912.GA82842@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 49yGJt51NZz3SZn X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of gerald@pfeifer.com designates 209.68.5.143 as permitted sender) smtp.mailfrom=gerald@pfeifer.com X-Spamd-Result: default: False [-2.58 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.97)[-0.967]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+a:hamza.pair.com]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[pfeifer.com]; NEURAL_HAM_LONG(-0.96)[-0.957]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.36)[-0.359]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:7859, ipnet:209.68.0.0/18, country:US]; MIME_TRACE(0.00)[0:+] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2020 11:36:47 -0000 On Fri, 26 Jun 2020, Mathieu Arnold wrote: > We want patches that apply cleanly, without patch having to randonly > decide where it is going to put the different hunks. And indeed below you'll find a very real example. (I *was* aware, and had prepared removal of that patch, alas made a mistake and the tree I committed from lacked the `svn delete`. And patch(1) simply applied a patch again that was already there.) On Fri, 26 Jun 2020, Kyle Evans wrote: > In my ideal world, the ports tree would run with -F0 because it's > absolutely nonsensical to let it look like it might have done the > right thing. +1. Would you like to propose a patch and trigger an -exp run? (Or maybe as a first step go down from the default -F2 to -F1?) Gerald ====== recent commit ====== Author: gerald Date: Thu Jul 2 11:24:58 2020 New Revision: 541034 URL: https://svnweb.freebsd.org/changeset/ports/541034 Log: Really remove files/patch-dlls_ntdll (a temporary build fix) that I noted, but missed, in r539797. This patch still applied, leading to duplication of the hunk in question, which was benign though. Deleted: head/emulators/wine-devel/files/patch-dlls_ntdll