From nobody Tue Mar 28 10:52:32 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 4Pm62q3zRYz41lck for ; Tue, 28 Mar 2023 10:52:35 +0000 (UTC) (envelope-from zirias@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 4Pm62q3Xdtz4KGW for ; Tue, 28 Mar 2023 10:52:35 +0000 (UTC) (envelope-from zirias@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680000755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Vwhv8UeXBnNxTtSnv7C9fPLKL64bw/NU52YPwF93gEs=; b=BxpMUz4xTyhQANH0gW3j8qwEHB6TOGvKDXX2S+EITHBSwxqkcApq714FOM0jgOSPmwh0qa 85kPGsahBstCMgr6T1+A0f4aDYqB91/bpOMSdO3XpdgScmtAUlpaaIwX0z37wVxbnMYYhA TUvk5ZzaIPhZBZZZMHhqBFQDLsjEXzsgb5QVYqPK9KG6Pb6udrd/zHu9JxSCfbBEUPiQpZ T6E4qvwQn5xt1xu2/3x4C61f6tZTUZvoY/t7CwoXqGX4O6zN9YZgkvVqA05WEw6rYtJ5+J PmeOJ2/bqHsnaF3JjtrDW61hPxYH15MONwlpPKRrAsFIKrhnBlKlHGhrEtecSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680000755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Vwhv8UeXBnNxTtSnv7C9fPLKL64bw/NU52YPwF93gEs=; b=Y76xV5CQSrlHBzojGJM3QITAH7PmDycn1eHsXfhIA+mZmefNGNdFcuXErEokv0evYzX4NS A1dka4zc8ZBVXPpZEGp1/vL+kpt2UjA2BA/Lg/35awKTRcQteSGOaM7nnE5/qQyi9qC9Pq jz+6sn+hg1Kf6MALsUtyHWomUq2by3MRcND3eoNsBPr+j5n8EMUkUME6zNrD+XkMvpMBCs zv5kHcSgl+oc38LchWrrrEG8uC6yu8iRpHW+0x66nz2Khfp3n3LD4LHkn/AnWtX2KVU0dL 8bifVivrJiX2j08RWXYDbYRXlQx9VUzy178eJIYO2R1BukPo1yPLZWCKP+IqDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680000755; a=rsa-sha256; cv=none; b=sokiHMktE8ZB5GvlO54jsfDnY8KEH2DmKz0URDlY8XJzUnIWPcoTmaurpdj8mAJvRdVvey h84R4saDfpPvsx3hC9C5rfXL7CdZ4v0d9tpQK6FYMPCIqXDmsgrx6Tal1a2CE0VyX96nFd rTosJhnDEiQkglwRD+v/V/QHfpjiiVCXvXY+E1afUK2Y45IMkbIJJiSWp7/SDna2eQ2luE crHo7ivAjkJSEl8MkjHmYbE85YWAUF8U/mdg/oZ6u/AfER3vT0shzuhij60rqzC0D1etxK BPOmcwrjCjkWqdMAErPTgDXY4ibMEwS0ZeCG1YM3XgLrEF0K4VC7jmu0YieVJA== Received: from stef.palmen-it.de (stef.palmen-it.de [IPv6:2001:470:1f0b:bbb:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: zirias/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Pm62q2cM5zbct for ; Tue, 28 Mar 2023 10:52:35 +0000 (UTC) (envelope-from zirias@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=palmen-it.de; s=20200414; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:To:From:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Vwhv8UeXBnNxTtSnv7C9fPLKL64bw/NU52YPwF93gEs=; b=KAvhIVvDia9hMgwEJXUeBN2GoJ YAU6K8vLpa5DgGkLS9MoqcO9aC/pXEqVdvRDA/v01iVkUQRMdrXPbIzFruLymqXCG5y2Qw8dSQSze 4hbVG27RAHp5HiObOR7Qal3cnBDjYKUMaoVlrkQ1WSt7L4lEbiKRiLb9fqQXX5SiasMGhJltUB3Vy T6+miHOoB+YWXlq1Japah5u9waTG6PZ+lDow+tb+n9msR/Ed4iv/rMVTrOZaVsF3WYkIO7rIsvXsS w/wD752WCaE9AcmM8o0vhKqX7ItbU/U4VlraiG5uyvadDjxiZhCDna9b/Cgq13AzRIfZnaMEek/Z7 7O4dqMjg==; Received: from [192.168.71.101] (helo=mail.home.palmen-it.de) by stef.palmen-it.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ph6wL-002oUv-95 for freebsd-hackers@freebsd.org; Tue, 28 Mar 2023 12:52:33 +0200 Received: from nexus.home.palmen-it.de ([192.168.99.2]) by mail.home.palmen-it.de with esmtpsa (TLS1.3) tls TLS_CHACHA20_POLY1305_SHA256 (Exim 4.95 (FreeBSD)) (envelope-from ) id 1ph6wK-000I7N-S0 for freebsd-hackers@freebsd.org; Tue, 28 Mar 2023 10:52:32 +0000 Date: Tue, 28 Mar 2023 12:52:32 +0200 From: Felix Palmen To: freebsd-hackers@freebsd.org Subject: Re: what's the Correct git update method keeping local changes Message-ID: <20230328105232.dfzw4i3gqfgs47s5@nexus.home.palmen-it.de> Mail-Followup-To: freebsd-hackers@freebsd.org X-Face: /1K@t"h.}e~pR@]c7HorQ!T`F^RJCa'BCr#e>IKA{>C/9OTGB4|xh"y2{?1Z5M i2w"AH^pN_LlHR^{+f',_Np~;.B;!M/bL}*qk]p5*r7F5vW};{:@4u5S?T&f0$7BJ-71Q5SV]:v$`5 A0[DZ:=?S52x8HJ~5@^P_\T@MsjG{R( Organization: FreeBSD.org References: 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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="jyc5evhifvn5l6dk" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20220429 X-ThisMailContainsUnwantedMimeParts: N --jyc5evhifvn5l6dk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Pat Maddox [20230328 03:37]: > On Tue, Mar 28, 2023, at 1:39 AM, Warner Losh wrote: > > > > I use the rebase workflow for pending ports commit work. >=20 > Most of the replies say something similar. What are people=E2=80=99s expe= riences with poudriere overlay dire? Overlays are a completely different approach for "local changes" and independent from the SCM used (currently git). My 2=C2=A2: I'd say using local git branches is much more flexible and fits my personal workflow best, as I can just cherry-pick to actually commit something or put it up for review on phab. If I would use overlays locally, I'd have to manually copy over code. IMHO, a good usecase for overlays is if you need some shared staging area for a team, very much like the libreoffice team uses it. --=20 Felix Palmen {private} felix@palmen-it.de -- ports committer (mentee) -- {web} http://palmen-it.de {pgp public key} http://palmen-it.de/pub.txt {pgp fingerprint} 6936 13D5 5BBF 4837 B212 3ACC 54AD E006 9879 F231 --jyc5evhifvn5l6dk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iNUEABYKAH0WIQRpNhPVW79IN7ISOsxUreAGmHnyMQUCZCLG8F8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0Njkz NjEzRDU1QkJGNDgzN0IyMTIzQUNDNTRBREUwMDY5ODc5RjIzMQAKCRBUreAGmHny MVZcAP9I8cN2jVuDzbSHaGm0yWi/TIL7wyqa67RDD78NP92l3QD/ahoV1gpLa563 S5PA4SyrWumTGtApNHPNRAsi/3LGqgs= =4Ygt -----END PGP SIGNATURE----- --jyc5evhifvn5l6dk--