From owner-dev-commits-ports-branches@freebsd.org  Wed Apr 21 19:42:52 2021
Return-Path: <owner-dev-commits-ports-branches@freebsd.org>
Delivered-To: dev-commits-ports-branches@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 4FCDE5F004A;
 Wed, 21 Apr 2021 19:42:52 +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 4FQWDX1mmLz4QvF;
 Wed, 21 Apr 2021 19:42:52 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from mandree.no-ip.org
 (p200300d0273ba9003a4f9af3ce9e76c6.dip0.t-ipconnect.de
 [IPv6:2003:d0:273b:a900:3a4f:9af3:ce9e:76c6])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 (Authenticated sender: mandree/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 10C452A79B;
 Wed, 21 Apr 2021 19:42:52 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from ryzen.an3e.de (localhost [IPv6:::1])
 by ryzen.an3e.de (Postfix) with ESMTP id 500CC120647;
 Wed, 21 Apr 2021 21:42:49 +0200 (CEST)
Subject: Re: git: 08c22f24c94d - 2021Q2 - security/openvpn: security update to
 v2.5.2
To: Jan Beich <jbeich@FreeBSD.org>
Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-branches@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>
From: Matthias Andree <mandree@FreeBSD.org>
Message-ID: <8a90f09f-d911-d6dd-fe2f-d61caa80cc87@FreeBSD.org>
Date: Wed, 21 Apr 2021 21:42:49 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.8.1
MIME-Version: 1.0
In-Reply-To: <7dkv-sctr-wny@FreeBSD.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: dev-commits-ports-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the quarterly branches of the FreeBSD ports repository
 <dev-commits-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-branches>, 
 <mailto:dev-commits-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-branches/>
List-Post: <mailto:dev-commits-ports-branches@freebsd.org>
List-Help: <mailto:dev-commits-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-branches>, 
 <mailto:dev-commits-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Apr 2021 19:42:52 -0000

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.