From nobody Tue Mar 28 14:45:56 2023 X-Original-To: freebsd-hackers@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 4PmCDC2K21z42266 for ; Tue, 28 Mar 2023 14:46:03 +0000 (UTC) (envelope-from void@f-m.fm) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (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 4PmCDB1PMVz3HJL for ; Tue, 28 Mar 2023 14:46:02 +0000 (UTC) (envelope-from void@f-m.fm) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=f-m.fm header.s=fm2 header.b=iPIiJlXO; dkim=pass header.d=messagingengine.com header.s=fm2 header.b="Z Avg6jV"; spf=pass (mx1.freebsd.org: domain of void@f-m.fm designates 64.147.123.21 as permitted sender) smtp.mailfrom=void@f-m.fm; dmarc=pass (policy=none) header.from=f-m.fm Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id D56EB320091B for ; Tue, 28 Mar 2023 10:46:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 28 Mar 2023 10:46:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=f-m.fm; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1680014760; x=1680101160; bh=A/A5pXDLsvmMSph+7mQzmZ0mWxMa/0Pp4PM qCIIqwAA=; b=iPIiJlXOkHeiBRnKUKKtDV9/kbo0fAV4hDmp/9736bLBTkNKYVR xP0JyLbGW0DfGhnQk4zjSsijfPp/dMy1q9WfCEDrJetiq3oJ9I4p5YSqVfb2h1dK PIW9FHHdsTRNwaONQEyLEaz7o2WHZjUqaWAbkpeOBzUH2I337o8XGKpuyLJW59yY sFYtVtuYIqI7yyAaZJVPbxow4B+Lu1m/erE5FdqxaTwtx3INj0OwugQNOUd7UeoZ AgVaHB6vYMI+r+uJJBgepZ0T4UMvWGi8+wfdvLkgIxr/LO8ux56I7M9eYvRimSa4 RvEH5Uc+UTbmpc9suHmzKzBk3bQC663hsIA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1680014760; x= 1680101160; bh=A/A5pXDLsvmMSph+7mQzmZ0mWxMa/0Pp4PMqCIIqwAA=; b=Z Avg6jVg9yC9w9n4rhRMlTl29cwpaQuGSY76muW4aw1qEW/N7FFpbksxsLvmrDY7v TG2zl8GLuHUBLbyqcsgAPlXPl+v5BkTaFeXfuGPVkakCwcttAXZWRtQSjvX9a5YS tMy8SjdFybY43U3IyV1tM/SbnRZ2//pC+XG2ubyW9eY3KYv8WQsdSmvYzWI4W8PR 8b6i+4eC+Xwxdywe/Sm39RuV1sgwpQ8pTvUUEv7+S5K4/O1rhhKMiF3aV8f/L5Hx AgZYMckOEFFJfaNRN6nkPJrD7fwR71+Y/qP25zfltzqJ4tNVwUWfT95HDI2bfMvt SszYtUsGBjGsNyGgCLsPg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehgedgjeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggugfgjsehtke ertddttdejnecuhfhrohhmpehvohhiugcuoehvohhiugesfhdqmhdrfhhmqeenucggtffr rghtthgvrhhnpeduteevgeeggeevieetvdduudetfffffffhteejgffggeevjeffiedute eftedvkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhm pehvohhiugesfhdqmhdrfhhm X-ME-Proxy: Feedback-ID: i2541463c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 28 Mar 2023 10:45:59 -0400 (EDT) Date: Tue, 28 Mar 2023 15:45:56 +0100 From: void To: freebsd-hackers@freebsd.org Subject: Re: what's the Correct git update method keeping local changes Message-ID: Mail-Followup-To: freebsd-hackers@freebsd.org References: List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spamd-Result: default: False [-4.53 / 15.00]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.93)[-0.930]; DMARC_POLICY_ALLOW(-0.50)[f-m.fm,none]; MID_RHS_NOT_FQDN(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.21:c]; R_DKIM_ALLOW(-0.20)[f-m.fm:s=fm2,messagingengine.com:s=fm2]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.21:from]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_NONE(0.00)[]; FREEMAIL_FROM(0.00)[f-m.fm]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org]; DKIM_TRACE(0.00)[f-m.fm:+,messagingengine.com:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[f-m.fm]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 4PmCDB1PMVz3HJL X-Spamd-Bar: ---- X-ThisMailContainsUnwantedMimeParts: N On Tue, Mar 28, 2023 at 03:37:16AM -0700, Pat Maddox wrote: >On Tue, Mar 28, 2023, at 1:39 AM, Warner Losh wrote: >> >> I use the rebase workflow for pending ports commit work. > >Most of the replies say something similar. What are people’s >experiences with poudriere overlay dire? I use two overlays: [1] for sccache-overlay to speed up those ports requiring rust to build [2] to maintain the last-known-good php74 for systems that can't be updated to a supported php version for $REASONS For systems that require [2], they need ports building in a tree that doesn't have the MOVED file, so it uses a different 'default' tree which has 'git rm MOVED' run on it after it updates but before poudriere bulk runs. --