backport: merge bitcoin#23345, #24410, #15936, #25748, #25863, #24051, #25315, #26624, #26894, #26673, #24462, #25815, #22949, #26723, #23395, #27016, #27189, #27317 (auxiliary backports: part 28) #6901
Annotations
3 warnings
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 6901,
conflictPrs: [
{
number: 6611,
files: [
'src/chain.h',
'src/consensus/params.h',
'src/net_processing.cpp',
'src/node/miner.cpp',
'src/primitives/block.h',
'src/timedata.cpp',
'src/timedata.h',
'src/validation.cpp'
],
conflicts: [ 'src/net_processing.cpp', 'src/validation.cpp' ]
},
{
number: 6610,
files: [
'src/chainparams.cpp',
'src/primitives/block.cpp',
'src/primitives/block.h',
'src/rpc/mining.cpp',
'src/test/blockencodings_tests.cpp',
'src/test/blockfilter_index_tests.cpp',
'src/test/miner_tests.cpp',
'src/test/util/mining.cpp',
'src/test/util/setup_common.cpp',
'src/test/validation_block_tests.cpp',
'src/validation.cpp'
],
conflicts: [ 'src/validation.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/txorphanage.cpp',
'src/txorphanage.h',
'src/validation.h',
'src/wallet/rpcwallet.cpp',
'src/wallet/test/spend_tests.cpp',
'src/wallet/test/wallet_tests.cpp'
],
conflicts: [ 'src/init.cpp', 'src/net_processing.cpp', 'src/validation.h' ]
},
{
number: 6683,
files: [
'src/Makefile.bench.include',
'src/bench/streams_findbyte.cpp',
'src/net.cpp',
'src/net.h',
'src/net_processing.cpp',
'src/streams.h',
'src/test/fuzz/buffered_file.cpp',
'src/test/streams_tests.cpp',
'src/validation.cpp',
'src/wallet/rpcdump.cpp',
'test/functional/wallet_importmulti.py'
],
conflicts: [ 'src/net_processing.cpp', 'src/validation.cpp' ]
},
{
number: 6689,
files: [
'src/bench/prevector.cpp',
'src/net.h',
'src/prevector.h',
'src/validation.h'
],
conflicts: [ 'src/validation.h' ]
},
{
number: 6714,
files: [
'src/bench/coin_selection.cpp',
'src/bench/wallet_balance.cpp',
'src/bitcoin-wallet.cpp',
'src/bitcoind.cpp',
'src/chain.cpp',
'src/dummywallet.cpp',
'src/index/base.cpp',
'src/index/blockfilterindex.cpp',
'src/index/coinstatsindex.cpp',
'src/index/coinstatsindex.h',
'src/index/txindex.cpp',
'src/init.cpp',
'src/init.h',
'src/init/bitcoin-node.cpp',
'src/init/bitcoind.cpp',
'src/interfaces/chain.h',
'src/interfaces/init.h',
'src/interfaces/node.h',
'src/interfaces/wallet.h',
'src/net_processing.cpp',
'src/node/blockstorage.cpp',
'src/node/blockstorage.h',
'src/node/caches.cpp',
'src/node/caches.h',
'src/node/chainstate.cpp',
'src/node/chainstate.h',
'src/node/coin.cpp',
'src/node/coin.h',
'src/node/coinstats.cpp',
'src/node/coinstats.h',
'src/node/context.cpp',
'src/node/context.h',
'src/node/interfaces.cpp',
'src/node/miner.cpp',
'src/node/miner.h',
'src/node/minisketchwrapper.cpp',
'src/node/minisketchwrapper.h',
'src/node/psbt.cpp',
'src/node/psbt.h',
'src/node/transaction.cpp',
'src/node/transaction.h',
'src/node/utxo_snapshot.h',
'src/qt/bitcoin.cpp',
'src/qt/coincontroldialog.cpp',
'src/qt/coincontroldialog.h',
'src/qt/psbtoperationsdialog.cpp',
'src/qt/sendcoinsdialog.cpp',
'src/qt/sendcoinsdialog.h',
'src/qt/test/addressbooktests.cpp',
'src/qt/test/test_main.cpp',
'src/qt/test/wallettests.cpp',
'src/qt/transactiondesc.cpp',
'src/qt/transactionrecord.cpp',
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
Loading