merge upstream changes

[ayushnawal]

Rebased with llaske
as suggested by @quozl in #5

[srevinsaju]

@ayushnawal a suggestion: The title merge upstream changes would be nice :)

[ayushnawal]

@quozl a gentle reminder.

Will you please also review some of these pull requests too:
#1
#15
#1
#9
#10

Thanks 😁

[quozl]

Sorry, too busy. We have other reviewers. Also, I don't have the skills to review JavaScript activities, you'll have to find someone else for this one. Correction, it's not JavaScript. It's Mono. I'm not sure if rebasing with the other repository is the right way to fix #5.

[ayushnawal]

I'm not sure if rebasing with the other repository is the right way to fix #5

rebased as suggested in #5 . can you help me in proceeding further?

[quozl]

I'm not sure if rebasing with the other repository is the right way to fix #5

rebased as suggested in #5 . can you help me in proceeding further?

You're chosen to use git rebase to solve the issue. I think the issue could also be solved by deleting this repository and forking the other repository. Why is a git rebase a better way to solve it?

[ayushnawal]

Why is a git rebase a better way to solve it?

I thought of keeping the commit history and contributions made by @cristian99garcia

And also some of the source files like activity.py and LICENSE etc were not in llaske's repository.

Please suggest to me how to proceed because I don't have rights to delete this repository.

[quozl]

Why is a git rebase a better way to solve it?

I thought of keeping the commit history and contributions made by @cristian99garcia

What is in those commits that isn't in https://github.com/llaske/RiverHexActivity?

[ayushnawal]

Thanks

As I mentioned above, files like: activity.py and some basic files like LICENSE, .gitignore.

Although I just did what I assumed from #5 , please suggest how can we proceed from here as I don't have the rights to delete this repository.

[quozl]

Thanks for your assessment. I've looked at the two repositories again;

• the repositories do not share any commit history,
• the file bin/riverhexactivity.exe is the same as RiverHexActivity.activity/bin/riverhexactivity.exe,
• activity.py is a copy of a wrapper that along with changes to activity.info which checks the system architecture and if it is compatible it does what the original activity did, which is to run the riverhexactivity-activity shell script, otherwise it prints a message,
• LICENSE is the full form of the GPLv3 license text, but this isn't in the other repository, and there is no obvious copyright or license in the other repository,
• .gitignore is new, but irrelevant.

I've also looked at the RiverHex-2.xo bundle on activities.sugarlabs.org.

Here's what I think happened;

• as part of GCI 2015, @cristian99garcia downloaded the activity bundle instead of the source code repository, unpacked the bundle, added it to a git repository, and added a wrapper to check for wrong system architecture, but did not release it.

Here's what I think should happen if we are to keep this activity;

• determine the copyright and license,
• rewrite and maintain for multiple system architectures (32-bit Intel, 64-bit Intel, and Raspberry Pi ARM); a job for someone who can program in the Mono and C# environment,
• discard the changes to detect the system architecture,
• keep a fork of the main repository.

@srevinsaju, @ayushnawal, @chimosky, please review above and comment.

I feel betrayed. I really didn't want to have to do the above, and that's why I added the issue #5. I shouldn't have to guide people through every step of a complex issue. That's what issues are for.