Splitting novice/shell into an independent repository #812
Comments
|
@gdevenyi and @ChristinaLK, a feature freeze on bc's novice/shell while we're factoring out the history would be good, so we don't have to reconstruct a moving target ;). Folks who need new stuff for a particular workshop can always merge an in-flight PR branch directly, and I'm happy to talk them through that process on |
|
I'll make sure we don't merge anything new to bc/shell. I believe at last check there's nothing pending because we resolved or delayed the requests and issues. |
|
@gdevenyi and @ChristinaLK (and any other interested parties), I think $ diff -u <(git ls-tree -r bc/gh-pages novice/shell | sed 's|novice/shell/||') <(git ls-tree -r modular-shell/master) The differences in 02-create.md (bc/gh-pages has f67f0b6d and $ git show 'modular-shell/master^{/Minor wording changes}' | grep -A1 diff guide.md and reference.md match bc's gh-pages, except in bc the files git ls-tree bc/gh-pages novice/teaching/02-shell.md The bc hashes are the same as the extracted history's hashes for those There are also a number of open checkboxes in Once we approve the extracted history, I can go through and merge the |
|
I'm going to be honest here, I'm not really qualified to review the history extraction. @wking has done an exceptional job at crunching through this and I trust he's done his best. It looks like the current state of the repo is consistent with bc, so we can move forward with this as bc depreciates. |
|
Good enough for me - I'll extract into a separate repository once the outstanding PRs are merged. Thank you @wking for all your hard work. |
I am assuming that if this were completed, there would be evidence in the mailing list, as a new release, or at least in the commit history. What is the status? Could there be a milestone, that the README can point to, with a list of associated issues (swcarpentry#812? swcarpentry#253?, others?) so future readers can find the status?
|
https://github.com/swcarpentry/shell-novice is past the history extraction stage, so I'm closing this. |
@gvwilson just gave us the green light for splitting out this lesson (see the meeting summary, blog post, and the #759 meta-issue). @tbekolay, @embray, and @twitwi offered to help with the Git wrangling, and @gdevenyi and @ChristinaLK are the Bash maintainers, so that's all the interested parties I know about. If anyone wants to ping someone else with a stake in this, please do.
The plan is to create an orphan branch for the novice shell content, and cherry-pick in stuff from bc (and possibly other repositories) to capture the development of that content without the distraction of the rest of bc. We can get a start with:
which gives me the 42 commits touching that stuff. It misses everything before b8c7dc3 (Reorganizing material to put novice + intermediate at top level, 2014-02-16) though, since before that the content was in
shell/novice/. The work will mostly be to trace the content back in time, identifying breaks like this, finding the code on the other side of the break, and grafting everything together until we've collected a more-or-less complete picture of how we got to where we are now.We can also take the opportunity to clean up some nonstandard commit messages like 8690c74 (In the novice shell lesson 03-pipefilter, changed sort to sort -n. In the lesson , the "sort" command is used to demonstrate sorting line counts. The lesson as written …, 2014-06-12) that skip the usual newline after the message summary, or skipped the summary altogether ;). In those cases (or when cherry-picking), it's best to add a note to the commit message describing your changes.
I have the original Hacker-Within example data already factored out (see #114) although there may have been subsequent development since then. I'm not sure if any of that content is used in the novice lesson though.
So the plan is to start researching and isolating this history. I've put the results of that initial
filter-branchcall here so we can all collaborate on them. Open an issue, pull request, or branch on your own fork as we work on this, so we can avoid duplicating work and keep up with all the rebasing. Ping me on Mozilla's #sciencelab if you want to chat about some Git gymnastics ;).The text was updated successfully, but these errors were encountered: