Thanks for the detailed response. I'll start another thread about my patch and push it to the master if there's agreement.
I'll also experiment with the git commands you discussed, although patching the older version isn't required, as you mentioned. Thanks again, Tim On Thu, Mar 3, 2011 at 10:21 PM, Niclas Hedhman <[email protected]> wrote: > [email protected] as I think more people might be interested in this. > > We normally don't back-patch to older versions. Companies are free to > do so and charge the users who really need it. Of course, you are free > to maintain it in the open if you like. > > I have given you commit rights to OPS4J on GitHub, which means you can > apply the patch directly, instead of bothering others with the work. > So, the workflow is that you raise the discussion on general@ and if > no objections, you simply push the change straight into the master > repository. How is that done? > Git has the notion of 'remotes', places where it can pull and possibly > push patches to. You can at any time have more than one remote > defined. So, if you look inside .git/config, you will see a section > most likely named "origin" pointing to your GitHub repo. If you then > do; > > git remote add ops4j [email protected]:ops4j/org.ops4j.pax.logging.git > > you will have a 'route' to the original master. So, if you do; > > git pull ops4j master > > Git will pick up the changes others have made and pull them into and > merge with your local repository. You could then do; > > git push origin master > > and those changes will be pushed to your Pax Logging repository on > GitHub. And likewise; > > git push ops4j master > > will push your changes to the ops4j repository on GitHub, where you > now have rights to do so. > > > Git is different from SVN in that a 'branch' is really a 'branch' of > the file itself, not a different directory. So, if you really want to > maintain 1.5, you need to do; > > git pull ops4j 1.5.x > git checkout 1.5.x > ... make the change, typically with a UI tool to pick the patch > from 'master' branch. > git commit -a -m "Backporting...." > git push ops4j 1.5.x > git checkout master > > > Hope that quick course in Git gives you an idea of the general workflow. > > > Cheers > Niclas > > On Fri, Mar 4, 2011 at 10:11 AM, Tim Moloney <[email protected]> wrote: >> I managed to successfully submit a pull request for changes to >> pax-logging 1.6.x. I'm new to OPS4J, github, and git so I was glad >> that I got all that right. :) >> >> Unfortunately, I can't figure out how to do a similar action for >> pax-logging 1.5.x. Do I even need to change pax-logging 1.5.x or is >> it no longer being maintained? The OPS4J Subversion repository seems >> to have pax-logging 1.5.x in it, however, I can't commit to it. Is it >> now read only? I see that there is a pax-logging-1.5.x branch in the >> OPS4J Git repository but I can't figure out how to >> clone/branch/fetch/whatever to get a local working copy that contains >> the pax-logging-1.5.x branch. >> >> Could you give me a hint how I can make a change for pax-logging >> 1.5.x, if this is even necessary? >> >> Thanks. >> >> >> -- >> Tim Moloney >> ManTech Real-time Systems Laboratory >> 2015 Cattlemen Road \ / >> Sarasota, FL 34232 .________\(O)/________. >> (941) 377-6775 x208 ' ' O(.)O ' ' >> > > > > -- > Niclas Hedhman, Software Developer > http://www.qi4j.org - New Energy for Java > > I live here; http://tinyurl.com/3xugrbk > I work here; http://tinyurl.com/24svnvk > I relax here; http://tinyurl.com/2cgsug > -- Tim Moloney ManTech Real-time Systems Laboratory 2015 Cattlemen Road \ / Sarasota, FL 34232 .________\(O)/________. (941) 377-6775 x208 ' ' O(.)O ' ' _______________________________________________ general mailing list [email protected] http://lists.ops4j.org/mailman/listinfo/general
