You know, I may have just screwed it up :) I've never had to deal with a git patch before and didn't think to try patch -p1... If patch -p1 works then that is all fine by me. Nicolaas already updated the jiras so I'll use the new patches now. Next time though we can just try a git patch again.
Sorry for causing confusion! - Cassie On Mon, Jul 28, 2008 at 2:55 AM, Ian Boston <[EMAIL PROTECTED]> wrote: > I find it a little odd that we cant accept patches from Git, are people > using some sort of automated patch applier that cant cope with an extra path > element ? > > If I am alone on this, I will write a script to munge git patches into a > more acceptable form. > > David, > Thank you got the suggestion, the reason I moved to Git was it was becoming > impossible to manage more than one branch and SVN blocks after more than a > few moves, making single commit re-factoring almost impossible. I think in > my case, ->apache->git-svn->patch->local-svn->apache is going to be rather > error prone, but whatever works for others makes sense. > > Ian > > > On 28 Jul 2008, at 00:37, Nicolaas Matthijs (JIRA) wrote: > > Ian, I think it's faster and more foolproof to just generate the >> patches with svn's diff command. That means doing whatever you can do >> to get your changes from your git repo to a local svn wc will allow >> you to do the diff. I had the same issue with mercurial and relied on >> hgsvn to do this. >> >> davep >> >> On Sun, Jul 27, 2008 at 3:02 PM, Ian Boston <[EMAIL PROTECTED]> wrote: >> >>> >>> Question as a git user, also generating patches that others might want to >>> check. >>> >>> Is there a way of generating svn patches using git, or do we have to hand >>> edit the git patches to match >>> patch -p0 < patchfile >>> >>> git-svn doesnt have a diff option, probably because git is patch based >>> system. >>> >>> >>> ( I am happy to try patch -p1 if patch -p0 doesn't work, but I want to >>> what >>> generates least work for everyone, but I don't really want to have to go >>> searching the tree much for the diff root more than that) >>> >>> Ian >>> >>> >>> On 25 Jul 2008, at 16:40, Cassie wrote: >>> >>> Yup - the patch you generated has git stuff in it, so I'm guessing thats >>>> why >>>> it works for you. >>>> I put the details of how to generate non git patches on your first jira >>>> issue but you can also find the info here: >>>> >>>> http://incubator.apache.org/shindig/#creatingPatches >>>> >>>> Thanks! >>>> >>>> - Cassie >>>> >>>> >>>> On Fri, Jul 25, 2008 at 8:48 AM, Nicolaas Matthijs < >>>> [EMAIL PROTECTED]> wrote: >>>> >>>> Hi Cassie, >>>>> I just tried to apply my patch on a clean svn checkout, and it works if >>>>> you >>>>> use >>>>> patch -p1 < "mypatch". This probably happens because I'm using git. >>>>> >>>>> Should I be adjusting my patches? >>>>> >>>>> Thanks, >>>>> Nicolaas >>>>> >>>>> On Fri, Jul 25, 2008 at 4:05 PM, Cassie <[EMAIL PROTECTED]> wrote: >>>>> >>>>> Nicolass - improving the sample container to be more "real" is >>>>>> definitely >>>>>> on >>>>>> our list of things to do. Like Ropu mentioned we also want to add >>>>>> social >>>>>> based features, but I think adding things like drag and drop and real >>>>>> >>>>> >>>>> prefs >>>>> >>>>>> >>>>>> etc is also a great place to start. >>>>>> >>>>>> I definitely don't think the code should go all into the same file :) >>>>>> but >>>>>> using the samplecontainer directory for all of the code makes sense. >>>>>> >>>>>> As for your patches, I was going to get those in today but they are in >>>>>> a >>>>>> slightly incorrect format. ie patch -p0 < "your patch file" doesn't >>>>>> work. >>>>>> >>>>> >>>>> I >>>>> >>>>>> >>>>>> updated the first jira issue with some quick instructions. Once you >>>>>> >>>>> >>>>> follow >>>>> >>>>>> >>>>>> those then hopefully I'll be able to patch away! >>>>>> >>>>>> Thanks for your help. >>>>>> - Cassie >>>>>> >>>>>> >>>>>> On Fri, Jul 25, 2008 at 7:24 AM, Ropu <[EMAIL PROTECTED]> wrote: >>>>>> >>>>>> Hte issue with that is that iGoogle is a Gadget render, and is not >>>>>>> >>>>>> >>>>> using >>>>> >>>>>> >>>>>>> the >>>>>>> social layer of opensocial >>>>>>> >>>>>>> so for that you will need to add friends, activities, persistence >>>>>>> >>>>>> >>>>> layer. >>>>> >>>>>> >>>>>>> so it should be more like a orkuy or hi5 that iGoogle. >>>>>>> >>>>>>> still we have the partuza, a simple social network that has all the >>>>>>> >>>>>> >>>>>> social >>>>>> >>>>>>> >>>>>>> stuff ready to work with shindig >>>>>>> >>>>>>> the only thing is that is coded in PHP :D >>>>>>> >>>>>>> hope this helps >>>>>>> >>>>>>> ropu >>>>>>> >>>>>>> >>>>>>> On Fri, Jul 25, 2008 at 10:56 AM, Nicolaas Matthijs < >>>>>>> [EMAIL PROTECTED]> wrote: >>>>>>> >>>>>>> Hi, >>>>>>>> I would like to introduce an iGoogle like portal into Shindig, which >>>>>>>> >>>>>>> >>>>>>> allows >>>>>>> >>>>>>>> >>>>>>>> you to add multiple widgets in different columns and which allows >>>>>>>> to drag them around with the state being saved in a cookie. I would >>>>>>>> >>>>>>> >>>>>> like >>>>>> >>>>>>> >>>>>>> to >>>>>>> >>>>>>>> >>>>>>>> do this for 2 reasons: >>>>>>>> >>>>>>>> 1) I've seen several requests for this type of functionality passing >>>>>>>> >>>>>>> >>>>> on >>>>> >>>>>> >>>>>>> the >>>>>>> >>>>>>>> >>>>>>>> list >>>>>>>> 2) I think it might increase uptake of Shindig if people can see >>>>>>>> what >>>>>>>> >>>>>>> >>>>>> can >>>>>> >>>>>>> >>>>>>>> be achieved with it >>>>>>>> >>>>>>>> So my first question is whether you think this is a good idea. My >>>>>>>> >>>>>>> >>>>>> second >>>>>> >>>>>>> >>>>>>>> question is where you >>>>>>>> think this should go. Should it go as a (big) modification to the >>>>>>>> samplecontainer, which is perfectly >>>>>>>> possible, or should it go in as a separate file in examples? >>>>>>>> >>>>>>>> P.S.: I've done 3 patches for the samplecontainer already. How long >>>>>>>> >>>>>>> >>>>>> does >>>>>> >>>>>>> >>>>>>> it >>>>>>> >>>>>>>> >>>>>>>> normally take >>>>>>>> to get an evaluation of those? >>>>>>>> >>>>>>>> Thanks in advance, >>>>>>>> Nicolaas >>>>>>>> >>>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> .-. --- .--. ..- >>>>>>> R o p u >>>>>>> >>>>>>> >>>>>> >>>>> >>> >>> >
