Date: Wed, 21 Apr 2021 21:42:49 +0200 From: Matthias Andree <mandree@FreeBSD.org> To: Jan Beich <jbeich@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: Re: git: 08c22f24c94d - 2021Q2 - security/openvpn: security update to v2.5.2 Message-ID: <8a90f09f-d911-d6dd-fe2f-d61caa80cc87@FreeBSD.org> In-Reply-To: <7dkv-sctr-wny@FreeBSD.org> References: <202104211749.13LHnDok003531@gitrepo.freebsd.org> <129910f9-cab1-c219-e8d5-52fd3776e429__24805.0403710053$1619027639$gmane$org@FreeBSD.org> <7dkv-sctr-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Am 21.04.21 um 20:38 schrieb Jan Beich: > Matthias Andree <mandree@FreeBSD.org> writes: > >> Am 21.04.21 um 19:49 schrieb Matthias Andree: >> >>> The branch 2021Q2 has been updated by mandree: >>> >>> URL: https://cgit.FreeBSD.org/ports/commit/?id=08c22f24c94d9310d984e2ce0aa3c840bb5accd2 >>> >>> commit 08c22f24c94d9310d984e2ce0aa3c840bb5accd2 >>> Author: Matthias Andree <mandree@FreeBSD.org> >>> AuthorDate: 2021-04-21 17:46:21 +0000 >>> Commit: Matthias Andree <mandree@FreeBSD.org> >>> CommitDate: 2021-04-21 17:48:38 +0000 >>> >> ... >>> (cherry picked from commit 6271ca01ce9d0733b650b42cdf98813b27758370) >> >> Lesson learned: >> pull --rebase and push main first, then cherry-pick the MFH. > > Or use "git push --atomic freebsd main 2021Q2". From manpage: > > --[no-]atomic > Use an atomic transaction on the remote side if available. Either > all refs are updated, or on error, no refs are updated. If the > server does not support atomic pushes the push will fail. > > I did test this e.g., d149560bb859 (regular multi-branch push) and > 0328b140894b (multi-branch with --atomic). > Thanks for the suggestion, but this would not have helped. Sequence was: * pull main * update vuxml and commit * update openvpn, test, test some more, poudriere builds, fixups, commit [in the meanwhile, people pushed to main] * checkout 2021Q2 and pull * MFH. i. e. cherry-pick one commit from main. * checkout main and pull so I can push => at this point, the rebase changed the commit hash of my two commits rendering the "cherry picked from commit ..." obsolete * I pushed The flaw in the sequencing is that the local reference on main that I cherry-pick from is unstable until I've pushed. TL;DR take-away message: Really only cherry-pick from references you've successfully pushed out into the public.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8a90f09f-d911-d6dd-fe2f-d61caa80cc87>