backport: Merge bitcoin#27151, 25849 #26299
Triggered via pull request
June 18, 2026 12:49
vijaydasmp
synchronize
#7128
Status
Success
Total duration
32s
Artifacts
–
predict-conflicts.yml
on: pull_request_target
predict_conflicts
29s
Annotations
3 warnings
|
predict_conflicts
Potential conflicts detected!
|
|
predict_conflicts
{
pull_number: 7128,
conflictPrs: [
{
number: 6845,
files: [
'src/crypto/ripemd160.cpp',
'src/crypto/ripemd160.h',
'src/crypto/sha1.cpp',
'src/crypto/sha1.h',
'src/crypto/sha256.cpp',
'src/crypto/sha256.h',
'src/crypto/sha512.cpp',
'src/crypto/sha512.h',
'src/cuckoocache.h',
'src/dbwrapper.h',
'src/key.h',
'src/policy/fees.cpp',
'src/policy/fees.h',
'src/serialize.h',
'src/span.h',
'src/streams.h',
'src/support/lockedpool.cpp',
'src/support/lockedpool.h',
'src/test/util/net.h',
'src/tinyformat.h',
'src/torcontrol.cpp',
'src/torcontrol.h',
'src/univalue/include/univalue_utffilter.h',
'src/util/sock.h',
'src/wallet/bdb.cpp',
'src/wallet/bdb.h',
'src/wallet/db.h',
'src/wallet/wallet.h',
'src/zmq/zmqabstractnotifier.h',
'src/zmq/zmqnotificationinterface.h',
'test/functional/p2p_getaddr_caching.py',
'test/functional/test_framework/test_node.py'
],
conflicts: [ 'src/support/lockedpool.cpp' ]
},
{
number: 6595,
files: [
'src/init.cpp',
'src/net_processing.cpp',
'src/qt/test/wallettests.cpp',
'src/rest.cpp',
'src/test/interfaces_tests.cpp',
'src/test/validation_block_tests.cpp',
'src/test/validation_chainstatemanager_tests.cpp',
'src/validation.h',
'src/wallet/rpc/spend.cpp',
'src/wallet/test/spend_tests.cpp',
'src/wallet/test/wallet_tests.cpp'
],
conflicts: [ 'src/wallet/rpc/spend.cpp' ]
},
{
number: 7354,
files: [
'doc/release-notes-28414.md',
'src/init.cpp',
'src/qt/test/optiontests.cpp',
'src/rpc/mining.cpp',
'src/test/settings_tests.cpp',
'src/util/settings.cpp',
'src/wallet/rpc/encrypt.cpp',
'src/wallet/rpc/spend.cpp',
'test/functional/feature_filelock.py',
'test/functional/feature_settings.py',
'test/functional/rpc_blockchain.py',
'test/functional/rpc_psbt.py',
'test/functional/wallet_fundrawtransaction.py',
'test/functional/wallet_multisig_descriptor_psbt.py',
'test/functional/wallet_send.py',
'test/functional/wallet_signer.py'
],
conflicts: [ 'src/wallet/rpc/spend.cpp' ]
},
{
number: 7308,
files: [
'Makefile.am',
'depends/packages/miniupnpc.mk',
'depends/patches/miniupnpc/cmake_get_src_addr.patch',
'depends/patches/miniupnpc/dont_leak_info.patch',
'depends/patches/miniupnpc/fix_windows_snprintf.patch',
'depends/patches/miniupnpc/no_libtool.patch',
'depends/patches/miniupnpc/respect_mingw_cflags.patch',
'doc/dependencies.md',
'src/Makefile.am',
'src/Makefile.test.include',
'src/net_processing.cpp',
'src/outputtype.cpp',
'src/policy/policy.cpp',
'src/rpc/output_script.cpp',
'src/rpc/util.cpp',
'src/test/fuzz/bitset.cpp',
'src/test/fuzz/vecdeque.cpp',
'src/util/bitset.h',
'src/util/vecdeque.h',
'src/wallet/rpc/backup.cpp',
'src/wallet/rpc/spend.cpp',
'test/functional/feature_init.py',
'test/functional/rpc_rawtransaction.py',
'test/functional/test_framework/test_node.py',
'test/functional/test_runner.py',
'test/functional/wallet_basic.py',
'test/functional/wallet_fundrawtransaction.py',
'test/get_previous_releases.py',
'test/sanitizer_suppressions/ubsan'
],
conflicts: [ 'src/wallet/rpc/spend.cpp' ]
},
{
number: 7294,
files: [
'src/evo/assetlocktx.cpp',
'src/evo/assetlocktx.h',
'src/evo/core_write.cpp',
'src/evo/specialtxman.cpp',
'src/rpc/output_script.cpp',
'src/test/evo_assetlocks_tests.cpp',
'src/wallet/rpc/spend.cpp',
'sr
|
|
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|