Fix issue 20021 - static if doesn't evaluate opCast(bool)

[dkorpel]

No description provided.

[dkorpel]

I tried targeting stable and rebasing with

git rebase --onto 062d2a origin/stable
git rebase --onto origin/stable master

But I'm still not familiar with rebasing, I don't think it worked out and now dlang-bot wants to auto-close 3 unrelated issues found in stable... How do you unlink issues?

[wilzbach]

I tried targeting stable and rebasing with

git rebase --onto 062d2a origin/stable
git rebase --onto origin/stable master

But I'm still not familiar with rebasing, I don't think it worked out and now dlang-bot wants to auto-close 3 unrelated issues found in stable... How do you unlink issues?

You don't. You need to do a rebase onto upstream/stable. That's all.

[dkorpel]

Ok I don't get git rebasing at all, this PR has become such a mess that I'm going to close it and revive it. Sorry for the inconvenience.

[PetarKirov]

@dkorpel The right way to go is the following:

• Ensure you have the following 2 git remotes configured:
  • upstream, pointing to git@github.com:dlang/dmd.git
  • origin, pointing to your own fork of dmd, presumably git@github.com:dkorpel/dmd.git, from which you are going to open a pull request

  # Check which remotes you have configured:
  git remote -v
  
  # Add the following if missing:
  git remote add upstream git@github.com:dlang/dmd.git
  
  # If `git remote -v` had listed upstream, you need to
  # modify it, instead of adding it again:
  git remote set-url upstream git@github.com:dlang/dmd.git
  
  # (Do the same for origin.)
  
  # (If you don't have SSH Keys configured you may need to replace
  # those URLs with the https ones.)

• Before doing anything, ensure that your local master and stable branches are up to date with upstream:

git checkout master
git pull --ff-only upstream master

git checkout stable
git pull --ff-only upstream stable

• If you originally made your branch based of $BRANCH_SOURCE, and you need to rebase it on top of $BRANCH_DESTINATION, do the following:

# For your case the following may be the right branches:
BRANCH_SOURCE='master'
BRANCH_DESTINATION='upstream/stable'
PR_BRANCH='static-if-bool'

git checkout $PR_BRANCH

# If you rebased your source branch in the previous step, 
# you may need to rebase your PR branch as well:
git rebase $BRANCH_SOURCE

# And finally to retarget the destination branch:
git rebase --onto $BRANCH_DESTINATION $BRANCH_SOURCE

# (Now you may get merge conflicts. That's ok. When you resolve them you should be able
# to continue by doing `git rebase --continue`

# When done, all that's left is to publish your local branch to
# GitHub, by overwriting what was there before:
git push --force origin $PR_BRANCH