Extract History of novice R lesson

[tomwright01]

Hi, I'm just making a start on this. Can we please freeze development of this lesson for the next few days. Thanks. https://github.com/tomwright01/swc-modular-r

[gvwilson]

You're a good man, and we don't pay you what you're worth.

[tomwright01]

No one does!! Anyway I think this one is complete if someone else wants to audit. Thanks

[gvwilson]

@jdblischak Can you please have a look and make sure everyone's listed?

[jdblischak]

Thanks so much for doing this, @tomwright01. This is super helpful!

The history will be decently difficult to extract because the files were originally committed as plain Markdown and then converted to R Markdown. The main commits I see missing are @sarahsupp's original commit of the Markdown files (289ce2577f2c30214b66dc016cd818e1bdda7e22) and @dbarneche's converions to Markdown (d6e11d8dd6244531990b06ca4c2198336c71f6d2 and 50da52ac13646940ebcebae0bb36a837456f3672).

Another thing I noticed, but is not a big deal if it is too much work to change, is that some unneccesary commits are included. For example, we do not need any commits in the repo pertaining to the intermediate R materials, e.g. the supplemental lesson on the data.table package (2272c550f36e3e24274579fbd9fcfc4ac4eee3e8).

[gvwilson]

Thanks from me as well - I'm not worried about false positive (unnecessary commits), but it's essential that there be no false negatives (missing contributions and credit). Please let me know if I can help... Thanks, Greg

[tomwright01]

Thanks John, that clarifies a few things. Also development seems to have taken place into both the master branch and gh-pages. I'm guessing I missed some early changes from master. I'll taken a look into the next couple of days. On Nov 23, 2014 8:12 AM, "John Blischak" notifications@github.com wrote:

Thanks so much for doing this, @tomwright01 https://github.com/tomwright01. This is super helpful!

The history will be decently difficult to extract because the files were originally committed as plain Markdown and then converted to R Markdown. The main commits I see missing are @sarahsupp https://github.com/sarahsupp's original commit of the Markdown files ( 289ce25 https://github.com/swcarpentry/bc/commit/289ce2577f2c30214b66dc016cd818e1bdda7e22) and @dbarneche https://github.com/dbarneche's converions to Markdown ( d6e11d8 https://github.com/swcarpentry/bc/commit/d6e11d8dd6244531990b06ca4c2198336c71f6d2 and 50da52a https://github.com/swcarpentry/bc/commit/50da52ac13646940ebcebae0bb36a837456f3672 ).

Another thing I noticed, but is not a big deal if it is too much work to change, is that some unneccesary commits are included. For example, we do not need any commits in the repo pertaining to the intermediate R materials, e.g. the supplemental lesson on the data.table package (2272c55 https://github.com/swcarpentry/bc/commit/2272c550f36e3e24274579fbd9fcfc4ac4eee3e8 ).

— Reply to this email directly or view it on GitHub https://github.com/swcarpentry/bc/issues/880#issuecomment-64117477.

[tomwright01]

I've taken another pass at this, I think it looks better this time. The false positives are still there but they won't come out nicely . @jdblischak would you mind doing an audit?

[jdblischak]

I agree with Greg that false positives are not a concern, so no need to spend any more time trying to clean those up.

I searched for the commits I mentioned in my previous comment, but I was not able to find them. I searched for them by grep'ing the git log, e.g.

git log | grep sarahsupp -A 3 -B 3
git log | grep dbarneche -A 3 -B 3

Perhaps I am just being dense. If you managed to include these commits in this latest update, could you please help me find them?

[tomwright01]

Hi John, I'm wondering if I have managed to push up the wrong branch. git log | grep sarahsupp -A 3 -B 1

commit 2320a65d0f22331d3297425602d067ee101d53ff Author: sarahsupp sarah@weecology.org Date: Tue Mar 25 09:47:13 2014 -0400

adding R novice lessons that I started for NYU bootcamp

I've pushed the my working branch up as a new remote branch 'test'.

[jdblischak]

OK, the branch 'test' looks good. It contains the commits I mentioned above. I also did a further check to make sure that all of Gavin's commits were included, and that also checked out (the only commits of his from the bc repo that are missing are his commits to the intermediate materials).

So I am happy with this new repo. @gvwilson, how do we proceed?

[jdblischak]

@tomwright01, is there any chance you could also bring in rmd.mk? It is the Makefile for building the novice R lessons, but it is at the base of the bc repo. If it is too much trouble don't bother because I can always just add it again.

[tomwright01]

Ok, I cherry picked the commit 945b86f6624c06d379e2da4d19c986666ae223ae

and had to manually replay the change made in commit: 934ae6e1ac9942ea4a93a920eced268cc03b4b51

[gvwilson]

Thanks - do we think this one's ready to convert to the new template?

[jdblischak]

Thanks, @tomwright01! Great work on extracting the history!

@gvwilson, yes, I think so. What are the next steps? Should I solicit volunteers on r-discuss? Is the plan to continue working in the repo Tom created?

[gvwilson]

Hi John, I'll do the next step then mail back a pointer to the new repo. Thanks very much, Greg

[tomwright01]

@gvwilson @jdblischak Following a comment by @wking https://github.com/wking/swc-modular-shell/issues/27 I realised this repo was also missing the reference sheet novice/refs/06-R.md, I've now added it.

[gvwilson]

Hi Tom, Ouch - I've already ported stuff over to a new repo and started moving things around. How much history is there in the reference sheet that isn't captured in other files? Cheers, Greg

On 2014-12-08 3:46 PM, Tom Wright wrote:

@gvwilson https://github.com/gvwilson @jdblischak https://github.com/jdblischak Following a comment by @wking https://github.com/wking wking/swc-modular-shell#27 https://github.com/wking/swc-modular-shell/issues/27 I realised this repo was also missing the reference sheet novice/refs/06-R.md, I've now added it.

— Reply to this email directly or view it on GitHub https://github.com/swcarpentry/bc/issues/880#issuecomment-66184043.

Dr. Greg Wilson | gvwilson@software-carpentry.org Software Carpentry | http://software-carpentry.org

[tomwright01]

Not much. Half a dozen commits that dont touch anything else and.can.just be cherry picked. On Dec 8, 2014 4:12 PM, "Greg Wilson" notifications@github.com wrote:

Hi Tom, Ouch - I've already ported stuff over to a new repo and started moving things around. How much history is there in the reference sheet that isn't captured in other files? Cheers, Greg

On 2014-12-08 3:46 PM, Tom Wright wrote:

@gvwilson https://github.com/gvwilson @jdblischak https://github.com/jdblischak Following a comment by @wking https://github.com/wking wking/swc-modular-shell#27 https://github.com/wking/swc-modular-shell/issues/27 I realised this repo was also missing the reference sheet novice/refs/06-R.md, I've now added it.

— Reply to this email directly or view it on GitHub https://github.com/swcarpentry/bc/issues/880#issuecomment-66184043.

Dr. Greg Wilson | gvwilson@software-carpentry.org Software Carpentry | http://software-carpentry.org

— Reply to this email directly or view it on GitHub https://github.com/swcarpentry/bc/issues/880#issuecomment-66188026.

[gvwilson]

Thanks - can you patch it in once I've finished reorganizing files?

[tomwright01]

No problem.

On Tue, 2014-12-09 at 03:59 -0800, Greg Wilson wrote:

Thanks - can you patch it in once I've finished reorganizing files?

— Reply to this email directly or view it on GitHub.

[wking]

Can this be closed now that we have https://github.com/swcarpentry/r-novice-inflammation?

[jdblischak]

Yes. Thanks for the reminder, @wking. And of course thanks for the great work, @tomwright01.