From owner-dev-commits-ports-main@freebsd.org Wed Apr 14 21:14:29 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 08B0A5D029B; Wed, 14 Apr 2021 21:14:29 +0000 (UTC) (envelope-from SRS0=uOa1=JL=FreeBSD.org=otis@ns2.wilbury.net) Received: from ns2.wilbury.net (ns2.wilbury.net [IPv6:2a01:b200:0:1:f816:3eff:fecd:13e6]) (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 (2048 bits) client-digest SHA256) (Client CN "svc.wilbury.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FLFbS64yfz4TQy; Wed, 14 Apr 2021 21:14:27 +0000 (UTC) (envelope-from SRS0=uOa1=JL=FreeBSD.org=otis@ns2.wilbury.net) Received: from chemex.owhome.lan (gw-upc.owhome.net [188.167.168.254]) (Authenticated sender: juraj@lutter.sk) by svc.wilbury.net (Postfix) with ESMTPSA id 4393945CFC9; Wed, 14 Apr 2021 23:14:23 +0200 (CEST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: git: 2ef23d42cbce - main - net/wireguard-kmod: Update to 0.0.20210412 From: Juraj Lutter In-Reply-To: <1f958906-7baa-b612-c4e7-3355e1779b07@tu-dortmund.de> Date: Wed, 14 Apr 2021 23:14:22 +0200 Cc: =?utf-8?Q?Bernhard_Fr=C3=B6hlich?= , ports-committers , "dev-commits-ports-all@freebsd.org" , "dev-commits-ports-main@freebsd.org" , Kyle Evans Content-Transfer-Encoding: quoted-printable Message-Id: References: <202104131930.13DJUwl4024751@gitrepo.freebsd.org> <1f958906-7baa-b612-c4e7-3355e1779b07@tu-dortmund.de> To: Matthias Andree X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4FLFbS64yfz4TQy X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 21:14:29 -0000 > On 14 Apr 2021, at 23:07, Matthias Andree = wrote: > You can instead also do this, without doing a separate clone: >=20 > git stash # save your uncommitted changes > git checkout 2021Q2 # switch to quarterly > git pull --rebase # update it > git cherry-pick -x c0decafe deadbeef # "MFH" > git show main.. # REVIEW THE CHANGES! > git push # publish - this is the point of no return > git checkout main # go back to main branch > git pull --rebase # OPTIONAL, update if you want > git stash pop # if you had used git stash >=20 > Yes, this updates lots of files on the "git checkout ". >=20 > Or, if you want to do a shallow clone, you can also reference or share > your existing ports tree to save download time, and you can also do a > sparse checkout, documented earlier (see thread "Git sparse checkout" > thread started by Fernando Apestegu=C3=ADa = on > April 7. Or, if your local environment (disk space mostly) permits, you can use = worktrees and have main and 2021Q2 checked out in separate directories. Then you can cherry-pick using (72b4a1887cc241991ab1b81ace9d3ec392b8ea93 = is the commit in main): otis@b13:/usr/ports-branches/2021Q2 % git cherry-pick -x = 72b4a1887cc241991ab1b81ace9d3ec392b8ea93 [freebsd/2021Q2 fec1d972fb19] sysutils/beats6: Update to 6.8.15 Date: Wed Apr 7 16:29:54 2021 +0200 2 files changed, 4 insertions(+), 4 deletions(-) otis@b13:/usr/ports-branches/2021Q2 % git show fec1d972fb1 commit fec1d972fb19a6f88bb2624dd2865a51f7957c76 (HEAD -> freebsd/2021Q2) Author: Juraj Lutter Date: Wed Apr 7 16:29:54 2021 +0200 sysutils/beats6: Update to 6.8.15 (cherry picked from commit 72b4a1887cc241991ab1b81ace9d3ec392b8ea93) and now you can push. otis=