additional history

[aaren]

This is a master issue for additional bits of history that need grafting on to the python lesson.

See also https://github.com/wking/swc-modular-shell/issues/3

• [x] history prior to b8c7dc3 (see #1) (see https://github.com/wking/swc-modular-shell/issues/3 for tips)

[aaren]

@gvwilson @r-gaia-cs I've attached the history from before the reorganisation.

[rgaiacs]

@aaren did you use --prune-empty?

*   029017d Resolving conflict in Makefile (two new targets added)
|\  
| *   dbba547 Merge branch 'checking-glossary'
| |\  
| | *   0e95d5d Merge branch 'master' of github.com:swcarpentry/bc into checking-glossary
| | |\  
| * | \   18118e4 Merge branch 'master' of github.com:swcarpentry/bc
| |\ \ \  
| | * \ \   63aca02 Merge pull request #190 from gvwilson/checking-glossary
| | |\ \ \  
| | | |/ /  
| | | | /   
| | | |/    
| | |/|     
| | | * e60f0cc Filling in another 40-odd glossary entries
| | | * 30f6d5f Filling in glossary entries
| | | * 32c6b0c Fixing typo in reference to glossary entry
* | | | ce540d2 Building a tool to generate a contact sheet of images, and fixing some unsized images as a result
* | | | 284f3f0 Resizing bounding boxes of SVGs (manually, since LibreOffice doesn't do it)
* | | | 9a7de6e Diagrams for novice Python tutorial
|/ / /  
* | | 3d7b7e3 Notes on what diagrams need to be drawn
|/ /  
* | fa0ab29 Switching to numbered list for lesson links in index files
|/  
* bcfdb48 Python cheat sheet

There are some merge commits that didn't merge anything (e.g. 0e95d5d).

Other than that this looks OK. Thanks take care of this.

[aaren]

@r-gaia-cs no I forgot. Will redo.

[aaren]

@r-gaia-cs actually I'm not sure where I've missed it off. Can you help?

This is basically what I've done: https://gist.github.com/aaren/0fab3586c056184f3b3b

[aaren]

@r-gaia-cs think I worked it out.

Currently I'm using:

git subtree split -P novice/python -b novice-python-history
git checkout novice-python-history

but git subtree doesn't take --prune-empty. Should replace with this:

git checkout -b novice-python-history
git filter-branch --subdirectory-filter novice/python --prune-empty

[rgaiacs]

@aaren

Should replace with this:

git checkout -b novice-python-history
git filter-branch --subdirectory-filter novice/python --prune-empty

Yes.

[aaren]

@r-gaia-cs have pushed pruned history.

[rgaiacs]

@aaren Sorry that I didn't remember that --prune doesn't remove merge commits. From git help filter-branch

(...) this switch only applies for commits that have one and only one parent, it will hence keep merges points.

Yesterday I talk with @wking in our IRC channel and we agree to let the maintainers (@abostroem and @tbekolay in this case) vote on this since will require more work to remove those empties merge commits.

[gvwilson]

If the empty merge commits aren't doing any harm, and aren't mistakenly attributing authorship to people who didn't write files we're keeping, I vote for going ahead with the history as-is - we need to get rolling.

[abostroem]

@aaren where do the empty merges come from - are they a relic of the history or were they introduced during the history extraction? @gvwilson are we trying to clean up the history while we extract or just extract and move on?

[gvwilson]

Just extract and move on, please - as long as everyone who contributed is showing up in the history, so that we can give people credit they deserve, we don't have to be the prettiest repo in the world.

[abostroem]

ok, @aaren I think you have your answer.

[rgaiacs]

where do the empty merges come from - are they a relic of the history or were they introduced during the history extraction?

Sorry to not be clear about that. The empty merges are relic of the history. They are the result of using GitHub's green button.

[aaren]

sounds good to me. If everyone is correctly attributed it's much simpler to just keep moving.

re the big green button: it would be nice if github allowed rebasing for PRs but then you wouldn't have a record of who merged the PR, which could be useful.

[gvwilson]

So do we think the novice Python lesson is baked?

[aaren]

If the only history to attach was that from before python/novice -> novice/python then I think yes.

[gvwilson]

@katyhuff if you have a few minutes, can you look through the history of this and see if it captures everything important?

[katyhuff]

Sorry for the delay. I think it looks ok?