On Thu, Apr 21, 2005 at 06:27:03PM -0600, James Yonan wrote: > I would like to merge your IPv6 patch into the 2.1 branch, once it gets > started (I'd like to keep the 2.0.x branch as stable as possible, with > minimalistic changes that don't go beyond bug fixes and small patches). > > One potential speed bump will be in merging both IPv6 + the multihomed > patch which will definitely be going into 2.1: > > http://openvpn.net/patch/openvpn-2.0_rc16MH.patch > > Because both patches touch much of the same code, there will likely be a > need for manual merging.
Ok ... indeed I tested "patch --dry ..." and shouted about 80% rejects. I could merge both in my own CVS, but because it's a rather daunting task, I would like to be sure it's a productive one :-) ie. that it will have a high chance to be merged , of course, if resulting patch quality qualifies. Regards... -- --Juanjo # Juan Jose Ciarlante (JuanJo) jjo ;at; mendoza.gov.ar # # GnuPG Public Key: gpg --keyserver wwwkeys.eu.pgp.net --recv-key 66727177 # # Key fingerprint: 0D2F 3E5D 8B5C 729E 0560 F453 A3F7 E249 6672 7177 #
