From nobody Tue Mar 28 03:19:19 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 4Plvzw528yz42Ttk for ; Tue, 28 Mar 2023 03:19:24 +0000 (UTC) (envelope-from void@f-m.fm) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (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 4Plvzv4NMTz3CX2 for ; Tue, 28 Mar 2023 03:19:23 +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=SWImWw4B; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=idXsMT7K; spf=pass (mx1.freebsd.org: domain of void@f-m.fm designates 66.111.4.26 as permitted sender) smtp.mailfrom=void@f-m.fm; dmarc=pass (policy=none) header.from=f-m.fm Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 198875C01DC for ; Mon, 27 Mar 2023 23:19:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 27 Mar 2023 23:19:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=f-m.fm; h=cc :content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm2; t=1679973562; x=1680059962; bh=ZzdW/9Zwan36bt+C3uo/I6yfU 692vnGN2SvO5MTQRos=; b=SWImWw4BNW48WEQhWPxf8Uw7nvSIPTvk/VXDLdt8Z hVcsXsL2hWtwRz4KfSfcamGJrQbmEOZCIHVSu9nLf0pbSndGSsjKNLOZzHXti6Fz W9eyeLFsBDUWlvPI4OziBRKZ2PJ8AF8BrsbEtahNAzSrDbr3wmMDmVEfafjpmxeJ Mlf+0RiDNTqWZZ/9RF85f7zYVocbMzqVAvlxg+PMWm+OaSSlkW6QcMYUXhv6NzCL sNxuDbRFlj1b1FnIHS5qZvOx/70wFtV96wLOnmCx1DvDIQ5GdhTO84AX2rYtRFW6 XMovw4GMCw86yxGqEJI/RGic32dJQo1V475hIg9t/WTQg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version: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= 1679973562; x=1680059962; bh=ZzdW/9Zwan36bt+C3uo/I6yfU692vnGN2Sv O5MTQRos=; b=idXsMT7KrQO3Dd6nUCSICciNeeQ7hiAortsC0+nc9jqHmMWwEPP 1nNe0MJJRk6eEs/v1CQ2IuEkvt5Gqj7lQ+1TEKNXTnkhlUI7/AzuD37O4M1VNMPt ZBYCYixP/uA4exbRUd/sWpt5SqLxO1Y506j6HS2XzHbyxdtZY6iGTLVcmxzmHrDu H5dYF+zO+n6xPIk6kxBzrwK8maxuFv57Q5n5uqz+ByihF3p2vVD6A3zWKc7evWfi eVSkHJ3wmy3ZGj0E2cxW22/kCLfynp+tiZvMrDf1WBjNEJJSdDpQs7itlii15nE4 uFceoAgJ5B2Ybvd1Amav57arL4UMdoUMukg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehfedgjedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkgggtugesthdtredttd dtvdenucfhrhhomhepvhhoihguuceovhhoihgusehfqdhmrdhfmheqnecuggftrfgrthht vghrnhepveduffeivdfffffghfegfeejfefftdeiteehteekfefhvdefgfettdeuheegff eunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepvhho ihgusehfqdhmrdhfmh X-ME-Proxy: Feedback-ID: i2541463c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 27 Mar 2023 23:19:21 -0400 (EDT) Date: Tue, 28 Mar 2023 04:19:19 +0100 From: void To: freebsd-hackers@freebsd.org Subject: what's the Correct git update method keeping local changes Message-ID: Mail-Followup-To: freebsd-hackers@freebsd.org 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=us-ascii; format=flowed Content-Disposition: inline X-Spamd-Result: default: False [-4.17 / 15.00]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; MID_RHS_NOT_FQDN(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[f-m.fm,none]; NEURAL_HAM_SHORT(-0.47)[-0.473]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.26]; R_DKIM_ALLOW(-0.20)[f-m.fm:s=fm2,messagingengine.com:s=fm2]; RWL_MAILSPIKE_GOOD(-0.10)[66.111.4.26:from]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.26:from]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:19151, ipnet:66.111.4.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: 4Plvzv4NMTz3CX2 X-Spamd-Bar: ---- X-ThisMailContainsUnwantedMimeParts: N Hello hackers@ I looked in the porters and developers handbooks and couldn't find reference to a Correct method of working with git, poudriere, the ports tree and local changes for a use case like mine. Right now my workflow looks like this: 1. apply patch either with patch -p0 < patchfile or git apply from the top of the ports tree 2. git stash 3. poudriere ports -u -q 4. git stash pop 5. run the poudriere build then, subsequent poudriere builds need steps 2-5 repeated. I'm wary of git merge/apply because i'm not a dev and so don't want to push changes. but I want to update the ports tree for poudriere with local changes keeping them local. What's the best way? --