Rustup 20140508

[larsbergstrom]

r? @SimonSapin

Is this what you'd expect? (merge into master)

[metajack]

Why are we merging into master here? Should our master always be a fast forward away from upstream master?

[larsbergstrom]

Yes, according to conversations with @SimonSapin on IRC, we should always just be pulling from their master and shouldn't have any local changes. If we did, then we should probably fork a servo branch like our other forks of upstream projects.

[SimonSapin]

908f4f8 is the only non-merge commit that we have and not upstream.

[SimonSapin]

We should decide on a single workflow we want (it terms of branches, merges and review) for all Servo submodules that have an upstream and stick to it.

I believe there is no use in maintaining a master branch that’s identical to and kept up to date with upstream/master, since that is obviously redundant with upstream/master. To keep things simple, we could have mozilla-servo/master be our only long-lived branch, include any Servo-specific changes, and occasionally merge upstream/master into it.