From nobody Tue Mar 28 10:37:16 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 4Pm5jd2TMqz41kw1 for ; Tue, 28 Mar 2023 10:37:41 +0000 (UTC) (envelope-from pat@patmaddox.com) Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (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 4Pm5jc39zfz4Hbt for ; Tue, 28 Mar 2023 10:37:40 +0000 (UTC) (envelope-from pat@patmaddox.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=patmaddox.com header.s=fm1 header.b=c+9M0oBr; dkim=pass header.d=messagingengine.com header.s=fm2 header.b="X voXTDg"; spf=pass (mx1.freebsd.org: domain of pat@patmaddox.com designates 64.147.123.19 as permitted sender) smtp.mailfrom=pat@patmaddox.com; dmarc=none Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 02ED132008FD; Tue, 28 Mar 2023 06:37:36 -0400 (EDT) Received: from imap41 ([10.202.2.91]) by compute2.internal (MEProxy); Tue, 28 Mar 2023 06:37:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=patmaddox.com; 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=fm1; t= 1679999856; x=1680086256; bh=SA/qvP0nmgPuBU6ozigYXXds3XM2oiojxYz lb/Xa2c8=; b=c+9M0oBryZbpU8+VspppuA4bJ+YxXWMQrR5VcBdG94VEO6qdYJM UpYzwpL2Epc21cQMeUJWEzW9R/Osf8H5Sj3G5yKksWswAynUJvWHoQz9r0EAHFP6 k0ZG2SqwsogmFyo7qSkSqhvOf3ljrm3i1sl4lYgW+tk8/3fCKPPNxIgDopmJGE4g 0wjQZ2wSZD9pvdYbWgK4lgcRLcG1m1OPQnQh4l+EqPJBYtcxMCbRtvlh7RB8Is7q Sokq8bP4BQaELe+O4H5ov/Cqt756DLUEQ7ZeK71iqY12yBSCl3A/Q0adxfLJUosZ fgsAU1NfQPE8i4z644Lqa62t66SzC1WomEw== 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=1679999856; x= 1680086256; bh=SA/qvP0nmgPuBU6ozigYXXds3XM2oiojxYzlb/Xa2c8=; b=X voXTDgrK2Y5YJTd3jMSB9Kfbk//LJdoj88YCKzPpshPzoX2520hMSZW87CT8kr+o pfGU+BVPkf03s0YVSRKAVLUstA4ZvBjAxYWyE6X1YUOSiRFCSWxcjxI/V/oJPj5X SJPKjRfjlRL0uwX0S+iU7YujkXzORkB42TNGNknu1C3aT7Phe1mTntw5ujLtFmc6 p7jEfOQS+O71y84UVYn/b/W6fFWE9JdLqZ0Te62CtCngHipL6ssXelcXtHIzHBKR yRWR5tdAfEnr94u16nenOEfBFG3q5IAUhHFgxEhEW96qD2UDkpyqP4Dz6tEp1HSa TfN7oCVltQx9zvqQWI1pg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehgedgfedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtgfesth hqredtreerjeenucfhrhhomhepfdfrrghtucforgguughogidfuceophgrthesphgrthhm rgguughogidrtghomheqnecuggftrfgrthhtvghrnhepvedtieetlefgvdeklefhffelke evtefgkeegleejleegveduhfekgefggfdvudeknecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepphgrthesphgrthhmrgguughogidrtghomh X-ME-Proxy: Feedback-ID: i8b6c40f9:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 59E092340096; Tue, 28 Mar 2023 06:37:36 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-236-g06c0f70e43-fm-20230313.001-g06c0f70e 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: In-Reply-To: References: Date: Tue, 28 Mar 2023 03:37:16 -0700 From: "Pat Maddox" To: freebsd-hackers@freebsd.org 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.09 / 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)[-0.996]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.19]; R_DKIM_ALLOW(-0.20)[patmaddox.com:s=fm1,messagingengine.com:s=fm2]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.19:from]; XM_UA_NO_VERSION(0.01)[]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org]; TO_DN_NONE(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[patmaddox.com:+,messagingengine.com:+]; RCVD_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[patmaddox.com]; FREEFALL_USER(0.00)[pat]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4Pm5jc39zfz4Hbt X-Spamd-Bar: ---- X-ThisMailContainsUnwantedMimeParts: N 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 exp= eriences with poudriere overlay dire? Pat