Hi, On Sun, Jul 7, 2013 at 1:24 PM, Pradeep Fernando <[email protected]>wrote:
> Hi Lakmal, > > I tried applying the patch locally. Yes it gives the above error while > using 'git am' . However it works fine if i use 'git apply <patch>' . The > only downfall of using git apply is that you create a new commit string. > > I tried to create a new patch even starting from the scratch, still > hitting the same issue. :( Although im not a git expert, bit of googling > revealed that git am has its own issues [1] > > Still i can't figure out the problem at the moment. If possible please use > 'git apply' > I'll look in to this. > > thanks, > --Pradeep > > > > [1] > http://git.661346.n2.nabble.com/quot-git-apply-check-quot-successes-but-git-am-says-quot-does-not-match-index-quot-td6684646.html > > > On Sun, Jul 7, 2013 at 10:54 AM, Lakmal Warusawithana <[email protected]>wrote: > >> Hi Pradeep, >> >> Seems like having some issue. >> >> error: patch failed: >> components/stratos/org.wso2.carbon.tenant.dispatcher/2.1.0/pom.xml:1 >> error: >> components/stratos/org.wso2.carbon.tenant.dispatcher/2.1.0/pom.xml: patch >> does not apply >> Patch failed at 0001 refactoring org.wso2.carbon.tenant.dispatcher >> component to org.apache.stratos.tenant.dispatcher >> >> >> >> On Sun, Jul 7, 2013 at 9:51 AM, Pradeep Fernando <[email protected]>wrote: >> >>> Hi devs, >>> >>> Please find the patch attached herewith. >>> >>> thanks, >>> --Pradeep >>> >>> >>> On Sun, Jul 7, 2013 at 9:28 AM, Isuru Haththotuwa <[email protected]>wrote: >>> >>>> >>>> >>>> On Sun, Jul 7, 2013 at 9:15 AM, Pradeep Fernando >>>> <[email protected]>wrote: >>>> >>>>> Hi, >>>>> >>>>> going to do the $subject. >>>>> >>>> +1 >>>> >>>>> >>>>> thanks, >>>>> --Pradeep >>>>> >>>>> >>>>> >>>> >>>> >>>> -- >>>> Thanks and Regards, >>>> >>>> Isuru H. >>>> >>>> >>>> >>> >>> >>> -- >>> Pradeep Fernando. >>> http://pradeepfernando.blogspot.com/ >>> >> >> >> >> -- >> Lakmal Warusawithana >> Software Architect; WSO2 Inc. >> Mobile : +94714289692 >> Blog : http://lakmalsview.blogspot.com/ >> >> > > > > -- Thanks and Regards, Isuru H.
