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

Map and update pugixml with the upstream repository instead of the one from RPCS3 #3623

Merged
merged 1 commit into from
Nov 18, 2017
Merged

Conversation

scribam
Copy link
Contributor

@scribam scribam commented Oct 19, 2017

@AniLeo
Copy link
Member

AniLeo commented Oct 25, 2017

Notice fork was done to remove unnecessary files to save space, maybe this change is unwanted

@scribam
Copy link
Contributor Author

scribam commented Oct 26, 2017

Thank you for your feedback, I agree with you about the fact unnecessary files were removed but why specifically for the submodule pugixml and not the others like cereal for example?
The difference in size between the repository zeux and the one from rpcs3 is about 3 MB, do you think it is important?

@AniLeo AniLeo requested a review from Nekotekina October 28, 2017 21:04
@danilaml
Copy link
Contributor

Wouldn't the files still be kept in git history?

@scribam
Copy link
Contributor Author

scribam commented Nov 13, 2017

Yes, the files would still be kept in the git history. To switch to the zeux repository, you can either do a fresh git clone or run the following commands (for Linux):

git submodule deinit -f -- 3rdparty/pugixml
rm -rf .git/modules/3rdparty/pugixml
git submodule update --init

@Nekotekina
Copy link
Member

Don't rebase out of sudden, takes a lot to wait for checks.

@Nekotekina Nekotekina merged commit 0870862 into RPCS3:master Nov 18, 2017
@scribam
Copy link
Contributor Author

scribam commented Nov 18, 2017

For some reason, AppVeyor failed (https://ci.appveyor.com/project/rpcs3/rpcs3/build/0.0.4-6899) after the merge from master. I decided to do a rebase in order to trigger it again.

@scribam
Copy link
Contributor Author

scribam commented Nov 18, 2017

@joaozin23 Logs?

@Asinin3
Copy link
Contributor

Asinin3 commented Nov 19, 2017

That crash at that house in Ni No Kuni has been there for quite some time AFAIK it's nothing new. Did you test before & after?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants