I got to one of the new JIRAs…. and found an easier way to pull the commits…. but I forgot the magic words to auto-close the pull request.
If you say $git fetch https://github.com/bimargulies/felix FELIX-5008-less-messy-command-help From https://github.com/bimargulies/felix * branch FELIX-5008-less-messy-command-help -> FETCH_HEAD FETCH_HEAD seems to be a sort of temporary branch that you can cherry pick from $git log FETCH_HEAD shows the remote commits $git cherry-pick 2cfe5515e0f40bcebc91dbacc3cf6196228968c8 gets your commit into my local branch. Anyway since I forgot the magic words in the commit again, could you close the pull request? thanks david jencks > On Aug 22, 2015, at 12:38 PM, Benson Margulies <[email protected]> wrote: > > Oh, and I submitted two more JIRAs with PR's for gogo. > > > On Sat, Aug 22, 2015 at 12:36 PM, Benson Margulies <[email protected]> > wrote: >> I would add a remote in my repo to the repo of the person submitting >> the request, and then fetch from it, and then you can do it all in >> your repo and not keep making clones. >> >> >> On Sat, Aug 22, 2015 at 11:58 AM, David Jencks >> <[email protected]> wrote: >>> Thanks for the link. I thought there was probably a way to do this with >>> cherry-picking. >>> >>> I always create a (local) branch for any changes, git svn dcommit from that >>> branch, and then svn rebase on the trunk branch. >>> >>> Do you know if it’s possibly/easy (or how to) copy your changes on github >>> to a branch in my github felix clone and then cherry-pick from there? I’d >>> expect that would reduce a combinatorial explosion of remote branches as >>> more people supplied patches on github. >>> >>> I didn’t see 4970 yet… >>> >>> thanks >>> david jencks >>> >>>> On Aug 22, 2015, at 7:36 AM, Benson Margulies <[email protected]> wrote: >>>> >>>> I'm sorry, I assumed that you all had a workflow for PR's already. >>>> >>>> I can offer you >>>> https://wiki.apache.org/lucene-java/BensonMargulies/GitSvnWorkflow. >>>> >>>> Also, please just ask and I'll be happy to make an 'svn patch' patch. >>>> >>>> Note the issue of getting the PRs to close by putting the right thing >>>> in the svn commit. >>>> >>>> There's also 4970, would you like me to make an svn patch for that? >>>> >>>> >>>> >>>> >>>> >>>> On Fri, Aug 21, 2015 at 7:16 PM, David Jencks >>>> <[email protected]> wrote: >>>>> I applied your fix from 4969 but it was rather difficult and I did it >>>>> locally with a patch. Is there an explanation of how to pull stuff from >>>>> github into an apache svn repo? >>>>> >>>>> Anyone else think we should consider git for felix? >>>>> >>>>> My plans for gogo are to make it find bundles using the system bundle, so >>>>> the wiring info works even when regions/framework hooks are present. >>>>> >>>>> thanks >>>>> david jencks >>>>> >>>>>> On Aug 21, 2015, at 5:15 PM, Benson Margulies <[email protected]> >>>>>> wrote: >>>>>> >>>>>> Derek, >>>>>> >>>>>> Thanks, that did it. I've got an outstanding PR for some fixes in >>>>>> gogo, could I perhaps interest you in having a look? I'd proceed to >>>>>> make some other improvements if I had a process in motion to work with >>>>>> a committer to get things, well, committed. My next idea in line is to >>>>>> get the CommandSession out of the usage messages. >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> On Fri, Aug 21, 2015 at 11:13 AM, Derek Baum <[email protected]> wrote: >>>>>>> set SCOPE = “myscope:gogo:*” >>>>>>> >>>>>>> then when you enter: mycmd, it will try: myscope:mycmd, gogo:mycmd, and >>>>>>> then all other scopes in undefined order. >>>>>>> >>>>>>> The ‘type’ command can be used to find which command will be executed: >>>>>>> >>>>>>> % type -a mycmd >>>>>>> mycmd is void myscope:mycmd(Object[]) >>>>>>> mycmd is void otherscope:mycmd(String, Integer) >>>>>>> >>>>>>> — >>>>>>> Derek >>>>>>> >>>>>>>> On 21 Aug 2015, at 16:00, Benson Margulies <[email protected]> >>>>>>>> wrote: >>>>>>>> >>>>>>>> If two bundles both provide an 'exit' command, how do I configure to >>>>>>>> control which one is found by default? >>>>>>> >>>>>> >>>>>> --------------------------------------------------------------------- >>>>>> To unsubscribe, e-mail: [email protected] >>>>>> For additional commands, e-mail: [email protected] >>>>>> >>>>> >>>>> >>>>> --------------------------------------------------------------------- >>>>> To unsubscribe, e-mail: [email protected] >>>>> For additional commands, e-mail: [email protected] >>>>> >>>> >>>> --------------------------------------------------------------------- >>>> To unsubscribe, e-mail: [email protected] >>>> For additional commands, e-mail: [email protected] >>>> >>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: [email protected] >>> For additional commands, e-mail: [email protected] >>> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] >
