Skip to content

Corrected the CONTRIBUTING.md "External Dependencies" section - #44664

Merged
bors merged 1 commit into
rust-lang:masterfrom
budziq:contributing_external
Oct 5, 2017
Merged

Corrected the CONTRIBUTING.md "External Dependencies" section#44664
bors merged 1 commit into
rust-lang:masterfrom
budziq:contributing_external

Conversation

@budziq

@budziqbudziq commented Sep 17, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

The "External Dependencies" section is a little outdated.
Please see following comments #44567 (comment)#44567 (comment) for rationale.

@carols10cents

carols10cents commented Sep 18, 2017

Copy link
Copy Markdown
Member

r? @steveklabnik

@carols10centscarols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2017
@alexcrichton

alexcrichton commented Sep 18, 2017

Copy link
Copy Markdown
Member

I think this may conflict with #44679, which is also changing this file

@oli-obk

oli-obk commented Sep 19, 2017

Copy link
Copy Markdown
Contributor

Fine by me, if clippy isn't replaced, but instead rustfmt is added to the list.

It might be easier for now to suggest opening a PR and marking the tool as broken as the primary way to solve this, since in curtains no waiting time ( with the solution in this PR you need to wait on the tool Devs)

@budziq

budziq commented Sep 19, 2017

Copy link
Copy Markdown
ContributorAuthor

It might be easier for now to suggest opening a PR and marking the tool as broken as the primary way to solve this,

As long as this approach is the one actually agreed upon by the maintainers I'm game!
Should I close this PR?

@bors

bors commented Sep 21, 2017

Copy link
Copy Markdown
Collaborator

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

@carols10cents

carols10cents commented Sep 25, 2017

Copy link
Copy Markdown
Member

@budziq it sounds like @oli-obk was suggesting some modifications to this PR, not necessarily closing it-- do I have that right? It also looks like there were indeed some merge conflicts introduced by #44679 that you'll need to resolve :)

@carols10centscarols10cents added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 25, 2017
@budziq
budziqforce-pushed the contributing_external branch from c588cef to b09da13CompareSeptember 25, 2017 21:51
@budziq

budziq commented Sep 25, 2017

Copy link
Copy Markdown
ContributorAuthor

Thanks @carols10cents!
I've updated the PR with best I could infer, but honestly I'm still unclear about the expected workflow in case of broken submodules.

@oli-obk

oli-obk commented Sep 26, 2017

Copy link
Copy Markdown
Contributor

Since pull requests are rather volatile, we are supposed to only point to branches, not to pull requests. This means that if the tool authors accept your pull request into a branch, you may point your PR's submodule to the tool-branch, but you may not point it to the tool-PR

@budziq

budziq commented Sep 30, 2017

Copy link
Copy Markdown
ContributorAuthor

Sorry, I've been super busy with rust-fest preparations. I'll push an update within next 2 days!

@budziq
budziqforce-pushed the contributing_external branch from b09da13 to b623f05CompareSeptember 30, 2017 23:10
@budziq

budziq commented Sep 30, 2017

Copy link
Copy Markdown
ContributorAuthor

@oli-obk Updated!

oli-obk
oli-obk reviewed Oct 1, 2017
View reviewed changes
Comment threadCONTRIBUTING.md Outdated

@oli-obkoli-obkOct 1, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is still mentioning pull requests instead of long lived branches

@budziq
budziqforce-pushed the contributing_external branch from b623f05 to e6c3c7fCompareOctober 1, 2017 22:18
@budziq

budziq commented Oct 1, 2017

Copy link
Copy Markdown
ContributorAuthor

Sry hope it's ok now

@steveklabnik

steveklabnik commented Oct 5, 2017

Copy link
Copy Markdown
Contributor

@bors: r+ rollup

thanks!

@bors

bors commented Oct 5, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e6c3c7f has been approved by steveklabnik

kennytm added a commit to kennytm/rust that referenced this pull request Oct 5, 2017
@kennytm
Rollup merge ofrust-lang#44664- budziq:contributing_external, r=ste…
b34ade0
…veklabnik
Corrected the CONTRIBUTING.md "External Dependencies" section
The "External Dependencies" section is a little outdated.
Please see following comments rust-lang#44567 (comment)rust-lang#44567 (comment) for rationale.
@kennytmkennytm mentioned this pull request Oct 5, 2017
Merged
bors added a commit that referenced this pull request Oct 5, 2017
@bors
Auto merge of#45046- kennytm:rollup, r=kennytm
1db1144
Rollup of 9 pull requests
- Successful merges: #44664, #44935, #44972, #44980, #44987, #44997, #45006, #45017, #45024
- Failed merges:
@bors
bors merged commit e6c3c7f into rust-lang:masterOct 5, 2017
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments

Assignees

@steveklabniksteveklabnik

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@budziq@carols10cents@alexcrichton@oli-obk@bors@steveklabnik