Hi, Il 29/08/2016 12:10, Bojan Komazec ha scritto: > Thanks a lot Samuli. > > I cloned "openvpn-build" repo yesterday and created my patch branch off > the last commit on "release/2.3" but after reading your email I checked > it out again and saw that my "release/2.3" was actually 1 commit behind > the origin. I am still trying to understand how this difference happened > but yeah, my patch is not necessary.
I had made essentially the same change as you did in my local "release/2.3" branch, but had forgotten to push it to the official repository. I did that push after seeing your email, which probably explains this. > Regarding the contribution process, I was > reading https://community.openvpn.net/openvpn/wiki/CodeRepositories page > which states: "All bug fixes should be developed against the master > branch, and where it is decided to include such fixes in a minor release > (2.1.x, 2.2.x, etc), it will be cherry-picked from the master branch and > into the suitable release branches.". This is what made me thinking I > should create a patch for "master" rather than "release/2.3". Did you > suggest using release branch as a target because my patch was not a bug > fix (but a simple build parameter update)? No. As David said, the CodeRepositories page is about OpenVPN core mostly. I will check if the documentation there could be improved to make things more clear. The reason I think your patch should only go to "release/2.3" branch is that building OpenVPN 2.3.12 with openvpn-build "master" branch makes little sense due to the incompatible changes made to openvpn.nsi between 2.3.11 and 2.3.12. Arguably we could add openvpnserv2 to 2.3.x, but I would rather focus on getting 2.4.0 out. -- Samuli Seppänen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock ------------------------------------------------------------------------------ _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
