Hey David, On Fri, Feb 19, 2010 at 12:29 PM, JuanJo Ciarlante <jjo...@google.com> wrote: > Hey David, > > On Fri, Feb 19, 2010 at 12:14 PM, David Sommerseth > <openvpn.l...@topphemmelig.net> wrote: >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 >> >> On 18/02/10 22:45, JuanJo Ciarlante wrote: >>> On Wed, Feb 17, 2010 at 6:46 PM, JuanJo Ciarlante <jjo...@google.com> wrote: >>>> > Hi David, >>>> > >>>> > On Tue, Feb 16, 2010 at 7:49 PM, David Sommerseth >>>> > <openvpn.l...@topphemmelig.net> wrote: >>> >>> Greetings all! >>> >>> I am now announcing the openvpn-testing.git tree as open. Gert has >>> already been announcing the availability as a response to some merge >>> conflicts. Anyhow, those issues are solved. >>>>> > >>>>> > \o/ ! >>>>> > >>> >>> The tree is also tagged with all 2.1 releases and RC releases. I have >>> not bothered with tagging the 2.1 beta or any 2.0 releases at all. If >>> somebody finds it useful and wants it, please generate a list of tag >>> names and commit ID's and I'll update the tree. >>> >>> >>> What's next: >>> >>> - JuanJo Ciarliante's IPv6 patches for the transport layer. >>> There are some merge conflicts here as well, which we need to solve. >>> It's most probably due to different merge roots between our copies of >>> the SVN tree. I hope JJO and I can solve this soon, then it will go >>> into the allmerged branch immediately. >>>>> > >>>>> > Cool, thanks a lot for the heads-up. >>>>> > >>>>> > I'll try to solve this before by next week, >>>> I've just did a cut+merge, fyi I had to use: >>>> git-format-patch -k --stdout stock..master |git-am -3 -k >>>> (stock: my svn-import'd tree, master: my local head) >>>> , worked fine (b/c of the different svn-import history(?), >>>> git could not find a common ancestor, then the need >>>> to fallback to "diff | patch"). >>>> It also successful passes my tests as stated in README.ipv6. >>> >>>> I've pushed this to my github repo, so something in the >>>> lines of: >>>> git-remote add -f -t openvpn-testing-master+jjo-ipv6 \ >>>> jjo-ipv6 git://github.com/jjo/openvpn-ipv6 >>> >>>> +merge should be able to fast-forward your master >>>> head. >>> >>>> I still need to do some touches for allmerged, as >>>> we conflict w/ Gert's IPv6 patch on a mroute.c chunk >>>> IIRC. >>> >> >> Great! Thank you for your work here! >> >> I've created an feat_ipv6_transport branch where I'll track your >> patches. Gert's IPv6 patches are in feat_ipv6_payload (which are also >> merged into the allmerged branch). I've started the discussion about >> the merge conflict in another mail thread. > > Coooool ! , tnx a lot. > >> >> It's all pushed out to the openvpn-testing.git, so please feel free to >> update me when you have solved these issues or have other updates!
I've added a new openvpn-testing-allmerged+jjo-ipv6 branch with the conflict resolved at git://github.com/jjo/openvpn-ipv6, it should cleanly fast-forward allmerged's head. Thanks again for all your work on this! > > I expect to find time during the weekend to resolve the small conflict > and be able to inject-da-zing into allmerged. > >> >> >> kind regards, > > Cheers, > >> >> David Sommerseth >> -----BEGIN PGP SIGNATURE----- >> Version: GnuPG v1.4.10 (GNU/Linux) >> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ >> >> iEYEARECAAYFAkt+crAACgkQDC186MBRfroDNgCgsZwPBeAFzR44FB34Xv0HInAr >> 46EAoKZtDgoSvqQIzpQu5XNEygaA7ccs >> =rqXo >> -----END PGP SIGNATURE----- >> > > > > -- > --JuanJo ; echo j...@gomosglep.com | sed 's/[SPAM]//g' > -- --JuanJo ; echo j...@gomosglep.com | sed 's/[SPAM]//g'
