~/cloudstack-4.4/cloudstack (4.4)> alias alias co='git checkout' alias pick='git cherry-pick -x' alias show='git show'
no biggy: you can git cherry-pick --abort if it fails (have to create an alias for that some day ;) or do checkout anew if you regret a successful pick. I do show if someone requests one for 4.4. If comfortable I pick. the -x adds a comment '(cherry-picked from commit <commit-id>)' have a go On Fri, Sep 5, 2014 at 4:44 PM, Will Stevens <wstev...@cloudops.com> wrote: > Ya, I need to play with cherry picking on a fake repo so I am comfortable > with it before I do it on a project like this. :) I will spend some time > to make sure I am comfortable with cherry picking... > > ws > > > *Will STEVENS* > Lead Developer > > *CloudOps* *| *Cloud Solutions Experts > 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 > w cloudops.com *|* tw @CloudOps_ > > > On Fri, Sep 5, 2014 at 10:19 AM, Daan Hoogland <daan.hoogl...@gmail.com> > wrote: > >> As we don't have a good branch and merge strategy yet you probably should >> have cherry-picked and the message would have been copied. >> >> >> On Fri, Sep 5, 2014 at 4:18 PM, Daan Hoogland <daan.hoogl...@gmail.com> >> wrote: >> >>> so now we are not giving coverity credit for finding it. let them sue >>> us. But seriously thanks for your admission of guilt. I think a good >>> discipline at this is worth something on the long run. >>> >>> >>> On Fri, Sep 5, 2014 at 4:08 PM, Will Stevens <wstev...@cloudops.com> >>> wrote: >>> >>>> I have merged the change into master. I forgot to reference the >>>> 'CID-123719' in the commit note though. >>>> >>>> >>>> *Will STEVENS* >>>> Lead Developer >>>> >>>> *CloudOps* *| *Cloud Solutions Experts >>>> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 >>>> w cloudops.com *|* tw @CloudOps_ >>>> >>>> >>>> On Fri, Sep 5, 2014 at 10:02 AM, Will Stevens <wstev...@cloudops.com> >>>> wrote: >>>> >>>>> Ok, thanks... >>>>> >>>>> ws >>>>> >>>>> >>>>> *Will STEVENS* >>>>> Lead Developer >>>>> >>>>> *CloudOps* *| *Cloud Solutions Experts >>>>> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 >>>>> w cloudops.com *|* tw @CloudOps_ >>>>> >>>>> >>>>> On Fri, Sep 5, 2014 at 10:02 AM, Daan Hoogland < >>>>> daan.hoogl...@gmail.com> wrote: >>>>> >>>>>> go ahead and cherry-pick I will merge in 4.4. >>>>>> >>>>>> >>>>>> On Fri, Sep 5, 2014 at 3:52 PM, Will Stevens <wstev...@cloudops.com> >>>>>> wrote: >>>>>> >>>>>>> Yes, I am fine with that change. Should I add it to master? >>>>>>> >>>>>>> Cheers, >>>>>>> >>>>>>> Will >>>>>>> >>>>>>> >>>>>>> *Will STEVENS* >>>>>>> Lead Developer >>>>>>> >>>>>>> *CloudOps* *| *Cloud Solutions Experts >>>>>>> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 >>>>>>> w cloudops.com *|* tw @CloudOps_ >>>>>>> >>>>>>> >>>>>>> On Fri, Sep 5, 2014 at 8:54 AM, Daan Hoogland < >>>>>>> daan.hoogl...@gmail.com> wrote: >>>>>>> >>>>>>>> H Will, coverity complained about a few lines of yours. please have >>>>>>>> a look at hotfix/4.4-CID1237195 and tell me you agree or not. I think >>>>>>>> it >>>>>>>> should go in master as well. >>>>>>>> >>>>>>>> -- >>>>>>>> Daan >>>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Daan >>>>>> >>>>> >>>>> >>>> >>> >>> >>> -- >>> Daan >>> >> >> >> >> -- >> Daan >> > > -- Daan
