From nobody Tue Mar 28 07:59:45 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 4Pm2CS0KSrz41YnW for ; Tue, 28 Mar 2023 07:59:48 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pm2CR6ycYz3vYJ for ; Tue, 28 Mar 2023 07:59:47 +0000 (UTC) (envelope-from mandree@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679990388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Otwc8BfnyP6L59n/ekTfOTZd8OPcXCjQHYETJZBhWgg=; b=jl08vCcQsLjDF6PGQTQJ45Qcb8zL+ayApyNqymKklF7YD1Uoc3eJaV0VyVKLQ23OHhU2sY 9RONb4dYj26xSfl8zUcEqw2iuumgJh663BBcsWYVwAwbT2bf182ziaANMmdH03CMByM+i4 wafOahBqlJBSe3JAZfvvcaRuE9e2GXFa8OuXccvNN76U4lWvWfpQiodvdXLFtrn8X6Ulpi XuGS6IX2puhagMTeIDakH1fsWd+CObHKfbamsICz8i2dBiXhLmprSMJdfalHJqABHlXubg BcTxA9yyvNnYgT5J9lQIidf8fnXxr2AmkA2QzXA1HzIIuQLMADa88/yNG60blA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679990388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Otwc8BfnyP6L59n/ekTfOTZd8OPcXCjQHYETJZBhWgg=; b=cIDfXlB8nGR5OHD0t/dnsWIOv9X8NzKjMZBk1zODpnc15Olk81gLBLiCMAVFAsU2aIo4XF cudNHxBGkjO0aA+rN6o2G05yVEvsoqo2N64jiwMgJ5GCu/JoDmhlWMEjBDyKlpKg7K5yet 35fpBfzXouLHuKK20Bt2nvDEgURMFdX+yc7QvK2flBf+C49cJ2ilIzJXmrV9kKi/VsaMdv RPWn6wTfOpjCxET859m0mb6V5TJbho9zmRqhhNcMzEiPrR0U4/EiGe1axt19hlZlbSdUUc GLvoznd2NaoYcZgyE7ouinL1fPszfaPyKKfp1kKfSyp/llDTQxyd5e+GwGaxXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679990388; a=rsa-sha256; cv=none; b=QWkSXokakzA/+bkktyaoM45kzmWa+NlVg/k0BdeAeuUEmR1KmGmblPDJRtzpylC4jXHiIT LRaFyRaOvGD8esTdpEQWubq/hp/Z+AC36DFBiKs092aJ1GNQzEmeObdxEIlOb/SYiyCGax IjUqdV1XLbccCTePTUxINKmoT4JWYWqDBewJMC70bGq9Y5ZHBkAiIAsvv/2pZK4BK/leMR H4klLLzgvxkdWQGGorfLJaM2lb3FX+pETXJKewDPXHIzjLnsdtGZGWi9w5bphKu4GMocZw mvfDEV7LLAAM7/jifTIsuYZRIzFndcBbisYdKVTv4AIb21ruOAT/ikMJ6uLGnw== Received: from mandree.no-ip.org (pd9e073a3.dip0.t-ipconnect.de [217.224.115.163]) (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) (Authenticated sender: mandree/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pm2CR53h9zXTg for ; Tue, 28 Mar 2023 07:59:47 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from [127.0.0.1] (localhost [127.0.0.1]) by ryzen.an3e.de (Postfix) with ESMTP id 0DE6BDC62A8 for ; Tue, 28 Mar 2023 09:59:46 +0200 (CEST) Message-ID: <708822f5-2a2f-35f7-8f79-bf48ff644a22@FreeBSD.org> Date: Tue, 28 Mar 2023 09:59:45 +0200 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 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: what's the Correct git update method keeping local changes Content-Language: en-US To: freebsd-hackers@freebsd.org References: From: Matthias Andree Organization: FreeBSD.org In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N Am 28.03.23 um 05:19 schrieb void: > 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? 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 personally do not use poudriere ports -u, in fact I am maintaining my /usr/ports in Git (but then I occasionally push from my tree into FreeBSD's), and poudriere knows the ports tree with a "null" method, and then 2...4 become a simple "git pull --rebase --autostash". > $ poudriere ports -l > PORTSTREE METHOD TIMESTAMP PATH > default null 2023-03-27 05:59:35 /usr/ports -- Matthias Andree FreeBSD ports committer