From nobody Tue Mar 28 13:51:40 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 4PmB1w3fPCz41xx0 for ; Tue, 28 Mar 2023 13:52:04 +0000 (UTC) (envelope-from dch@skunkwerks.at) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) (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 4PmB1v3Bjjz4XLh for ; Tue, 28 Mar 2023 13:52:03 +0000 (UTC) (envelope-from dch@skunkwerks.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=skunkwerks.at header.s=fm3 header.b=iSYUb4Md; dkim=pass header.d=messagingengine.com header.s=fm2 header.b="Z 5IeRyO"; spf=pass (mx1.freebsd.org: domain of dch@skunkwerks.at designates 66.111.4.28 as permitted sender) smtp.mailfrom=dch@skunkwerks.at; dmarc=pass (policy=reject) header.from=skunkwerks.at Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 397725C016D for ; Tue, 28 Mar 2023 09:52:01 -0400 (EDT) Received: from imap44 ([10.202.2.94]) by compute1.internal (MEProxy); Tue, 28 Mar 2023 09:52:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skunkwerks.at; 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=fm3; t= 1680011521; x=1680097921; bh=1iH6HM3vRgf+VfewNo2+3yhXEA+5vveRbuU tAVNGa/o=; b=iSYUb4MdweZtfmaMv7Sxd6wpiYb7cyMLPVbFhCgvhUL44HwgoN0 UB8GC930xGcJJv2F0hQaCl65FRrVsqvxkXf5zX8k+8NjBICkdmQ0k+aBQsgrzGd1 1QXOzVq99g7KvXMvXfE2kuIC8BuQnpLjjHmjvlV8/mb30PvldYfGwJGREWDllXZo UjLQiK/qhntXuaBKdTu5E4VFiNJUjyMaHEtOgJhOdBQmlxvcCqNfjEtGfVjqge5g aMz9AAR3FveyDkaA+2F0yi+Y2o/mhPGGJb6ElOdspMQvANiRudUMUr2Ki6KY2GZB rUj8lPzMXK++Ccl61hS2Ngrh8l/fGnJyAiw== 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=1680011521; x= 1680097921; bh=1iH6HM3vRgf+VfewNo2+3yhXEA+5vveRbuUtAVNGa/o=; b=Z 5IeRyO4wB02jnt07SxpTnEqgl+ZbX8Xiac1nLgj/QXb86qHrSeKE8QJT4nyZuMt4 79u/GOXcoqhbGOnCj/CuMBRzqLQ4DgBrBc2jQecP9UCKC45UD8rZ+rXYPVQMRSu7 E2PMTNWxJGL8sYPSgIIYsOty+UXFzDvTF/+NbhUxuSphOHQ/6ez9wVMR5fyoLBBi EMPBGbGDwhdYjuJkId87KXQpUqnXYTZ8uZPKdhhWWzHAiFqNP2ihelRvcZ9blpWu F/5BXIJC2nbzP5ZKfomfNsL4HlYzr6OE8tfAvuKu2/DL+vcjOFi0xzUCUMyPajGX DLebvwswJddWGGClSusRw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgfgsehtqhertderreejnecuhfhrohhmpedfffgr vhgvucevohhtthhlvghhuhgsvghrfdcuoegutghhsehskhhunhhkfigvrhhkshdrrghtqe enucggtffrrghtthgvrhhnpedthfethfejkeeihedvhfeiieeiledtheehueetieelhfff leehhffhfeefteejteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpegutghhsehskhhunhhkfigvrhhkshdrrght X-ME-Proxy: Feedback-ID: ic0e84090:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id B663136A007A; Tue, 28 Mar 2023 09:52:00 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-237-g62623e8e3f-fm-20230327.001-g62623e8e 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 Message-Id: <4dd6c6b4-20d6-438e-9a23-5e0613c1f9ea@app.fastmail.com> In-Reply-To: References: Date: Tue, 28 Mar 2023 13:51:40 +0000 From: "Dave Cottlehuber" To: "FreeBSD Hackers" Subject: Re: what's the Correct git update method keeping local changes Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-4.69 / 15.00]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[skunkwerks.at,reject]; R_DKIM_ALLOW(-0.20)[skunkwerks.at:s=fm3,messagingengine.com:s=fm2]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.28]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.28:from]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_GOOD(-0.10)[66.111.4.28:from]; XM_UA_NO_VERSION(0.01)[]; FREEFALL_USER(0.00)[dch]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US]; RCVD_TLS_LAST(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[skunkwerks.at:+,messagingengine.com:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org] X-Rspamd-Queue-Id: 4PmB1v3Bjjz4XLh X-Spamd-Bar: ---- X-ThisMailContainsUnwantedMimeParts: N On Tue, 28 Mar 2023, at 10:37, 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=E2=80=99s=20 > experiences with poudriere overlay dire? > > Pat I think this is largely a matter of familiarity with git. If you have a pile of local ports, in your own category, then an overlay is just fine, but then you have 2 separate repos to manage. As soon as you decide you want to pin an upstream port, or make some customisation that hasn't been accepted upstream yet, then having a single ports tree and rebasing periodically is really nice. You can revert an upstream commit you don't want, or keep an additional one, and it all just floats up the top.=20 Resolving conflicts is mostly a matter of adjusting various PORTREVISION changes, occasionally you need more extensive fixes ofc if the ports or patches it includes shifts too far. I like knowing that my entire environment comes down to 2 commits, one in src repo, another in ports repo, and that's very easy to reproduce. A+ Dave