Bits of history we've found and grafted on

[wking]

This is a meta issue for laying out which history we've found for bc's novice/shell, and whether or not it's been grafted into this repository's master branch:

• everything from swcarpentry/bc under the novice/shell name (since swcarpentry/DEPRECATED-bc@b8c7dc3 (Reorganizing material to put novice + intermediate at top level, 2014-02-16), see Splitting novice/shell into an independent repository DEPRECATED-bc#812 for commands used).
• everything from swcarpentry/bc under the shell/novice name (after swcarpentry/DEPRECATED-bc@3a38907 (shell: Rename the new-style lessons from 'bash' to 'shell', 2014-01-09, shell: Rename the new-style lessons from 'bash' to 'shell' DEPRECATED-bc#222), but before swcarpentry/DEPRECATED-bc@b8c7dc3, see Attach shell/novice history from before swcarpentry/bc@b8c7dc3  #3 for commands used).
• everything from swcarpentry/bc under the bash/novice name (before swcarpentry/DEPRECATED-bc@3a38907, see Attach shell/novice history from before swcarpentry/bc@3a38907 #4 for commands used).
• the gen-*.py scripts which were dropped by the filter-branch in Attach shell/novice history from before swcarpentry/bc@3a38907 #4 (see Restore gen-*.py script history #13 for commands used).
• any copy-paste commits there, if it wasn't all from scratch. Mention them (or sections of history that you know were from scratch) and I'll add them to this list.
• cleanup commit-message formatting for long commits like swcarpentry/DEPRECATED-bc@5705090 (Getting rid of old cheat sheets …, 2014-02-27, see Cleanup commit-message #9 for commands used).
• remove auto-generated content
• track down sources for downloaded content (see Remove auto-generated files from version control and find sources for downloaded data. #14).
• Add novice/ref/01-shell.md and novice/teaching/02-shell.md (see Add novice/ref/01-shell.md and novice/teaching/02-shell.md #27 for commands used).

[wking]

I've marked the shell/novice item closed, and added a new item for bash/novice (see #3).

[wking]

I've marked the bash/novice item closed, and added a new item for the gen-*.py scripts (see #4).

[wking]

I've marked the commit-message cleanup item closed (via #9), but:

• We're still waiting for acks from Bernhard and Meg on the changes. Greg said the changes to his commits were fine in an off-list email.
• We may have more commit messages that need rewriting as we graft on additional history.

[twitwi]

I've been working on this for some time now. I learnt a few things and made (little) progress.

My goal was to recover the history of gen-*.py.
Toward this goal, I ended up starting "from scratch" meaning from the bc/master.
I also wanted to have something reproducible and easier to update.

In the end it is there: https://github.com/twitwi/swc-modular-shell-bootstrap

I managed to keep the history from the 3 folders (successive names) and to clean the commit messages. In addition, I managed to keep gen-*.py but the history (given by git log --follow) is incomplete… and I'm not sure to understand why. Overall the produced history looks quite like swc-modular-shell/master (as of today).

It is not a big/real progress but it might be easier to update, e.g. to remove generated files.
NB: the first step is time consuming (rewriting history) and is better off on a ram drive.

@wking @gvwilson I'll stop working on it for now. I wish I had made more progress.

[wking]

On Fri, Nov 21, 2014 at 04:41:31AM -0800, Rémi Emonet wrote:

Toward this goal, I ended up starting "from scratch" meaning from
the bc/master. I also wanted to have something reproducible and
easier to update.

Have you posted your procedure somewhere? I'd like to figure out how
the gen-*.py bit worked so we can reuse the approach if we find a
similar situation later.

[twitwi]

It's in the repo linked above

https://github.com/twitwi/swc-modular-shell-bootstrap

I guess it's not a 100% git clean approach.

[wking]

On Fri, Nov 21, 2014 at 01:03:11PM -0800, Rémi Emonet wrote:

It's in the repo linked above

https://github.com/twitwi/swc-modular-shell-bootstrap

I guess it's not a 100% git clean approach.

I see your rebuilt history, I'm just looking for your notes on how you
rebuilt it (see for example, the “commands used” links in the topic
message for this issue).

[twitwi]

These commands are in the README.md of the repo linked in my previous message.
They use the script from the repo.
Let me know if I misunderstood your question.

[wking]

On Sat, Nov 22, 2014 at 11:34:29AM -0800, Rémi Emonet wrote:

These commands are in the README.md of the repo linked in my
previous message. They use the script from the repo. Let me know
if I misunderstood your question.

Oh, I'd thought that repo was your extracted history, sorry for the
confusion. I shoud have time to look through your repository in the
next few days.

[wking]

We're now live with additional post-bc history, so the window for fixing these issues has closed.