Skip to content
This repository has been archived by the owner on Mar 14, 2023. It is now read-only.

Warn if a PR changes Cargo.lock #153

Closed
kennytm opened this issue May 19, 2018 · 2 comments
Closed

Warn if a PR changes Cargo.lock #153

kennytm opened this issue May 19, 2018 · 2 comments

Comments

@kennytm
Copy link
Member

kennytm commented May 19, 2018

In rust-lang/rust we will not automatically merge diff from Cargo.lock (see rust-lang/rust#46539 for rationale). This means all PRs modifying Cargo.lock are mutually exclusive with each other, and when one such PR is merged, all other PRs will need to be rebased.

This may bother reviewers and authors when the PR needs to be rebased and r+'ed several times. It is also pretty confusing to new contributors because a rebase often completes without any conflicts locally.

Thus, I think it is the best for rust-highfive to foreshadow such potential extra work to both reviewers and authors.

⚠️ Warning ⚠️

This PR modified Cargo.lock. We will not automatically merge updates to Cargo.lock, since it often leaves the file in a broken state. One unfortunate result is that this often leads to merge conflicts.

You may need to rebase this PR several times after it has been approved. We are sorry for any inconvenience which may arise.

(Note to reviewers: Please also prepare to r+ several times. Consider giving it a p=1 to minimize queuing time and reduce chance of conflict.)

@mati865
Copy link

mati865 commented Nov 3, 2019

Does this still apply today when Cargo.lock can be automatically merged?

@kennytm
Copy link
Member Author

kennytm commented Nov 3, 2019

Right.

Fixed by rust-lang/rust#63743.

@kennytm kennytm closed this as completed Nov 3, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants