Bram, I recently changed to using github and a local git repo instead of a local svn working copy. So far, the following worked well:
Keep these in mind, they mention svn, and git allows the same things: http://wiki.apache.org/lucene-java/HowToContribute http://wiki.apache.org/lucene-java/DeveloperTips Work against trunk, that means cloning (or at least pull the trunk branch from) the github.com/apache/lucene-solr repository. Use that as the upstream repository. When creating the pull request on github, a mail about the pull request will be send automatically to this list. This mail also contains a link to a patch. The current pull requests are here:https://github.com/apache/lucene-solr/pulls <https://github.com/apache/lucene-solr/pulls> At the jira issue: - discuss. One can add comments to the pull request, but these are less visible. - post the pull request. - I have offered to post a patch there, but no one has requested one yet. For now I am assuming the committers will use the patch when accepting the changes into the main svn repo. As far as I can see, the upstream git repo is automatically following that. In case the committers would like to use my git commits, I'd have to be more careful in preparing the branch for the pull request. On a slightly different topic, to develop, I am doing the following: In the local clone rename the personal github repo to something more useful than the default "origin". Use a development branch that is started from trunk. To create a pull request, use another branch started from the development branch. This is mostly to get rid of some things I need only for myself: plans, .gitignore additions, whatever. Locally review the changes against trunk by doing git diff trunk. When trunk changes, especially when expecting conflicts: pull trunk from upstream, merge trunk into the local branch(es), resolve any conflicts, test, correct if necessary, and push to the github branch for the pull request. If necessary comment on this at the jira issue. So far local git merging has been good, no conflicts, only a minor correction needed. When larger corrections are needed, or when some further development is needed, I think I'd prefer to continue on the local development branch, and then make a new pull request as above. Regards, Paul Elschot On 29-01-14 10:36, Bram Van Dam wrote: > Hi folks, > > What's the preferred way of contributing a patch? > > The easiest from my perspective is a pull request on github (and it > looks like there's a couple of pull requests already on there). > > Should I create a jira issue with an attachment or a link to the pull > request? Anything else I should know about? > > Thx, > > - Bram > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] >
