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

Pull leveldb subtree #15270

Merged
merged 2 commits into from Jan 30, 2019

Conversation

Projects
None yet
5 participants
@MarcoFalke
Copy link
Member

commented Jan 26, 2019

Some windows-related fixes.

Sanity check with:

git fetch https://github.com/bitcoin-core/leveldb
./test/lint/git-subtree-check.sh src/leveldb

MarcoFalke added some commits Jan 26, 2019

Squashed 'src/leveldb/' changes from 524b7e36a8..f545dfabff
f545dfabff Merge #18: Use utf-8 to decode filename
f8e797a058 Use utf-8 to decode filename
2fc114812a Merge #14: Fixes to allow building with msvc.
d6eab93138 Fixes to allow building with msvc.

git-subtree-dir: src/leveldb
git-subtree-split: f545dfabff4c2e9836efed094dba99a34fbc6b88
@fanquake

This comment has been minimized.

Copy link
Member

commented Jan 27, 2019

utACK fa61801

Pulls in Use utf-8 to decode filename and Fixes to allow building with msvc.

michael$ merge 15270
[pull/15270/local-merge ccaccc177] Merge #15270: Pull leveldb subtree
 Date: Sun Jan 27 10:25:17 2019 +0800
#15270 Pull leveldb subtree into master
* fa6180188 Pull leveldb subtree (MarcoFalke) (pull/15270/head)
* 4f2e6c8b8 Squashed 'src/leveldb/' changes from 524b7e36a8..f545dfabff (MarcoFalke)

Dropping you on a shell so you can try building/testing the merged source.
Run 'git diff HEAD~' to show the changes being merged.
Type 'exit' when done.
bash-3.2$ git fetch https://github.com/bitcoin-core/leveldb
remote: Enumerating objects: 547, done.
remote: Counting objects: 100% (547/547), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 1284 (delta 544), reused 545 (delta 544), pack-reused 737
Receiving objects: 100% (1284/1284), 423.61 KiB | 930.00 KiB/s, done.
Resolving deltas: 100% (978/978), completed with 165 local objects.
From https://github.com/bitcoin-core/leveldb
 * branch                HEAD       -> FETCH_HEAD
bash-3.2$ ./test/lint/git-subtree-check.sh src/leveldb
src/leveldb in HEAD currently refers to tree 9a76136301c252c4b6a0ca628381af761f0fba4a
src/leveldb in HEAD was last updated in commit 4f2e6c8b881b7ccda36233332dfd1bd231389a8e (tree 9a76136301c252c4b6a0ca628381af761f0fba4a)
src/leveldb in HEAD was last updated to upstream commit f545dfabff4c2e9836efed094dba99a34fbc6b88 (tree 9a76136301c252c4b6a0ca628381af761f0fba4a)
GOOD
@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Jan 27, 2019

Gitian builds for commit b78f6c6 (master):

Gitian builds for commit 66acf41 (master and this pull):

@ken2812221

This comment has been minimized.

Copy link
Member

commented Jan 29, 2019

Tested the gitian build binaries. ACK fa61801

@MarcoFalke just notice that @DrahtBot website is down.

@MarcoFalke

This comment has been minimized.

Copy link
Member Author

commented Jan 29, 2019

Ah, thx. I forgot to update the cloudflare settings. Should work now.

@MarcoFalke

This comment has been minimized.

Copy link
Member Author

commented Jan 29, 2019

Tested ACK (didn't look at the code changes)

Current master:

screenshot from 2019-01-29 13-07-34

This pull:
screenshot from 2019-01-29 13-06-50

@laanwj

This comment has been minimized.

Copy link
Member

commented Jan 30, 2019

utACK fa61801

@laanwj laanwj merged commit fa61801 into bitcoin:master Jan 30, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jan 30, 2019

Merge #15270: Pull leveldb subtree
4f2e6c8 Squashed 'src/leveldb/' changes from 524b7e36a8..f545dfabff (MarcoFalke)

Pull request description:

  Some windows-related fixes.

  Sanity check with:

  ```
  git fetch https://github.com/bitcoin-core/leveldb
  ./test/lint/git-subtree-check.sh src/leveldb

Tree-SHA512: ff94907ff3075b81cffb733129673a9bfd2abbe84240686b29274382b64b4e5845880236458043d6db0332bf70d12942d9c0e68b4fffab43931103d224cb59d4

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1901-subtreeLeveldb branch Jan 30, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.