On Mon, Jun 11, 2012 at 10:42 AM, Bert Freudenberg <b...@freudenbergs.de> wrote: > On 2012-06-11, at 16:16, Walter Bender wrote: > >> On Mon, Jun 11, 2012 at 9:56 AM, Bert Freudenberg <b...@freudenbergs.de> >> wrote: >>> On 2012-06-11, at 15:15, Walter Bender wrote: >>>> In Amazonas last week, I had the teachers use the Duplicate feature to >>>> clone an activity (in this specific case, Labyrinth) so that they >>>> could fix a bug. They used JAMEdit to make their changes. What was >>>> missing was git, so that they could create a patch (to submit >>>> upstream) and/or create a new bundle for distribution. So +1 for >>>> adding git to the Standard Sugar build. >>> >>> That would mean XO bundles need to ship with their git repositories. >>> Increases the installed size by two, at least. >> >> Not necessarily. You can just run git init to create a new repository >> on the clone, for example. > > How would that help submitting proper patches?
Speaking specifically to the issue of a patch, you could create a new git repository for the code and create a patch. It should apply equally well to the original repository. In any case, it would be easy for a developer to see how to apply the patch. But I am of the opinion that git would be useful toward the problem of developing new activities on the XO as well. And it is necessary to have a git repository in order to run the setup.py scripts these days. Don't really know how you can be productive without it. -walter > > (I'm not opposed to including git, just saying that for proper patches you > need the proper commit history) > >>> Or there would have to be a mechanism to fetch the git data (e.g. if the >>> activity info included a repo url and commit number). That's actually how >>> we do it in Etoys (though not using git but Monticello) - you can modify it >>> and then diff against a version downloaded from the repository. >>> >>> Another idea avoiding the download would be to diff the original and the >>> copy. For that you just need a tiny shellscript (or a few lines of python). > > > This diffing would have the same effect as patches made from a new git > repository. > > - Bert - > > _______________________________________________ > Sugar-devel mailing list > Sugar-devel@lists.sugarlabs.org > http://lists.sugarlabs.org/listinfo/sugar-devel -- Walter Bender Sugar Labs http://www.sugarlabs.org _______________________________________________ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel