[Sugar-devel] Sugarizer dev platform is now open

Walter Bender walter.bender at gmail.com
Fri Mar 24 07:37:28 EDT 2017
Previous message (by thread): [Sugar-devel] Sugarizer dev platform is now open
Next message (by thread): [Sugar-devel] Sugarizer dev platform is now open
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On Fri, Mar 24, 2017 at 4:26 AM, Lionel Laské <lionel.laske at gmail.com>
wrote:

>
> You will not lost anything in your TurtleJS repo with copy/replace, it's
> just that all TurtleJS contributions will be diluted once in Sugarizer
> repo.
> But you're right, credits are important it's why I give specific credits
> in my announcements to all contributors when a new version is released.
>
> Regarding submodules, here some issues I'm seeing:
> - Some of my contributors never integrate my PR in their own activity so
> it means that this activity will not work correctly if directly pointed as
> submodule.
>

This is perhaps counterbalanced by the fact that you never sent PRs
upstream for some of your local changes.


> - Some of my contributors didn't create a specific repository for their
> activities repository. They directly work on Sugarizer forks and put their
> activities inside. So of course submodules will not work for these
> contributions.
>

In that case, there is no issue since Sugarizer is master.


> - Not everyone is familiar with git. Some of my contributors just get full
> source to test Sugarizer and start contribution. I don't want to force
> people to enter in git complexity (believe my or not I know people that
> never heard of git ;-) to let them play or contribute to Sugarizer.
>

I am not sure that submodules add a lot of complexity from the contributor
POV. They just need to know where the source repo lives. Perhaps you can
add that information.

>
> In theory, submodules could solve things if fully understand and well use
> by everyone. But in theory I should have sent you PR to integrate changes
> needs in TurtleJS for Sugarizer integration. So in theory we should not
> have this discussion today :-)
>

I am not sure that your having sent me PRs solves all of the problems we
have uncovered. I still don't know how to send you a PR for updating Turtle
w/o losing all of the history, which in addition to not giving credit to
the many contributors, makes maintenance more difficult. If one were to try
to debug Turtle from the Sugarizer fork, you would not be able to chase
down the changes that perhaps led to a bug.

You are the maintainer. I defer to you. But I am at a loss as to how to
proceed.

regards.

-walter

>
>           Lionel.
>
>
>
>
> 2017-03-23 23:35 GMT+01:00 Walter Bender <walter.bender at gmail.com>:
>
>>
>>
>> On Thu, Mar 23, 2017 at 4:40 PM, Lionel Laské <lionel.laske at gmail.com>
>> wrote:
>>
>>> Ah okay :-)
>>>
>>> I don't think the merge between those repositories is possible using git.
>>> Personally, I just copy/replace all files in the activity repository.
>>> git gives updated files so it's easy to see changes or to do a PR.
>>>
>>
>> As someone who is trying to cultivate contributions to my projects, I
>> think that your copy and replace method of managing updates is problematic
>> since the history is lost.
>>
>>>
>>> Regarding git submodules, why not but it has drawbacks too.
>>>
>>
>> Would be good to know what issues submodules present.
>>
>>
>>> I will think about it.
>>>
>>>                  Lionel.
>>>
>>>
>>> 2017-03-23 18:53 GMT+01:00 Walter Bender <walter.bender at gmail.com>:
>>>
>>>> Opps. I meant:
>>>>
>>>> https://github.com/walterbender/turtleblocksjs
>>>>
>>>> -walter
>>>>
>>>> On Thu, Mar 23, 2017 at 1:50 PM, Lionel Laské <lionel.laske at gmail.com>
>>>> wrote:
>>>>
>>>>> So Musicblocks [1] is the same thing than TurtleBlockJS [2] ?
>>>>> And you want to replace the second by the first ?
>>>>> Where did you apply missing commits ? in Musicblocks ? in
>>>>> TurtleBlockJS ?
>>>>>
>>>>>
>>>>> [1] https://github.com/walterbender/musicblocks
>>>>> [2] https://github.com/walterbender/turtleblocksjs
>>>>>
>>>>> 2017-03-23 18:38 GMT+01:00 Walter Bender <walter.bender at gmail.com>:
>>>>>
>>>>>> The current master [1] should be what you need. I created a fork of
>>>>>> Sugarizer [2] but I don't know how to properly merge changes in [1] into
>>>>>> [3] so that I can create a PR for you.
>>>>>>
>>>>>> -walter
>>>>>>
>>>>>>
>>>>>> [1] https://github.com/walterbender/musicblocks
>>>>>> [2] https://github.com/walterbender/sugarizer
>>>>>> [3] https://github.com/walterbender/sugarizer/tree/master/ac
>>>>>> tivities/TurtleBlocksJS.activity
>>>>>>
>>>>>> On Thu, Mar 23, 2017 at 1:31 PM, Lionel Laské <lionel.laske at gmail.com
>>>>>> > wrote:
>>>>>>
>>>>>>> Good news.
>>>>>>> Sorry I'm not a git expert. Not even sure to understand your
>>>>>>> question :-)
>>>>>>> But if you point me the branch that I need to get in TurtleJS, I
>>>>>>> will do the integration of the new version in Sugarizer.
>>>>>>>
>>>>>>>         Lionel.
>>>>>>>
>>>>>>>
>>>>>>> 2017-03-23 0:58 GMT+01:00 Walter Bender <walter.bender at gmail.com>:
>>>>>>>
>>>>>>>> OK. I have managed to find all your changes (5-6 commits scattered
>>>>>>>> throughout the code) and apply them to my current master. Git question: How
>>>>>>>> do apply all of my commits on my master back to my fork of your fork so I
>>>>>>>> can make the pull request?
>>>>>>>>
>>>>>>>> -walter
>>>>>>>>
>>>>>>>>
>>>>>>>> On Wed, Mar 22, 2017 at 5:48 PM, Lionel Laské <
>>>>>>>> lionel.laske at gmail.com> wrote:
>>>>>>>>
>>>>>>>>>
>>>>>>>>> I don't remember that I've done change in TurtleJS recently.
>>>>>>>>> In my mind the last thing changed was the integration done by
>>>>>>>>> Michaël two years ago (specifically the Stop button).
>>>>>>>>> If you've got it and if TurtleJS works on Chrome, Firefox, Safari
>>>>>>>>> and EDGE, I'm confident that it will work on Sugarizer.
>>>>>>>>>
>>>>>>>>>          Lionel.
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> 2017-03-22 22:35 GMT+01:00 Walter Bender <walter.bender at gmail.com>
>>>>>>>>> :
>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> On Wed, Mar 22, 2017 at 4:56 PM, Lionel Laské <
>>>>>>>>>> lionel.laske at gmail.com> wrote:
>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> You're right Sugarizer include a set of activities because my
>>>>>>>>>>> top priority is to simplify deployment and testing. So put activities
>>>>>>>>>>> outside of the Sugarizer repository would be too complex.
>>>>>>>>>>>
>>>>>>>>>>> BTW each activity author should maintain its own repository for
>>>>>>>>>>> this activity. For example, the Abacus activity is maintain be Eon here [1].
>>>>>>>>>>> In Sugarizer, each activity is store in its own subdirectory
>>>>>>>>>>> under the Sugarizer "activities" directory. This subdirectory is just a
>>>>>>>>>>> copy of the activity repository content. If an activity change, the author
>>>>>>>>>>> has just to recopy all files in its own Sugarizer subdirectory then send to
>>>>>>>>>>> me a pull request (to the dev branch).
>>>>>>>>>>> Conversely, if for compatibility reason I need to change
>>>>>>>>>>> something in an activity, I sent myself a PR to the  author repository. For
>>>>>>>>>>> example, I've slightly adapted Abacus for Android/iOS so I sent a PR to Eon
>>>>>>>>>>> here
>>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> Good in theory, but it appears that there are commits to Turtle
>>>>>>>>>> that you never pushed back to me, so I am stuck. That is what triggered my
>>>>>>>>>> question about process.
>>>>>>>>>>
>>>>>>>>>> -walter
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>> [2]. So at end both repositories are synced.
>>>>>>>>>>>
>>>>>>>>>>> I will write this rules in the README so it will be clear.
>>>>>>>>>>>
>>>>>>>>>>>          Lionel.
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> [1] https://github.com/eohomegrownapps/abacus-activity
>>>>>>>>>>> [2] https://github.com/eohomegrownapps/abacus-activity/pull/
>>>>>>>>>>> 1#event-1008961890
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> 2017-03-21 23:23 GMT+01:00 <sugar-devel-request at lists.sug
>>>>>>>>>>> arlabs.org>:
>>>>>>>>>>>>
>>>>>>>>>>>> Date: Tue, 21 Mar 2017 18:16:13 -0400
>>>>>>>>>>>> From: Walter Bender <walter.bender at gmail.com>
>>>>>>>>>>>> To: Lionel Laské <lionel at olpc-france.org>
>>>>>>>>>>>> Cc: Sugar-dev Devel <sugar-devel at lists.sugarlabs.org>,
>>>>>>>>>>>> "Community
>>>>>>>>>>>>         Support Volunteers -- who help respond to help AT
>>>>>>>>>>>> laptop.org"
>>>>>>>>>>>>         <support-gang at lists.laptop.org>, iaep <
>>>>>>>>>>>> iaep at lists.sugarlabs.org>
>>>>>>>>>>>> Subject: Re: [Sugar-devel] Sugarizer dev platform is now open
>>>>>>>>>>>> Message-ID:
>>>>>>>>>>>>         <CADf7C8uEUd6nMs_-fShGXZaqpwCumKUpMP37x96U=
>>>>>>>>>>>> N5kMO9gnA at mail.gmail.com>
>>>>>>>>>>>> Content-Type: text/plain; charset="utf-8"
>>>>>>>>>>>>
>>>>>>>>>>>>
>>>>>>>>>>>> I don't understand what is your model for maintaining
>>>>>>>>>>>> activities. It seems
>>>>>>>>>>>> everything is on one big repo and that you have scattershot
>>>>>>>>>>>> changes in
>>>>>>>>>>>> various activities, which are not sent to the upstream masters.
>>>>>>>>>>>> How can
>>>>>>>>>>>> make a PR to give you the latest Turtle Blocks bits without
>>>>>>>>>>>> having to sort
>>>>>>>>>>>> through your commit history to find all of your changes? Seems
>>>>>>>>>>>> to put an
>>>>>>>>>>>> extra burden on activity authors. What am I not understanding?
>>>>>>>>>>>> Is there any
>>>>>>>>>>>> documentation as to how you want activity authors to keep in
>>>>>>>>>>>> sync with
>>>>>>>>>>>> Sugarizer changes?
>>>>>>>>>>>>
>>>>>>>>>>>> -walter
>>>>>>>>>>>>
>>>>>>>>>>>> On Mon, Mar 20, 2017 at 5:48 PM, Lionel Laské <
>>>>>>>>>>>> lionel.laske at gmail.com>
>>>>>>>>>>>> wrote:
>>>>>>>>>>>>
>>>>>>>>>>>> >
>>>>>>>>>>>> > Hi all,
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> > Currently, Sugarizer is released about one time by year.
>>>>>>>>>>>> >
>>>>>>>>>>>> > I know that it's slow but it take us lot of time to test and
>>>>>>>>>>>> package new
>>>>>>>>>>>> > features and activities on all supported platforms.
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> > To give you  a faster view of change in Sugarizer, I've
>>>>>>>>>>>> decided to open a
>>>>>>>>>>>> > new server dedicated to the development branch.
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> > So, the branch "master" [1] is now the stable and
>>>>>>>>>>>> ready-to-production
>>>>>>>>>>>> > version and could be tested on http://try.sugarizer.org
>>>>>>>>>>>> >
>>>>>>>>>>>> > And the branch "dev" [2] is now the development version (*) -
>>>>>>>>>>>> and
>>>>>>>>>>>> > potentially unstable - and could be tested on the new
>>>>>>>>>>>> > http://dev.sugarizer.org
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> > If you're curious you could discover today on the dev branch:
>>>>>>>>>>>> the great
>>>>>>>>>>>> > ColorMyWorld activity from Charles Cossé and the nice port of
>>>>>>>>>>>> XOEditor,
>>>>>>>>>>>> > Reflection and Abacus activities by the GCI student Euan Ong.
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> > Sugarizer is growing every day: stay in touch !
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> > Best regards from France.
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >           Lionel.
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> >
>>>>>>>>>>>> > [1] https://github.com/llaske/sugarizer/tree/master
>>>>>>>>>>>> >
>>>>>>>>>>>> > [2] https://github.com/llaske/sugarizer/tree/dev
>>>>>>>>>>>> >
>>>>>>>>>>>> > (*) So if you're a developer and want to contribute to
>>>>>>>>>>>> Sugarizer, send
>>>>>>>>>>>> > your PR to the dev branch
>>>>>>>>>>>> >
>>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> _______________________________________________
>>>>>>>>>>> Sugar-devel mailing list
>>>>>>>>>>> Sugar-devel at lists.sugarlabs.org
>>>>>>>>>>> http://lists.sugarlabs.org/listinfo/sugar-devel
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> --
>>>>>>>>>> Walter Bender
>>>>>>>>>> Sugar Labs
>>>>>>>>>> http://www.sugarlabs.org
>>>>>>>>>> <http://www.sugarlabs.org>
>>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> --
>>>>>>>> Walter Bender
>>>>>>>> Sugar Labs
>>>>>>>> http://www.sugarlabs.org
>>>>>>>> <http://www.sugarlabs.org>
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> Walter Bender
>>>>>> Sugar Labs
>>>>>> http://www.sugarlabs.org
>>>>>> <http://www.sugarlabs.org>
>>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>> --
>>>> Walter Bender
>>>> Sugar Labs
>>>> http://www.sugarlabs.org
>>>> <http://www.sugarlabs.org>
>>>>
>>>
>>>
>>
>>
>> --
>> Walter Bender
>> Sugar Labs
>> http://www.sugarlabs.org
>> <http://www.sugarlabs.org>
>>
>
>


-- 
Walter Bender
Sugar Labs
http://www.sugarlabs.org
<http://www.sugarlabs.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20170324/b09eccfb/attachment-0001.html>
Previous message (by thread): [Sugar-devel] Sugarizer dev platform is now open
Next message (by thread): [Sugar-devel] Sugarizer dev platform is now open
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Sugar-devel mailing list