Skip to content

Instantly share code, notes, and snippets.

View edunham's full-sized avatar

E. Dunham edunham

455 followers · 42 following
View GitHub Profile
@edunham
edunham / autoland.md
Created February 7, 2017 17:55

Remaining work on autoland

  • hg -> git commit conversion -- cinnabar may expose a function we can just call here
  • test pulse integration to trigger tests on webhook (AIUI gps's stopgap doesn't do full configurable testing the way we need this to easily scale to)
  • test commenting to github and to mozreview in event of build failure
  • test pushing to auto branch on a github repo (interim measure till Servo switches to taskcluster)
  • trigger merge on treeherder result availability
@edunham
edunham / oulipo.txt
Created April 13, 2017 23:32
https://motherboard.vice.com/en_us/article/its-like-tweeting-but-you-cant-use-the-letter-e
Mastodon is a social platform on which folks "toot" back and forth, similar to
that famous microblog host with a bird logo. But Mastodon allows customization
by all who can author programs.
And computational wizards who build custom Mastodon parts stay surprising.
Mous* R**v* has a day job writing programs for Int*rn*t Archiv*, built a
Mastodon thing known as oulipo.social with a singular big law: Nobody may to
@edunham
edunham / servo-merged-PRs.txt
Created June 23, 2017 21:49
0 from 2012-02-01 to 2012-03-01
0 from 2012-03-01 to 2012-04-01
0 from 2012-04-01 to 2012-05-01
0 from 2012-05-01 to 2012-06-01
0 from 2012-06-01 to 2012-07-01
0 from 2012-07-01 to 2012-08-01
0 from 2012-08-01 to 2012-09-01
0 from 2012-09-01 to 2012-10-01
0 from 2012-10-01 to 2012-11-01
0 from 2012-11-01 to 2012-12-01
@edunham
edunham / solution.sh
Last active February 14, 2018 20:07
git checkout -b working # Create new branch named working. We don't care where from. Doesn't really matter what it's called.
git fetch upstream devel # get the latest commits on ansible/devel available
git reset --hard upstream/devel # force current branch to be exactly the commits on ansible/devel
git cherry-pick b4b5d2b93ee94b0e28308739a1f1f79552786a22 # apply just that one commit
# fix the merge conflicts
# now branch 'working' has what branch 'devel' *should* have had all along
git branch -D devel # delete the local branch named devel, since you have the changes on branch 'working' now. This does not change what's on your GitHub.
git checkout -b devel # make a new local branch named devel from where we were at, which was correct state for devel
git push --force origin devel # force push the contents of current devel branch to overwrite the devel branch on your github.
# in prior command, 'kbreit' is the remote name for your fork as shown in the repo's .git/config