[Do Not Auto-Merge] Bring in history for the lessons/thw-shell/ directory #114
Conversation
W. Trevor King: I dropped everything from the original 47faad7 except for the 1-Shell/Readme.rst addition.
W. Trevor King: I removed everything from the original 7d32d4e except the 1-Shell/Readme.md addition.
…ce of UofCSCBC2012 so as to have correct org and repo name.
edits for clarity. Added reference to xargs, command history.
…ructure intended for the master branch, in case we merge this in. A bunch of things still need to be done. The software engineering section isn't completely moved and the readmes are still in rst rather than md. W. Trevor King: I removed everything from the original 00149bc except the 1-Shell -> shell move.
…g into shell * commit 'eaa809f': Added Da for Shell example
|
Don't merge this yet, I'm rebasing to root it on |
…nary into shell * commit '6af7758': Added a dictionary to 1-Shell directory to demonstrate searching in less. Necessary to replace /usr/share/dict/american-english that went away when we changed VMs.
|
@wking - no problem. Drop a ping when this is ready for review again. |
Match the file names from 2cc715f (Importing legacy shell lesson, 2013-07-18).
W. Trevor King: I resolved both conflicts with: $ git checkout 2cc715f -- lessons/{index.html,shell/tutorial.md} There is a surprising amount of divergence between Greg's tutorial.md in the original 2cc715f and the shell/Readme.md that was current in boot-camps as of 2013-07-18 when Greg created 2cc715f. The then-current boot-camps version of shell/Readme.md had a hash of bb9592b and was created by commit 9ca5e3f (Changing 'git clone' URL in shell README to the read-only git:// URL., 2013-05-13). This matches the hash after commit e3a10f8 in my cherry-picked git://tremily.us/swc-modular-shell repository, so I'm not sure where the missmatch comes from. Perhaps Greg just edited the file fairly extensively before committing 2cc715f? Conflicts: lessons/index.html lessons/shell/tutorial.md
W. Trevor King: This history-reconstruction is for the shell tutorial, so I removed the Git portion of this commit: $ git rm -rf lessons/thw-git Conflicts: lessons/thw-git/instructors.md lessons/thw-git/local.md lessons/thw-git/remote.md
W. Trevor King: This history-reconstruction is for the shell tutorial,
so I removed the non-shell portions of this commit:
$ git rm -rf lessons/thw-{git,matplotlib,numpy,python,testing}
Conflicts:
lessons/thw-git/local.md
lessons/thw-git/remote.md
lessons/thw-matplotlib/tutorial.md
lessons/thw-numpy/tutorial.md
lessons/thw-python/data-structures/data_structures.ipynb
lessons/thw-python/data-structures/tutorial.md
lessons/thw-python/flow-control/python_flow_control.ipynb
lessons/thw-testing/tutorial.md
W. Trevor King: I resolved the conflicts with: $ git checkout HEAD -- lessons/shell/tutorial.md because Anthony restores the Markdown version in e773e8d (reconstituted markdown version of shell tutorial, 2013-09-05). By not removing it here, we make life easier for 'git blame' and 'git log --follow'. Conflicts: lessons/shell/tutorial.md
…e command as `cd`
I resolved the conflicts with: $ git checkout HEAD -- lessons/index.html Other than that, the merged branch exactly matches the current bc repository, and this history injection allows folks to use 'git log --follow' to do archeology on the shell lesson. Apparently 'git blame' prefers the first parent of commits where a file exists on each side, so blame still attributes most Readme.md lines to Greg's 2cc715f (Importing legacy shell lesson, 2013-07-18). If you want the history leading up to that commit, I recommend you use: $ git blame 93632b2 -- lessons/shell/tutorial.md I don't know of a way to fix the default blame output that doesn't involve filter-branching the history into bc. * shell: (61 commits) Suspected typo but not sure? bootcamp_slug? Otherwise just renders the command as `cd` coverted tutorial to ipynb Fixing typos in material imported from THW Renaming shell and git tutorials to allow for others beside them Importing legacy shell lesson lessons/shell: Reorganize to match initial bc import Added Da for Shell example Added a dictionary to 1-Shell directory to demonstrate searching in less. Necessary to replace /usr/share/dict/american-english that went away when we changed VMs. Changing 'git clone' URL in shell README to the read-only git:// URL. Fix shell header Added some words about the history command and bang-history # direct access. Fix old typo on file size. Clean up ambiguity between file and filename. There is no executable in the boot-camps directory - need to cd to shell dir first. remove some spaces getting in the way of bold Seem to have the tables figured out - they need a header - annoying Can we get some documentation on tables A few more changes to be consistent and clear. Some formatting and flow changes: Update shell/Readme.md ... Conflicts: lessons/index.html
|
On Thu, Oct 31, 2013 at 08:58:12AM -0700, W. Trevor King wrote:
Done. |
|
I'm closing this in light of #121 and #126. If @gvwilson and @ethanwhite are interested, I can setup a namespaced branch of my shell reconstruction for either of the new locations. |
|
@wking - Just to be 100% clear, I would have pressed the |
|
On Sat, Nov 02, 2013 at 12:49:49PM -0700, Aron Ahmadia wrote:
There's a lot in here, and I'm not sure if it's headed for the |
|
Okay, it's really up to you. |
|
I agree with @ahmadia both in that it's definitely up to you, and in that if we're going to bring this (and other) history in it's more likely to happen if we do it now than if we wait. |
|
On Sat, Nov 02, 2013 at 02:10:22PM -0700, Ethan White wrote:
I just posted to #121 and #126 asking for guidance on what portions of |
|
@wking - apologies for the confusion, the plan is to start moving material out of lessons and into novice and intermediate. We're working out off-list exactly what our strategy for that, but we are not planning on accepting any more PRs (beyond what's currently open), into lessons. |
A sub-part of #79 along the lines of #89.
This pull-request is pre-merged for easy inspection, so don't use the
usual GitHub machinery to merge it. If folks want this in bc, let me
know, and I'll recreate cf82bdc on top of the then-current bc/gh-pages
branch.
@gvwilson, e3a10f8 (swcarpentry/DEPRECATED-boot-camps@9ca5e3f) is my best guess
at your starting point for
lessons/shell/tutorial.md, since that'swhat boot-camps had in
shell/Readme.mdwhen you created 2cc715f.The Markdown content is not identical though, so let me know if there
are some intervening commits that I'm missing.