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

Update fontconfig submodule for https://github.com/mozilla-servo/fontconfig/pull/1 #2040

Merged
merged 1 commit into from Apr 8, 2014

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Apr 4, 2014

This of course depends on servo/fontconfig#1 being merged.

This of course depends on servo/fontconfig#1 being merged.
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Apr 4, 2014

Critic review: https://critic.hoppipolla.co.uk/r/1172

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@jdm

This comment has been minimized.

Copy link

jdm commented on a24e52a Apr 5, 2014

r+

This comment has been minimized.

Copy link
Owner Author

SimonSapin replied Apr 5, 2014

@bors: retry

This comment has been minimized.

Copy link

metajack replied Apr 7, 2014

@bors: retry

This comment has been minimized.

Copy link

jdm replied Apr 8, 2014

@bors: retry

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on a24e52a Apr 5, 2014

saw approval from jdm
at SimonSapin@a24e52a

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 5, 2014

merging SimonSapin/servo/fontconfig-compile = a24e52a into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 5, 2014

SimonSapin/servo/fontconfig-compile = a24e52a merged ok, testing candidate = b31b3ce

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 5, 2014

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 5, 2014

saw approval from jdm
at SimonSapin@a24e52a

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 8, 2014

saw approval from jdm
at SimonSapin@a24e52a

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 8, 2014

merging SimonSapin/servo/fontconfig-compile = a24e52a into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 8, 2014

SimonSapin/servo/fontconfig-compile = a24e52a merged ok, testing candidate = 384183a

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 8, 2014

fast-forwarding master to auto = 384183a

bors-servo pushed a commit that referenced this pull request Apr 5, 2014
@jdm
Copy link
Member

jdm commented Apr 5, 2014

17:57:09     INFO -  configure: git: submodule update
17:57:11     INFO -  error: You have local changes to '.gitignore'; cannot switch branches.
17:57:11     INFO -  Unable to checkout '0450af3d92f1fb4f269cc64e58647871a5bf7288' in submodule path 'src/platform/linux/fontconfig'
17:57:11     INFO -  configure: error: git

Awkward.

@SimonSapin
Copy link
Member Author

SimonSapin commented Apr 5, 2014

Not sure what happened here. servo/fontconfig#1 was merged hours before you r+’d this, and a fresh clone of https://github.com/mozilla-servo/fontconfig.git definitely contains servo/fontconfig@0450af3 for me.

bors-servo pushed a commit that referenced this pull request Apr 5, 2014
@SimonSapin
Copy link
Member Author

SimonSapin commented Apr 5, 2014

Ah, this is the relevant part: error: You have local changes to '.gitignore'; cannot switch branches. but I don’t know how to fix it :/

@SimonSapin
Copy link
Member Author

SimonSapin commented Apr 7, 2014

I can not reproduce this locally. I believe the build slave has uncommitted local changes to its fontconfig/.gitignore file.

bors-servo pushed a commit that referenced this pull request Apr 8, 2014
bors-servo pushed a commit that referenced this pull request Apr 8, 2014
@bors-servo bors-servo merged commit a24e52a into servo:master Apr 8, 2014
1 check passed
1 check passed
default all tests passed
@SimonSapin SimonSapin deleted the SimonSapin:fontconfig-compile branch Apr 8, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.