Hi, On Sun, Mar 29, 2020 at 11:54:36PM +0200, David Sommerseth wrote: > > Applying: Reformat all source files > > error: patch failed: src/openvpn/tun.c:3418 > > error: src/openvpn/tun.c: patch does not apply > > Patch failed at 0001 Reformat all source files > > Ahh, sorry ... I did the reviews based on Arne's github tree [1], so I could > compile test them. And I trust him enough to not do any stupid stunts in his > tree. His icsopenvpn branch has all of the stuff I've reviewed; that branch > rebased against our latest master without any hickups. > > Unfortunately git apply is (rightfully) super picky about conflicts. > > Not sure now what would be the best approach forward. Picking the commit > contents from a rebased icsopenvpn branch would be one way (I can provide > commitish references I reviewed, if needed). Another approach is for Arne to > resend rebased patches to ML.
Well, our current defined process is "we review, test and merge *exactly*
what is on the list".
So, ACKing list patches based on "some other tree" is doubtful at best
(for initial review and discussion, fine, but for the final ACK?), and
"have something on the list and then merge something else" is also
clearly violating the "everything must be transparent, and no code changes
compared to what is archived in a public archive".
We can change this, of course, but even then it needs to be fairly
transparent what was exactly was ACKed and merged (and what, if anything,
was changed between ACK and merge).
It would make my life easier to be able to do minor code changes on
the fly, or do larger adjustments like for the argv<->tun.c adjustments,
but we need to be very clear that we change the process.
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
