Skip to content

/ servo

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

Deduplicate the cocoa crate. #9509

Merged
merged 1 commit into from Feb 4, 2016
Merged

Deduplicate the cocoa crate. #9509

merged 1 commit into from Feb 4, 2016

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Feb 2, 2016

Review on Reviewable
@Ms2ger
Copy link
Contributor

Ms2ger commented Feb 2, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Feb 2, 2016

📌 Commit c3eba3f has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Feb 3, 2016

⌛ Testing commit c3eba3f with merge 0fbe34e...
bors-servo added a commit that referenced this pull request Feb 3, 2016
@bors-servo
Auto merge of #9509 - servo:cocoa, r=Ms2ger
0fbe34e 
Deduplicate the cocoa crate.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9509)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 3, 2016

💔 Test failed - mac-rel-wpt
@jdm
Copy link
Member

jdm commented Feb 3, 2016

@bors-servo: retry
bors-servo added a commit that referenced this pull request Feb 4, 2016
@bors-servo
Auto merge of #9509 - servo:cocoa, r=Ms2ger
1c6f1b0 
Deduplicate the cocoa crate.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9509)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

⌛ Testing commit c3eba3f with merge 1c6f1b0...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

💔 Test failed - linux-rel
@jdm
Copy link
Member

jdm commented Feb 4, 2016

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

⌛ Testing commit c3eba3f with merge 8c563b7...
bors-servo added a commit that referenced this pull request Feb 4, 2016
@bors-servo
Auto merge of #9509 - servo:cocoa, r=Ms2ger
8c563b7 
Deduplicate the cocoa crate.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9509)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

💔 Test failed - mac-rel-css
@jdm jdm added S-needs-rebase and removed S-tests-failed labels Feb 4, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

☔ The latest upstream changes (presumably #9512) made this pull request unmergeable. Please resolve the merge conflicts.
@SimonSapin
Deduplicate the cocoa crate.
Loading status checks…
809f633
@SimonSapin
Copy link
Member Author

SimonSapin commented Feb 4, 2016

Rebased, conflict solved automatically by kdiff3.

@bors-servo r=Ms2ger

(Previous failures were likely #9534 and #9533.)
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

📌 Commit 809f633 has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

⌛ Testing commit 809f633 with merge 76d2251...
bors-servo added a commit that referenced this pull request Feb 4, 2016
@bors-servo
Auto merge of #9509 - servo:cocoa, r=Ms2ger
76d2251 
Deduplicate the cocoa crate.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9509)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

💔 Test failed - gonk
@nox
Copy link
Member

nox commented Feb 4, 2016

@bors-servo retry

Git snafu.
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

⌛ Testing commit 809f633 with merge 9e68285...
bors-servo added a commit that referenced this pull request Feb 4, 2016
@bors-servo
Auto merge of #9509 - servo:cocoa, r=Ms2ger
Loading status checks…
9e68285 
Deduplicate the cocoa crate.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9509)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2016

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 809f633 into master Feb 4, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@nox nox deleted the cocoa branch Feb 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@SimonSapin @Ms2ger @bors-servo @jdm @nox @highfive
You can’t perform that action at this time.