From nobody Tue Mar 28 09:02:33 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 4Pm3c4544Kz41d8d for ; Tue, 28 Mar 2023 09:02:44 +0000 (UTC) (envelope-from developer@lorenzosalvadore.it) Received: from mail-4018.proton.ch (mail-4018.proton.ch [185.70.40.18]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pm3c33Zn8z44fD for ; Tue, 28 Mar 2023 09:02:43 +0000 (UTC) (envelope-from developer@lorenzosalvadore.it) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=lorenzosalvadore.it header.s=protonmail2 header.b=hxggtIGk; spf=pass (mx1.freebsd.org: domain of developer@lorenzosalvadore.it designates 185.70.40.18 as permitted sender) smtp.mailfrom=developer@lorenzosalvadore.it; dmarc=pass (policy=quarantine) header.from=lorenzosalvadore.it Date: Tue, 28 Mar 2023 09:02:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lorenzosalvadore.it; s=protonmail2; t=1679994161; x=1680253361; bh=PO2G/e6FG3HdIUPQNUrRlzkug61xv3yVMDj483DXuiY=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=hxggtIGkxmR7/KRrFuv3YuMLr5yC/vRSTM5oq+2CJ4UKGRi+UIX25nMZwqhm1hoi8 WJIf7wzjIZd+APGBFWQmXkxGimitq2JTdtZg49IyF2mieuuzcPLNXsqr2dWxwtwwYQ 34ntpe3mw5dq84VmZCjVpkn5G+VVrB/qWrnpU8g1ItgtE2B0dnjYG0oGdkar8mGtBk yzD/QlQK+R4dOrxt/MaGJon0KRTv0mSxJXqUCfXCi/0Lb7DMMapU+Sph3sDzVL9XfQ 3qSn9x8GzS/mZswxTJ+LVnTBzDSwOOaf7Xg08Dtp67DGecjpQkGB0/RBa4pP6eZ1HH +aBLrQ//OkxhA== To: freebsd-hackers@freebsd.org From: Lorenzo Salvadore Subject: Re: what's the Correct git update method keeping local changes Message-ID: <4IA4uMvgbs6IP7g48WgKrv0HhDF-NDuLE4SYSuGlJGG7QcCUzl-OSTKiwkjd3GboJO_bE2lQZJ_Y6bRt2lfWw8VY-EtkONHgXg3EX2YLquI=@lorenzosalvadore.it> In-Reply-To: References: <708822f5-2a2f-35f7-8f79-bf48ff644a22@FreeBSD.org> Feedback-ID: 53711648:user:proton 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 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.997]; DMARC_POLICY_ALLOW(-0.50)[lorenzosalvadore.it,quarantine]; R_SPF_ALLOW(-0.20)[+ip4:185.70.40.0/24:c]; R_DKIM_ALLOW(-0.20)[lorenzosalvadore.it:s=protonmail2]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ZERO(0.00)[0]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:62371, ipnet:185.70.40.0/24, country:CH]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[lorenzosalvadore.it:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4Pm3c33Zn8z44fD X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N ------- Original Message ------- On Tuesday, March 28th, 2023 at 9:59 AM, Matthias Andree mandree@FreeBSD.or= g wrote: > Am 28.03.23 um 05:19 schrieb void: >=20 > > Hello hackers@ > >=20 > > 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. > >=20 > > Right now my workflow looks like this: > >=20 > > 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 > >=20 > > then, subsequent poudriere builds need steps 2-5 repeated. > >=20 > > 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. > >=20 > > What's the best way? >=20 > So - there's some discrepancy in your tools there, you are using git to > keep local patches, and poudriere to update. This seems odd. Is > poudriere using git to update your ports tree? Portsnap? Something > else? We don't know. I agree with Matthias Andree, using poudriere to update is odd. I use git worktrees for my workflow. I have three trees: - in one tree I have an exact copy of upstream; - in another tree I have a copy of upstream with my local patches applied; - the last tree is for testing patches with poudriere before I push them or submit them for review. > I'm wary of git merge/apply because i'm not a dev and so don't want to pu= sh > changes. Do not worry about that: if you are not a dev, you do not have the necessar= y permissions to push any change by accident. You can experiment safely. Cheers, Lorenzo Salvadore