PSA: Switching from incoming to master branch

53 views
Skip to first unread message

Sam Clegg

unread,
Jan 9, 2020, 2:27:45 PM1/9/20
to emscripte...@googlegroups.com
As previously discussed we are planning to switch the default emscripten branch from incoming to master in the next week or two.


Hopefully it should be relatively obvious and transparent to everyone when it happens.  The plan is to open up master to changes and close down incoming via the github branch protection rules.

cheers,
sam

Sam Clegg

unread,
Jan 9, 2020, 5:30:27 PM1/9/20
to emscripte...@googlegroups.com
Actually, unless there are any objections I'm going to try to flip the switch next Monday the 12th of January.

Sam Clegg

unread,
Jan 9, 2020, 5:31:26 PM1/9/20
to emscripte...@googlegroups.com
On Thu, Jan 9, 2020 at 2:30 PM Sam Clegg <s...@google.com> wrote:
Actually, unless there are any objections I'm going to try to flip the switch next Monday the 12th of January.

The 13th even :)

Alon Zakai

unread,
Jan 9, 2020, 6:05:45 PM1/9/20
to emscripte...@googlegroups.com
+1 from me, on any date! Great to see this.

- Alon


--
You received this message because you are subscribed to the Google Groups "emscripten-discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email to emscripten-disc...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/emscripten-discuss/CAL_va2-hEC9Kxqj5avvbFzE%3DKPHfd2LxNx1ULR6gZXSqMGmNAA%40mail.gmail.com.

Jukka Jylänki

unread,
Jan 10, 2020, 5:26:52 AM1/10/20
to emscripte...@googlegroups.com
SGTM!

On 10. Jan 2020, at 1.05, Alon Zakai <alon...@gmail.com> wrote:



Sam Clegg

unread,
Jan 13, 2020, 1:26:22 PM1/13/20
to emscripte...@googlegroups.com
This is happening this morning!

If you are trying to commit to `incoming` and it fails, you should be able to easily retarget your PR to land on `master` instead.

To view this discussion on the web visit https://groups.google.com/d/msgid/emscripten-discuss/CA003B48-8197-41A4-A81E-F007F22D612E%40gmail.com.

Sam Clegg

unread,
Jan 13, 2020, 8:04:53 PM1/13/20
to emscripte...@googlegroups.com
This is now done.   Please upload all future PRs against master.   PRs against incoming should be rejected (assuming I've configured github correctly).

Sam Clegg

unread,
Jan 24, 2020, 5:25:37 PM1/24/20
to emscripte...@googlegroups.com
As a final step here I plan to rename the "incoming" branches in emscripten and emscripten-fastcomp to "old_incoming" to avoid confusion and force all git users to become aware of this change.  For example, if there are any automated processes that are still using `incoming` this would force them to be updated.  

I was thinking of waiting another week or so before doing this to give contributors time to update all their branches.

cheers,
sam
Reply all
Reply to author
Forward
0 new messages