Date: Thu, 2 Jul 2020 13:36:29 +0200 (CEST) From: Gerald Pfeifer <gerald@pfeifer.com> To: Mathieu Arnold <mat@freebsd.org>, Kyle Evans <kevans@freebsd.org>, Alexey Dokuchaev <danfe@freebsd.org>, ports-committers <ports-committers@freebsd.org> Cc: svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r540489 - in head/devel/fhist: . files Message-ID: <alpine.LSU.2.22.394.2007021329500.4097@anthias.pfeifer.com> In-Reply-To: <CACNAnaEx-guSmtJ0rshO%2BLoBbG3Yo9BtL_ZR8Aht3Dmm4iThEg@mail.gmail.com> 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> <CACNAnaEx-guSmtJ0rshO%2BLoBbG3Yo9BtL_ZR8Aht3Dmm4iThEg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.LSU.2.22.394.2007021329500.4097>