Date: Tue, 28 Mar 2023 09:02:33 +0000 From: Lorenzo Salvadore <developer@lorenzosalvadore.it> To: freebsd-hackers@freebsd.org 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: <FkkyZaL6kjODtysaVKCCoEMPqsLE3k7MBxrnCW3Pm10xfRFNWTA5POLBeNOHWWrUAN3KGsHqvw0cplX4i-rg-DIcsACg4onX60DIWbJJ_Ho=@lorenzosalvadore.it> References: <ZCJct8nsBSABpKOL@int21h> <708822f5-2a2f-35f7-8f79-bf48ff644a22@FreeBSD.org> <FkkyZaL6kjODtysaVKCCoEMPqsLE3k7MBxrnCW3Pm10xfRFNWTA5POLBeNOHWWrUAN3KGsHqvw0cplX4i-rg-DIcsACg4onX60DIWbJJ_Ho=@lorenzosalvadore.it>
next in thread | previous in thread | raw e-mail | index | archive | help
------- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4IA4uMvgbs6IP7g48WgKrv0HhDF-NDuLE4SYSuGlJGG7QcCUzl-OSTKiwkjd3GboJO_bE2lQZJ_Y6bRt2lfWw8VY-EtkONHgXg3EX2YLquI=>