Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete repository #9

Open
quozl opened this issue Nov 12, 2018 · 22 comments

Comments

Projects
None yet
6 participants
@quozl
Copy link
Contributor

commented Nov 12, 2018

https://github.com/fdanesse/Bichos is the upstream repository for this activity, and contains the history and is the place where a maintainer has done the most work.

  • fork the other repository,
  • compare the two repositories,
  • merge the histories,
  • delete this repository.
@avinashbharti97

This comment has been minimized.

Copy link

commented Jan 19, 2019

@quozl What you mean by 'this' in 'delete this repository'?

from my interpretation what we have to do is merge the all commit histories of https://github.com/fdanesse/Bichos with the https://github.com/sugarlabs/bichos-activity/ and keep the https://github.com/sugarlabs/bichos-activity/ for future development.

So by 'this' are you referring to the maintainer's Repo or the current Repo?

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented Jan 20, 2019

@avinashbharti97, no, this means https://github.com/sugarlabs/bichos-activity because that's where is issue is connected.

Many activities are held in repositories that are not in the https://github.com/sugarlabs organisation. Moving repositories to the organisation is by permission of the repository owner, and if we don't get permission, we create a fork using GitHub. The https://github.com/fdanesse/Bichos repository is owned by @fdanesse. The https://github.com/sugarlabs/bichos-activity repository is not fork using GitHub. So my list above is correct; at the start there are two repositories (improperly forked), during the middle steps there are three repositories, and after the last step there are two repositories (properly forked).

@avinashbharti97

This comment has been minimized.

Copy link

commented Jan 21, 2019

@quozl I merged this Repository into a fork of https://github.com/fdanesse/Bichos keeping histories of both the Repositories which is available here:-
https://github.com/avinashbharti97/Bichos

But on cloning the merged repo as an activity (appending .activity) into sucrose doesn't show up in activity list, and I couldn't understand the reason behind this behavior.
The possible reason could be:

  • Sucrose installed on my laptop is broken or having some issue
  • Activity broke in the process of merge
  • something else

I will try it again after installing sugar on virtual box.
It would be helpful if you will test the merged activity.

Thanks

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented Jan 21, 2019

Considering only "doesn't show up in activity list", the causes can be;

  • the change happened too gradually, and when Sugar went to check the change found the activity incomplete; workaround is to touch the Bichos.activity directory, and this is done by OLPC OS packages for Ubuntu to ensure Sugar checks again, or;
  • the activity metadata is invalid.

In both scenarios, you may find confirming evidence in shell.log, so please check it.

Regarding testing the activity; I'm not familiar with it. Do you have a test plan?

@avinashbharti97

This comment has been minimized.

Copy link

commented Jan 22, 2019

Since the activity is not in english language I would not like to test it. And by 'test' I only meant to check if the merged activity is working or not. So all I wanted is to check by cloning the repo as an activity bundle and if all seems okay then I will make a pull request to the original developer.

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented Jan 22, 2019

Thanks.

@tony37

This comment has been minimized.

Copy link

commented Feb 27, 2019

The simple process is to base a repository on the activity as stored in the ASLO archive. Changes to the activity in a developer's repository is irrelevant. A change to an activity should be submitted by pull request.

A history of the changes made between the current version and the one created by a pull request can be included in the pull request.

Tony

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented Feb 28, 2019

Thanks, but as you don't make changes as a developer, your opinion is not needed on the issue. This is an issue of development source control, as distinct from release source control.

@tony37

This comment has been minimized.

Copy link

commented Feb 28, 2019

@fdanesse

This comment has been minimized.

Copy link

commented Feb 28, 2019

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented Mar 1, 2019

@tony37, no it isn't shown. You only added v1 and v2 commits. All the other commits before that were lost. This isn't the way developers use git. We use git not just as a release source control system, but also as a development source control system. Perhaps you've not used it that way; fine, but let us use it the way git is normally used. We use git bisect in particular to track down which change in development caused a problem. Each change carries context which helps. Adding commits for whole bundles reduces the usefulness of git.

@fdanesse, my apologies, this repository was created by @tony37 against the wishes of other developers. In doing that he lost your commit history; your authorship, dates, and specific changes. I'd like to get them back. I think the way to get them back is to;

  • fork your repository to Sugar Labs,
  • compare the two repositories,
  • merge the histories, (not a simple merge as @avinashbharti97 did, but a cherry-pick),
  • delete this repository.

I'm not the best person for the job because I don't understand the activity and can't read the language. So I created this issue so that when someone does become available, they can work on it.

Eventually, a new release can be made.

@tony37

This comment has been minimized.

Copy link

commented Mar 1, 2019

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented Mar 1, 2019

But @tony37, you don't do development with us; no source code changes, just lots of verbal conflict, and trolling like "what you call the 'Sugar Desktop'". Please stop intruding. If you really cared, we'd see you working on real problems rather than always whinging about how we do things.

@walterbender

This comment has been minimized.

Copy link
Member

commented Mar 1, 2019

@tony37 As I explained some time ago when you made repos without preserving the git commit history, this (1) makes it harder for maintainers to follow the logic of changes; (2) it removes valuable information for the learner by suggesting that activities appear in whole clothe rather than being an iterative process that often involves many disparate contributors; (3) it devalues the role of the individuals who contributed their time and talent in creating the activity, more often than not with no other compensation than acknowledgement of their work from the community, users, and potential contributors, and (4) it anonymizes their contributions, making it unclear whom a potential contributor might consult for help with the activity in question or other activities that may be related in theme or practice.

As someone who has written quite a few Sugar activities, I find the practice of deleting the git history really off-putting.

We have had well-established processes in place (documented here) that has been working well. If you have issues with these instructions, please raise your issues with the community either as a GH issue or in a discussion thread on the devel mailing list.

@fdanesse

This comment has been minimized.

Copy link

commented Mar 1, 2019

@nswarup14

This comment has been minimized.

Copy link

commented May 20, 2019

@quozl
I have merged the histories of the two repositories here. I have resolved any conflicts that arose while cherry-picking the commits.
Please Review.

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented May 20, 2019

Thanks for your work on this. I think from the responses so far that I've failed to properly explain what was needed, so I've done it myself. Look at https://github.com/sugarlabs/Bichos/commits/master for the result so far. Note how few commits are listed.

Here's what I did;

  • downloaded the v1 and v2 bundles from sunjammer.sugarlabs.org,
  • unpacked the bundles,
  • cloned the https://github.com/fdanesse/Bichos upstream repository,
  • located the git hash in upstream that most closely matched v1, it was da567a6,
  • located the release announcement to establish the date and time, it was "2014-10-11 11:51:17",
  • added a backdated git tag,
GIT_COMMITTER_DATE="2014-10-11 11:51:17" git tag v1 da567a6
  • located the git hash in upstream that most closely matched v2, it was HEAD,
  • added a backdated commit and tag,
git --author="flavio <fdanesse@gmail.com>" --amend --date="2014-11-06 08:36:10" 
GIT_COMMITTER_DATE="2014-11-06 08:36:10" git tag v2

The tags would not push though, and I'm looking into that. Any hints welcome!

$ git push --tags
Total 0 (delta 0), reused 0 (delta 0)
To github.com:sugarlabs/Bichos.git
 ! [remote rejected] v1 -> v1 (pre-receive hook declined)
 ! [remote rejected] v2 -> v2 (pre-receive hook declined)
error: failed to push some refs to 'git@github.com:sugarlabs/Bichos.git'

Workaround may be to not backdate the tags.

@nswarup14

This comment has been minimized.

Copy link

commented May 20, 2019

@quozl
I think I finally understood the issue at hand. I wasn't aware about how tagging takes place on Git, so I might have cherry-picked the commits incorrectly.

You have mentioned how you downloaded v1 and v2 bundles from sunjammer.sugarlabs.org. However, I am unable to find the bundles in the above link. The link redirects me to a static web page and with the following information.

"Hello, my name is sunjammer.sugarlabs.org and I live at the Global NAPs collocation facility, hosted by the FSF.
My job is to run the core infrastructure of Sugar Labs, a non-profit promoting a creative learning environment designed for young children"

Regarding why the tags failed to push to the clone, I'm trying look for a solution online.

Thanks!

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented May 20, 2019

Thanks. Sorry about that. Bundles are available here;

I got to that directory from

I knew the bundle number from searching for the release announcements in my mail;

Might you try adding the same backdated tags and pushing them to your repository? This will at least confirm it isn't a problem with my environment. Use git push --tags to push tags.

@nswarup14

This comment has been minimized.

Copy link

commented May 20, 2019

@quozl
I was successfully able to push the tags to the right commit messages. However I was only able to push it to my fork (here), and I can't seem find an option to make a PR. Can you guide me on this?

Thanks.

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented May 22, 2019

I was able to push tags. Let's keep this repo for a week.

@quozl

This comment has been minimized.

Copy link
Contributor Author

commented May 28, 2019

Reviewed the situation. While we have a plan to delete this repository, it contains the pull requests that led to the issue sugarlabs/Bichos#2, so I'll wait for that issue to close before deleting this repository.

@nswarup14 nswarup14 referenced this issue Jun 18, 2019

Closed

Unconnected forks to be merged #8

5 of 5 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.