From nobody Mon Oct 4 15:12:48 2021 X-Original-To: freebsd-questions@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1872417DDC3F for ; Mon, 4 Oct 2021 15:12:57 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4HNPNS2LQqz3DJ4 for ; Mon, 4 Oct 2021 15:12:56 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 70AF95C0197 for ; Mon, 4 Oct 2021 11:12:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 04 Oct 2021 11:12:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zyxst.net; h= date:from:to:subject:message-id:mime-version:content-type; s= fm3; bh=iSWmi5DMk8vop6CPc3BDRvUKUIdxWCVTb7y/a5Bmypo=; b=JZ0ZKo1A Ahc06m/DD9Vo8gbK6AmYksxgbAWBRqE2/wNVwlF8sMsNmpaWYG0VIb+PwFI9jw2n sA5+l0wjE/In3I96OjW0DkFDvJd50fCZQl7QW20sxW2bUl1dFANnoRwUpA39MlzP 2BdBCA2Gug03ME4vbHoF+1jGnx+D5GFYqzGg3xsxkA5OUm1eJqAWP9CM6TrtZDnE EauWzrd3H9YxzVE0/3g0knU8QZGly6SuBKOZKgjD2Wa+Vz+E/1jef9pfrH46Fm2Q yE68il/iaxURMl2zjfpFrNuDAlfx1aTcZLlbYkhg2j7ZvA7tz4cXUJc34yS8Wkeu 7hz4UrW3zrexXQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=iSWmi5DMk8vop6CPc3BDRvUKUIdxW CVTb7y/a5Bmypo=; b=I5OyKKP4AgGCwF1w47z2cLdexa+IYCnzhAeatI+cCmabX hVBGzO/elm4KnJ7NwuNxPv2D4AzLgPMgHYW9efEqlA/5Hc+SfRke/kHzy9l0/3bQ PZIfmWIPVqIUzoE1LUppo9ChPoeyXKGbjdCj8rzFQ/cprHEVH12BxgSNcX37SIaS prtgamt/IytYHfxmWYh4QlGuCqWbCaMWUu4mjkjHcoL/HkWMuDowRAIxWvSqJ5SG yYnnpdSRGlGQYH+KkPeFsdkZjtPQppZ5kqwWXeBGJGtoa8jJ0R4dEXdPyi21GHta fbaRSlH+d8jHeXQVAXIzq8FEwjLlZUl1sAtbprUgQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudelvddgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkgggtugesghdtreertd dtvdenucfhrhhomhepthgvtghhqdhlihhsthhsuceothgvtghhqdhlihhsthhsseiihiig shhtrdhnvghtqeenucggtffrrghtthgvrhhnpeevgffhffdtfeekleelhedtjeelvdfhvd egieejveffgfduvdfhteegjeeujeeuieenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehtvggthhdqlhhishhtshesiiihgihsthdrnhgvth X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 4 Oct 2021 11:12:49 -0400 (EDT) Date: Mon, 4 Oct 2021 16:12:48 +0100 From: tech-lists To: freebsd-questions@freebsd.org Subject: manually patching a port gets overwritten when the tree updates Message-ID: Mail-Followup-To: freebsd-questions@freebsd.org List-Id: User questions List-Archive: https://lists.freebsd.org/archives/freebsd-questions List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-questions@freebsd.org X-BeenThere: freebsd-questions@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="q6PMoMAiksh3WSPb" Content-Disposition: inline X-Rspamd-Queue-Id: 4HNPNS2LQqz3DJ4 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zyxst.net header.s=fm3 header.b=JZ0ZKo1A; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=I5OyKKP4; dmarc=none; spf=none (mx1.freebsd.org: domain of tech-lists@zyxst.net has no SPF policy when checking 66.111.4.25) smtp.mailfrom=tech-lists@zyxst.net X-Spamd-Result: default: False [-6.26 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.25:from]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[zyxst.net:+,messagingengine.com:+]; NEURAL_HAM_SHORT(-0.76)[-0.759]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.0.0/20, country:US]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.25:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[zyxst.net:s=fm3,messagingengine.com:s=fm1]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-questions@freebsd.org]; DMARC_NA(0.00)[zyxst.net]; RCPT_COUNT_ONE(0.00)[1]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; R_SPF_NA(0.00)[no SPF record]; MAILMAN_DEST(0.00)[freebsd-questions] X-ThisMailContainsUnwantedMimeParts: N --q6PMoMAiksh3WSPb Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, I thought 'git stash' would take care of this but it doesn't. Sometimes a port breaks then a PR is raised and then sometimes someone posts a patch. I'll apply it to my ports tree 'default' in poudriere and build the port. If it builds ok I'll run 'git stash' then 'poudriere ports -u -v' and the ports tree updates. If I don't run 'git stash' the update will fail. But if I try to build the affected port again, after successfully updating the tree, it's as if the patch was never applied. The same sort of thing happens with the usual ports tree (in other words, without poudriere in the equation) I want manually applied patches to remain applied, and I want my ports tree to stay as current as possible. How is this accomplished? thanks, --=20 J. --q6PMoMAiksh3WSPb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE8n3tWhxW11Ccvv9/s8o7QhFzNAUFAmFbGecACgkQs8o7QhFz NAXUeg/+JbP9bRArp5WjfO/LhGPyXklulG2+gaApvl4aKF3FdQEDz8/QL+hz+ZZt gLl1o21+0d++qyRLFgwgDRtGBGj25DzgKHmsNY/BULFvV3lE1yVj5RCJQObDH02F vK6Iglz+i9QBHH31S90elpN3oSOSWfjRbCaEp5qAbQpd6v6kJQ0787P7M3wa0LyM pSY9+bkoEu9usztywIROvlph2WpXaTt8PJL9WLuIvLvdF130g0YR/jKzp2QSA0ZF WHBs/uiUtuKqQTXWYE99JxgAxRVOXYj1VbaAjoq4alnYdG9p/WSCNBJjoRutS4nU h/3Jg6wGHPKRugk9JnyktGl8J/kIN8FgeciVct4ex6mnvXuaFKh9Lpy3ySYQ2C+P 1deJTzzvlA8pQr43t4u6lwjg0nOMVkhcLa/brS2VYFoWy8cj9K8wGgZTaBWLOqqQ QZisNzOWtCBHuvelHwircM0A54ZxuB+rq0Cz2tj3W7DGsWx7vxd6f4Kpny9ckXs0 TjPCzgSDs45MLp86M/cJiF2edVooIHOdvBIPB7/2RHGBWAtkQ0lSooUkddgt/vco BMp072wYDDJ9KGebnO5Jd2cQ5luNDmacC99V+t6tb5th2ldsoAQCZfAyp4aqO78V HmdwkHSz3MYowJm4YHAiUiSOAvsaXD3p0eFoh5wdlm9AvN74JnQ= =VM7P -----END PGP SIGNATURE----- --q6PMoMAiksh3WSPb--