Skip to content

backport: merge bitcoin#18952,18817 - #5013

Merged
PastaPastaPasta merged 2 commits into
dashpay:developfrom
vijaydasmp:bp21_3
Apr 2, 2023
Merged

backport: merge bitcoin#18952,18817#5013
PastaPastaPasta merged 2 commits into
dashpay:developfrom
vijaydasmp:bp21_3

Conversation

@vijaydasmp

@vijaydasmpvijaydasmp commented Sep 15, 2022

Copy link
Copy Markdown

No description provided.

@vijaydasmp
vijaydasmpforce-pushed the bp21_3 branch 2 times, most recently from 52e1f2a to cedecafCompareSeptember 16, 2022 23:44
@vijaydasmpvijaydasmp changed the title scripted-diff Merge #18610: test: replace command with msgtype (naming)bitcoin Merge #18610,19069,SepratorStyle,19114,rename movieSep 17, 2022
@vijaydasmp
vijaydasmpforce-pushed the bp21_3 branch 6 times, most recently from d2d9976 to 4e3da39CompareSeptember 20, 2022 00:40
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@vijaydasmpvijaydasmp changed the title bitcoin Merge #18610,19069,SepratorStyle,19114,rename moviebitcoin Merge #18610,19069,SepratorStyle,19114,rename movie,18817Oct 3, 2022
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@vijaydasmpvijaydasmp changed the title bitcoin Merge #18610,19069,SepratorStyle,19114,rename movie,18817backport: merge bitcoin#18610,19069,SepratorStyle,19114,rename movie,18817Nov 13, 2022
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@vijaydasmp
vijaydasmpforce-pushed the bp21_3 branch 5 times, most recently from 94dbd5f to e65edb4CompareDecember 30, 2022 14:02
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@vijaydasmp
vijaydasmpforce-pushed the bp21_3 branch 3 times, most recently from 75b9806 to 6ff27f2CompareJanuary 13, 2023 14:19
@vijaydasmpvijaydasmp changed the title backport: merge bitcoin#18610,19069,SepratorStyle,19114,rename movie,18817backport: merge bitcoin#18952,18817Jan 13, 2023
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@vijaydasmp
vijaydasmpforce-pushed the bp21_3 branch 2 times, most recently from 75b9806 to 18d2ae6CompareFebruary 25, 2023 02:36
@vijaydasmp
vijaydasmp marked this pull request as ready for review February 25, 2023 02:55
@UdjinM6UdjinM6 added this to the 20 milestone Feb 27, 2023

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@vijaydasmp

Copy link
Copy Markdown
Author

Hello @PastaPastaPasta , please review

1 similar comment
@vijaydasmp

Copy link
Copy Markdown
Author

Hello @PastaPastaPasta , please review

@PastaPastaPastaPastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK for merge via merge commit

MarcoFalke added 2 commits April 2, 2023 17:00
…n-qt locale handling
ca185cf doc: Document differences in bitcoind and bitcoin-qt locale handling (practicalswift)
Pull request description:
Document differences in `bitcoind` and `bitcoin-qt` locale handling.
Since this seems to be the root cause to the locale dependency issues we've seen over the years I thought it was worth documenting :)
Note that 1.) `QLocale` (used by Qt), 2.) C locale (used by locale-sensitive C standard library functions/POSIX functions and some parts of the C++ standard library such as `std::to_string`) and 3.) C++ locale (used by the C++ input/output library) are three separate things. This comment is about the perhaps surprising interference with the C locale (2) that takes place as part of the Qt initialization.
ACKs for top commit:
hebasto:
re-ACK ca185cf
Tree-SHA512: e51c32f3072c506b0029a001d8b108125e1acb4f2b6a48a6be721ddadda9da0ae77a9b39ff33f9d9eebabe2244c1db09e8502e3e7012d7a5d40d98e96da0dc44
8a22fd0 avoided os-dependant path (Ferdinando M. Ametrano)
Pull request description:
The current code fails on windows because of the forward slashes; using os.path.join solves the problem and it is in general more robust
ACKs for top commit:
MarcoFalke:
ACK 8a22fd0
Tree-SHA512: 813f27aea33f97c8afac52e716a55fc5d7fb69621023aba99d40df7e1d145e0ec8d1eee49ddd403b219bf0e0e168e0e987b05c78eaef611f744d99bf2fc8bc91
Sign up for freeto 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.

3 participants

@vijaydasmp@UdjinM6@PastaPastaPasta