For those that don’t read every dev email Dmitriy wrote up an explanation here:
"the process i used is outlined here http://mahout.apache.org/developers/github.html “ On May 28, 2014, at 12:07 PM, Dmitriy Lyubimov <[email protected]> wrote: On Wed, May 28, 2014 at 12:02 PM, Pat Ferrel <[email protected]> wrote: > I have multiple remotes too but they are used to pull/merge. > > So we can agree there's no need for multiple local repos then? just multiple external references (even if you choose to keep them; my document about github PR handling clearly requires only one remote defined -- git-wip-us.o.a.). > maybe this will help others: > > http://stackoverflow.com/questions/14290113/git-pushing-code-to-two-remotes > > On May 28, 2014, at 11:46 AM, Dmitriy Lyubimov <[email protected]> wrote: > > On Wed, May 28, 2014 at 11:40 AM, Pat Ferrel <[email protected]> wrote: > >> Is there really no way to switch to github as the primary and git.wp as a >> mirror? Are we doing this integration like Spark? This would do away with >> the two local repos problem (and several extra steps), handle the >> notifications, and give us a shiny green button :-) This would also make > it >> easier on contributors who would like to hit the shiny green button but >> can’t. >> >> It looks to me like every dev needs to have two repos locally, > > > ??? i have one local repo but about 5 different remotes in it, 3 of them > (so happens) in my own github repo. This is the beauty of git at it utmost. > > >> why not change the mirror so there is just one local repo, our own, with >> the upstream set to github’s apache/mahout >> >> To do this committers would have to be granted write access to github >> apache/mahout and git.wp would be read only. >> >> Unless I’m missing something, which is always possible. Has anyone >> actually done this yet? Am I wrong about the process? >> >> On May 27, 2014, at 8:19 PM, Pat Ferrel <[email protected]> wrote: >> >>> >>> On May 26, 2014, at 12:14 AM, Ted Dunning <[email protected]> > wrote: >>> >>> With git you can push or pull to multiple repos. >> >> Yes, of course. So we are just pulling a branch from our github remote to >> our git-wip local then pushing that to git-wip remote. We need two local >> repos to do this. And for adding our own code a PR is unnecessary. >> >>> >>> To merge the pull request, you can pull from a specific branch from a >>> specific source repo where the pull request came from. Then you push to >>> git-wip at apache making sure that the Fixes #... message is on the >> merge. >>> Then magic intervenes and all is well. >> >> If the notification comes to @dev that’s clear. >> >>> >>> The nice thing is that most of the commands are visible on the pull >> request >>> itself. >>> >>> Notifications about pull requests are via email and now that D has >>> oh-so-quickly gotten Jake to enable that we should see those on the dev >>> list. My guess is that the easiest path would be to create a JIRA >> wrapper, >>> do the merge, push, resolve the JIRA all in one quick session. Not > quite >>> as easy as the green button, but not heinous. >>> >>> >>> >>> On Sun, May 25, 2014 at 11:13 AM, Pat Ferrel <[email protected]> >> wrote: >>> >>>> I’m confused about the workflow. >>>> >>>> It looks like you keep two local repos one pointed to your fork on >> github, >>>> the other to git-wip-us. Do your work on your repo (set git-wip-us as >>>> upstream to get updates) and when you want to merge do “git > request-pull >>>> branch url-to-git-wip-us". This will package an uber patch from your >> repo >>>> and communicate with the destination server (I assume). But how do you >>>> receive the notification and respond? >>>> >>>> I’ve never responded to a PR outside of Github, and there was no >>>> notification that the PR had been issued outside of the Github UI. >>>> >>>> On May 25, 2014, at 10:24 AM, Dmitriy Lyubimov <[email protected]> >> wrote: >>>> >>>> jeninkins: mahout-nightly seems to be running ok off new git. >>>> can't get mahout-quality to run thru still. it was failing in execution >> of >>>> Jenkins findBugs publishing plugin, i've desabled this plugin for the >> time >>>> being. Still however couldn't get it run once successfully so far. >>>> >>>> >>>> On Sun, May 25, 2014 at 9:40 AM, Dmitriy Lyubimov <[email protected]> >>>> wrote: >>>> >>>>> INFRA-7801 is now complete. all apache-github PR functionality is now >>>>> enabled. >>>>> >>>>> note that (as far as i understand) cannot merge PRs directly into >> github >>>>> mirror (since it is a mirror and thus read-only). We will have to > merge >>>> PRs >>>>> into git-wip-us as described here [2] "merging locally" and here [3] >>>>> >>>>> Note that [3] also applicable to github PR #. I.e. when we merge, it > is >>>>> enough just to metnion "fixes #<PR>" to close the PR on the mirror as >>>> well. >>>>> >>>>> If we don't want to merge a PR ("won't fix resolution") we'd have to >> just >>>>> close it on github (I think one has to be a part of "apache" >> organization >>>>> in github, i suggest to request membership for those who haven't yet >> done >>>>> so). >>>>> >>>>> Suggested reading >>>>> [1] https://help.github.com/articles/using-pull-requests Some people >>>>> asked how to create github pull requests >>>>> [2] https://help.github.com/articles/merging-a-pull-request see >> "merging >>>>> locally" >>>>> [3] >> > https://help.github.com/articles/closing-issues-via-commit-messagescommit >>>>> messages >>>>> >>>>> >>>>> On Fri, May 23, 2014 at 12:31 PM, Dmitriy Lyubimov <[email protected] >>>>> wrote: >>>>> >>>>>> Asking INFRA to enable related github integration features, filed >>>>>> as INFRA-7801 >>>>>> >>>>>> >>>>>> On Fri, May 23, 2014 at 10:42 AM, Dmitriy Lyubimov < > [email protected] >>>>> wrote: >>>>>> >>>>>>> Aha! apache/mahout github mirror is up! >>>>>>> >>>>>>> let me try and see if i can do and manage a PR there. >>>>>>> >>>>>>> I guess i will still need to file another infra Jira for >> jira/mailing >>>>>>> list integration features ( we already voted for that in bulk). >>>>>>> >>>>>>> >>>>>>> On Thu, May 22, 2014 at 10:14 AM, Dmitriy Lyubimov < >> [email protected] >>>>> wrote: >>>>>>> >>>>>>>> Hi, >>>>>>>> >>>>>>>> (1) git migration of the project is now complete. Any volunteers to >>>>>>>> verify per INFRA-7777? If you do, please report back to the issue. >>>>>>>> >>>>>>>> (2) Anybody knows what to do with jenkins now? i still don't have >>>>>>>> proper privileges on it. thanks. >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> [1] https://issues.apache.org/jira/browse/INFRA-7777 >>>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>> >>>> >>>> >>> >> >> > >
