From nobody Tue Mar 28 10:00:05 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 4Pm4tK5kmHz41hWN for ; Tue, 28 Mar 2023 10:00:09 +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 4Pm4tK5C33z486q for ; Tue, 28 Mar 2023 10:00:09 +0000 (UTC) (envelope-from zirias@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679997609; 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=2u5ZAEamPhYPzdLGyrKE7BBnXqLjlp84X1mCCMk/VTY=; b=Xh53LrM/IYQaTKNLW87POYebMszv4qcJzVJ7E9J6xE/lXIZHjVzYaJZKC07FNAdxWW1acf EuzbygstHkb2ZhoEEoMRJQQPd1SsKJfX2jDlFAlZo046f8lsccPjecwWlQC7rLlhkrKtxO 8G9xnroRM3w7jxhkaSnuS2Zx8jlUpmAPbKIJdVQ8RnPw7t7jTI/c77JWoHGmv+G+XQMEN2 bnur1leEbzb/7nQTOnW/jwesKtxmmwwj0HHJP/l404ugSIoFSskfWsXqZjEoKWGlbSPft2 7qYSi9yvEUd4E1O9QlXbQKqwNORN+7CfKihBJ2XFsO39qKpis33hhyf3NcJPKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679997609; 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=2u5ZAEamPhYPzdLGyrKE7BBnXqLjlp84X1mCCMk/VTY=; b=HD7bzU2DT3IRp39mjGXp+9ai1TnnXN5Kg7ZQFF+vc9Vnhc9EfSO6JspOX89DGVnJBmGuUT LoDyw3iJ4Ma0wjVBvxT8FpoK6f2vPxJoUvJEHiJRiQpY2XkumWnguarNPm9pMGyRjVPf8Y zNaqDGKs+7vHPsljUXiVbPYnGCV+2WWFRqnzj0Gz/Cgroj7s08uD3KU4wSknTmLVQOAqbO f4tbj1vF0VsY2iWsqXlTwNG/QlxYyYyiO5tYRr7QfFK44nvP6Sei0TliDELOVx9fTU5ZLG HuMMmJ9hsk5cpmQNGAiVVDdOPHn7HsRlrCeFPPChQEc67+SjVho4O1m+ttfCgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679997609; a=rsa-sha256; cv=none; b=cuQIB8msH2wh/z4nYhTyHmQ83OCRsJDVYXVEOHJ/5Kgf/hwwGk+VYy4HqCeVmHZ3Iw6RH2 cdiamxQxVTHKVOdbKEXnEZNodtgjF5PRmSAV+sfiBUjlQpgZ1Wjm2RmR5croYYTah04kH2 dmevqtQcL7Egj5igoUkjUNFPe+KaZwFqx/m0ZDyngeWje082nvIA+2Wu9/YWpzu4uQHocu wOWUt+44zXHEkUOTtD7sMjwOejnyRBBai6ucp7fTQ9CPzCxPbZFrX4mNNzqRengWfwYIYV qy0j0hYqniZBM4tRhm9Ay3/UWQRkd/Z2onOjX5O17qRtX6yyEuCywu/14QY/3A== 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 4Pm4tK47tlzYtK for ; Tue, 28 Mar 2023 10:00:09 +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=2u5ZAEamPhYPzdLGyrKE7BBnXqLjlp84X1mCCMk/VTY=; b=NjmoAgB5XZfMg+borvrVy0K7fz lhp0+Zpw79WTvFWhVRfe7YWOQEOX/4dDlV2HKLCHiJS5NvJ0ydUnBiH02dqSoZ2apCLD1VYLBDmFL iCScuSqmrQ3AT8sb/GP3O/UwEwO/B7rZadqpvh3AyoJuKvO4thfew73RSQlKFOUl2boZGZxQyU9mS +xwVAEHVe2E906rWy6oXvIkcqtU3qUrYbsr2gJfsK3ATf3cIgUXM13rH6S+1SDH+SrskYn0ymyHZY Hxtn7BhRwV5Mz+Zy1RYGeHRQWIgMs4QcwZA1aJ0yMFKvQVggMbyWMQbbbE00xyqMVcrCXsko4YWej sbS1VVWg==; 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 1ph67b-002oHS-1G for freebsd-hackers@freebsd.org; Tue, 28 Mar 2023 12:00:07 +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 1ph67a-000Hqx-LX for freebsd-hackers@freebsd.org; Tue, 28 Mar 2023 10:00:06 +0000 Date: Tue, 28 Mar 2023 12:00:05 +0200 From: Felix Palmen To: freebsd-hackers@freebsd.org Subject: Re: what's the Correct git update method keeping local changes Message-ID: <20230328100005.63necvdkvx4y7zyo@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: <20230328035507.9B8632CD@slippy.cwsent.com> 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="7nkp2fbrsmgnrkf3" Content-Disposition: inline In-Reply-To: <20230328035507.9B8632CD@slippy.cwsent.com> User-Agent: NeoMutt/20220429 X-ThisMailContainsUnwantedMimeParts: N --7nkp2fbrsmgnrkf3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Cy Schubert [20230327 20:55]: > I maintain my own branch which contains my patches. In fact I maintain a= =20 > branch for each patch. I then do a git cherry-pick from each patch branch= =20 > to my own branch. +1 for just maintaining your local branch, that's the cleanest way to do it. Git is pretty flexible, so many variations are possible. I personally do it the other way around, I just have two branches, "local" and "wip", with local containing anything I want to include in my poudriere bulk builds and "wip" containing other development stuff. For putting something up for review, I create a new branch from "main" and cherry-pick the relevant commits from "local" or "wip". Updating my branches is as simple as git checkout local git fetch upstream main:main git rebase main (and similar for my "wip" branch if it currently contains something) There, "upstream" is my remote pointing at the official ports repository hosted on freebsd.org. --=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 --7nkp2fbrsmgnrkf3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iNUEABYKAH0WIQRpNhPVW79IN7ISOsxUreAGmHnyMQUCZCK6nl8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0Njkz NjEzRDU1QkJGNDgzN0IyMTIzQUNDNTRBREUwMDY5ODc5RjIzMQAKCRBUreAGmHny McHSAQCM3DBpvOPJVPuKAcBOsLeVC5P4KWuHbO+cC4u36G/tNAEA+KdtWhWb2iwR kLm18iODmUiKMex5dJODNiBxg2gTqAc= =JZFf -----END PGP SIGNATURE----- --7nkp2fbrsmgnrkf3--