Restore creating the channel-rust-$channel-date.txt files#40225
Merged
Conversation
Member
|
@bors: r+ |
Collaborator
|
📌 Commit b601b75 has been approved by |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Mar 3, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
Collaborator
|
☔ The latest upstream changes (presumably #39917) made this pull request unmergeable. Please resolve the merge conflicts. |
shepmaster
force-pushed
the
restore-build-date-file
branch
from
b601b75 to
cac4bf3
Compare
Member
Author
|
@alexcrichton I've rebased to address #39917; note that there's now an extra commit to deal with what appears to be variables that weren't fully renamed. |
Member
|
@bors: r+ Thanks! |
Collaborator
|
📌 Commit cac4bf3 has been approved by |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Mar 8, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
Collaborator
|
🔒 Merge conflict |
shepmaster
force-pushed
the
restore-build-date-file
branch
from
cac4bf3 to
3e2390f
Compare
Member
Author
|
Merge conflict (that I didn't see locally) fixed. |
Member
|
@bors: r+ |
Collaborator
|
📌 Commit 3e2390f has been approved by |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Mar 9, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Mar 9, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
Collaborator
|
⌛ Testing commit 3e2390f with merge ab212f1... |
Member
|
@bors: retry (need another PR to land) |
Collaborator
|
⌛ Testing commit 3e2390f with merge 059c757... |
Collaborator
|
💔 Test failed - status-travis |
Contributor
|
Cargo problem: |
Member
Author
|
@arielb1 that seems unrelated to my change. Do you know if there's something I need to address? |
Member
|
@bors: retry
|
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 10, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 10, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 10, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 10, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 10, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 11, 2017
… r=alexcrichton Restore creating the channel-rust-$channel-date.txt files I have **not** run this (because I don't know how to 😇), but it *does* compile. r? @alexcrichton
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I have not run this (because I don't know how to 😇), but it does compile.
r? @alexcrichton