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.

Sign up for GitHub

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

Add a note to the beta sections of release.md #5516

Merged
merged 3 commits into from
Apr 25, 2020
Merged

Add a note to the beta sections of release.md #5516

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4619bb2
Add a note to the beta sections of release.md
flip1995 Apr 23, 2020
c19ca0e
The beta branch update should not require a force push
flip1995 Apr 23, 2020
451bade
Run fetch before testing if master contains beta
flip1995 Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion doc/release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,16 @@ to the beta Rust release. The remerge is then necessary, to make sure that the
Clippy commit, that was used by the now stable Rust release, persists in the
tree of the Clippy repository.

To find out if this step is necessary run

```bash
# Assumes that the local master branch is up-to-date
$ git fetch upstream
$ git branch master --contains upstream/beta
```

If this command outputs `master`, this step is **not** necessary.

```bash
# Assuming `HEAD` is the current `master` branch of rust-lang/rust-clippy
$ git checkout -b backport_remerge
Expand Down Expand Up @@ -97,5 +107,5 @@ be updated.
# Assuming the current directory corresponds to the Clippy repository
$ git checkout beta
$ git rebase $BETA_SHA
$ git push upstream beta [-f] # This requires a force push, if a remerge was done
$ git push upstream beta
```