well, not sure how we can merge pull request btw (I know maven does it but they have some infra, not sure we have ATM), the easier is to send us (attaching it to jira) a patch we can apply from the tomee trunk (patch -p0 < yourpatch.patch). Romain Manni-Bucau Twitter: @rmannibucau Blog: http://rmannibucau.wordpress.com/ LinkedIn: http://fr.linkedin.com/in/rmannibucau Github: https://github.com/rmannibucau
2014/1/8 Ivan St. Ivanov <[email protected]>: > Hi folks, > > That is what I tried to ask in the first message in this thread: > > - I rebased my local branch to trunk, then I added my commit and pushed it > to github. Then I created a pull request. However github wants to merge it > to apache/tomee-1.5.2, together with 906 other commits. I don't know how to > make it go to trunk > > Cheers, > Ivan > > > On Wed, Jan 8, 2014 at 11:17 AM, Romain Manni-Bucau > <[email protected]>wrote: > >> Hi >> >> https://github.com/apache/tomee/pull/2/files seems a pretty big diff, >> are you sure you rebased correctly? >> Romain Manni-Bucau >> Twitter: @rmannibucau >> Blog: http://rmannibucau.wordpress.com/ >> LinkedIn: http://fr.linkedin.com/in/rmannibucau >> Github: https://github.com/rmannibucau >> >> >> >> 2014/1/8 Jean-Louis MONTEIRO <[email protected]>: >> > Ivan, >> > >> > Creating a patch file is really trivial. Just add ".patch" at the end of >> > the URL you gave me. >> > The main issue there is that your pull request is currently also >> including >> > a lot of more changes. >> > >> > Jean-Louis >> > >> > >> > 2014/1/8 Ivan St. Ivanov <[email protected]> >> > >> >> Hi Jean-Louis! >> >> >> >> Here is the pull request: https://github.com/apache/tomee/pull/2 >> >> >> >> I would appreciate if you tell me how to create the patch myself :) >> >> >> >> Thanks, >> >> Ivan >> >> >> >> >> >> On Wed, Jan 8, 2014 at 10:27 AM, Jean-Louis MONTEIRO < >> [email protected] >> >> >wrote: >> >> >> >> > Hi Ivan, >> >> > >> >> > The JIRA is affected to you now and I added you as a contributor. >> >> > We did not switch yet on git. That's why I asked for a patch instead >> of a >> >> > pull request. >> >> > >> >> > Can you give me the link of the pull request? >> >> > >> >> > Thanks >> >> > JLouis >> >> > >> >> > >> >> > 2014/1/7 Ivan St. Ivanov <[email protected]> >> >> > >> >> > > Hi Jean-Louis! >> >> > > >> >> > > Thank you for the answer! >> >> > > >> >> > > My user ID is ivannov :) >> >> > > >> >> > > I tried to create a patch file out of my git commit, but I am >> afraid it >> >> > > doesn't look as expected. It has too many changes inside. >> >> > > >> >> > > I'm afraid I don't have experience with contributing to SVN based >> >> > projects. >> >> > > I would appreciate if you tell me how I can create the patch file >> for >> >> you >> >> > > to review. Otherwise, here is my commit in github: >> >> > > >> >> > > >> >> > >> >> >> https://github.com/ivannov/tomee/commit/f0c0b486a0254b7b01b0bb6b46bb39f87d126efc >> >> > > . >> >> > > >> >> > > Cheers, >> >> > > Ivan >> >> > > >> >> > > >> >> > > On Tue, Jan 7, 2014 at 3:15 PM, Jean-Louis MONTEIRO < >> >> [email protected] >> >> > > >wrote: >> >> > > >> >> > > > Hi Ivan, >> >> > > > >> >> > > > Apologize for the late answer. >> >> > > > First of, happy new year. >> >> > > > >> >> > > > - any committers can assign the Jira to you. But I need your Jira >> ID >> >> to >> >> > > > find you and add you as a contributor. >> >> > > > - you can just create a patch file for the changes and attach it >> to >> >> the >> >> > > > Jira. >> >> > > > >> >> > > > Someone can review it and commit it for you >> >> > > > >> >> > > > JLouis >> >> > > > >> >> > > > >> >> > > > >> >> > > > >> >> > > > >> >> > > > >> >> > > > >> >> > > > 2014/1/4 Ivan St. Ivanov <[email protected]> >> >> > > > >> >> > > > > Hey everybody! >> >> > > > > >> >> > > > > I wish you very happy, healthy and successful 2014! >> >> > > > > >> >> > > > > Today I brought my first change to my local Tomee repository on >> >> > > Github. I >> >> > > > > was working on this item: >> >> > > > > https://issues.apache.org/jira/browse/OPENEJB-678. >> >> > > > > >> >> > > > > I have a couple of questions though: >> >> > > > > >> >> > > > > - I can't assign the issue in Apache JIRA to my name. Maybe I >> have >> >> to >> >> > > get >> >> > > > > permissions for that? My user name there is ivannov >> >> > > > > - I rebased my local branch to trunk, then I added my commit and >> >> > pushed >> >> > > > it >> >> > > > > to github. Then I created a pull request. However github tries >> >> wants >> >> > to >> >> > > > > merge it to apache/tomee-1.5.2, together with 906 other >> commits. I >> >> > > don't >> >> > > > > know how to make it go to trunk >> >> > > > > >> >> > > > > Cheers, >> >> > > > > Ivan >> >> > > > > >> >> > > > >> >> > > > >> >> > > > >> >> > > > -- >> >> > > > Jean-Louis >> >> > > > >> >> > > >> >> > >> >> > >> >> > >> >> > -- >> >> > Jean-Louis >> >> > >> >> >> > >> > >> > >> > -- >> > Jean-Louis >>
