edunham

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

edunham

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

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

#    yaourtrc  - Configuration for yaourt
# 
#   See yaourtrc(5) for more information
#   
#

# General
#AUTOSAVEBACKUPFILE=0
#DEVELBUILDDIR="/var/abs/local/yaourtbuild"
#DEVEL=0

edunham

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

components/script/dom/webidls/HTMLFormElement.webidl,
components/script/dom/webidls/DOMStringMap.webidl,
components/script/dom/webidls/Touch.webidl,
components/script/dom/webidls/Screen.webidl,
components/script/dom/webidls/HTMLDetailsElement.webidl,
components/script/dom/webidls/HTMLImageElement.webidl,
components/script/dom/webidls/Worker.webidl,
components/script/dom/webidls/TreeWalker.webidl,
components/script/dom/webidls/HTMLMediaElement.webidl,
components/script/dom/webidls/HTMLTitleElement.webidl,

edunham

manifest_version = "2"
date = "2016-02-27"\m[pkg.rust]
    version = "1.8.0-nightly (917db28b5 2016-02-19)"
    [pkg.rust.target.i686-unknown-linux-gnu]
        available = true
        url = "https://dev-static.rust-lang.org/dist/2016-02-27/rust-nightly-i686-unknown-linux-gnu.tar.gz"
        hash = "afdb2889cea5d16d4fe8477e832e3eb3467d38f72523d68df64f80641136e6c2"
        [[pkg.rust.target.i686-unknown-linux-gnu.components]]
            pkg = "rust-std"
            target = "i686-unknown-linux-gnu"

edunham

manifest_version = "2"
date = "2016-02-22"
[pkg.rust]
    version = "1.6.0-nightly (00aa3cbec 2015-11-09)"
    [pkg.rust.target.aarch64-unknown-linux-gnu]
        available = false
    [pkg.rust.target.arm-linux-androideabi]
        available = false
    [pkg.rust.target.arm-unknown-linux-gnueabif]
        available = false

edunham

manifest_version = "2"
date = "2016-02-22"
[pkg.rust]
    version = "1.6.0-nightly (00aa3cbec 2015-11-09)"
    [pkg.rust.target.aarch64-unknown-linux-gnu]
        available = false
    [pkg.rust.target.arm-linux-androideabi]
        available = false
    [pkg.rust.target.arm-unknown-linux-gnueabif]
        available = false

edunham

manifest_version = "2"
date = "2016-02-22"
[pkg.rust]
    version = "1.6.0-nightly (00aa3cbec 2015-11-09)"
    [pkg.rust.target.aarch64-unknown-linux-gnu]
        available = false
    [pkg.rust.target.arm-linux-androideabi]
        available = false
    [pkg.rust.target.arm-unknown-linux-gnueabif]
        available = false