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

Refactor OpenBSD-like module into OpenBSD #1355

Merged
merged 1 commit into from
May 22, 2019
Merged

Conversation

gnzlbg
Copy link
Contributor

@gnzlbg gnzlbg commented May 22, 2019

The only OpenBSD-like OS that we support after bitrig's removal is OpenBSD itself.

cc @semarie

@rust-highfive
Copy link

@gnzlbg: no appropriate reviewer found, use r? to override

@gnzlbg
Copy link
Contributor Author

gnzlbg commented May 22, 2019

This is a non-functional change, just moves code around.

@bors: r+

@bors
Copy link
Contributor

bors commented May 22, 2019

📌 Commit 0f34490 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented May 22, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout openbsdlike (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self openbsdlike --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
Auto-merging src/unix/bsd/netbsdlike/openbsd/mod.rs
CONFLICT (content): Merge conflict in src/unix/bsd/netbsdlike/openbsd/mod.rs
Auto-merging libc-test/build.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented May 22, 2019

☔ The latest upstream changes (presumably #1354) made this pull request unmergeable. Please resolve the merge conflicts.

@gnzlbg
Copy link
Contributor Author

gnzlbg commented May 22, 2019

@bors: retry

@gnzlbg
Copy link
Contributor Author

gnzlbg commented May 22, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented May 22, 2019

📌 Commit 7b45788 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented May 22, 2019

⌛ Testing commit 7b45788 with merge f3a7aad...

bors added a commit that referenced this pull request May 22, 2019
Refactor OpenBSD-like module into OpenBSD

The only OpenBSD-like OS that we support after bitrig's removal is OpenBSD itself.

cc @semarie
@bors
Copy link
Contributor

bors commented May 22, 2019

☀️ Test successful - checks-cirrus, checks-travis, status-appveyor
Approved by: gnzlbg
Pushing f3a7aad to master...

@bors bors merged commit 7b45788 into rust-lang:master May 22, 2019
@bors bors mentioned this pull request May 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants