Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Issue 16621 - [REG2.060] DMD hang in semantic3 on alias this #7588

Merged
merged 1 commit into from
Jan 4, 2018

Conversation

WalterBright
Copy link
Member

No description provided.

@dlang-bot
Copy link
Contributor

dlang-bot commented Jan 3, 2018

Thanks for your pull request, @WalterBright!

Bugzilla references

Auto-close Bugzilla Description
16621 [REG2.060] DMD hang in semantic3 on alias this

@JinShil
Copy link
Contributor

JinShil commented Jan 3, 2018

@wilzbach I know we're right on the cusp of a release. Should this be in stable or master?

@WalterBright
Copy link
Member Author

Since it's over a year old, master is fine.

@wilzbach
Copy link
Member

wilzbach commented Jan 3, 2018

TL;DR Safe fixes should always go into stable, all the time.

https://wiki.dlang.org/DIP75#Branching_strategy

Copy link
Contributor

@JinShil JinShil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pending rebase to stable... or not... Walter's call.

@wilzbach
Copy link
Member

wilzbach commented Jan 3, 2018

I know we're right on the cusp of a release.

FYI: 2.078.0 has already been tagged a couple of hours ago (https://github.com/dlang/dmd/releases/tag/v2.078.0).

@PetarKirov
Copy link
Member

Yes, we should target stable so the changes can land in the 2.078.1 release.

@wilzbach wilzbach changed the base branch from master to stable January 4, 2018 13:43
@wilzbach
Copy link
Member

wilzbach commented Jan 4, 2018

FYI: We can always trivial merge stable back into master. Here's the simple script I use:

#!/bin/bash
set -ueo pipefail -o xtrace
DIR=${1:-$(pwd)}
pushd $DIR
git fetch && git fetch upstream
git checkout master
git merge --ff-only upstream/master
git branch -D merge_stable
git checkout -b merge_stable
git merge upstream/stable
# <- Solve merge conflicts (if any occurred)
hub pull-request
git checkout master
popd

@dlang-bot dlang-bot merged commit 72f76d0 into dlang:stable Jan 4, 2018
@wilzbach
Copy link
Member

wilzbach commented Jan 4, 2018

We can always trivial merge stable back into master.

#7598

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants