<josie>
anyone have a clever way to get around this?
<josie>
i briefly looked into modifying the CI to handle this, but that seemed like overkill if there is an easier way to set up the branch so that it doesnt run into this failure
<bitcoin-git>
[bitcoin] rkrux closed pull request #32413: test: test that descriptorprocesspsbt removes non witness utxos in PSBT (master...descriptorprocesspsbt) https://github.com/bitcoin/bitcoin/pull/32413
<phantomcircuit>
josie: why is it doing merge at all and not just checking out each commit ?
theStack has joined #bitcoin-core-dev
<josie>
phantomcircuit: not sure, seems like it could work by just checking out each commit
<phantomcircuit>
josie: seems over complicated to me
<josie>
phantomcircuit: i opened https://github.com/bitcoin/bitcoin/issues/32991, if you have any ideas on how to improve it. i spent a half hour on it and didnt make much progress, but ill revisit at some point
<phantomcircuit>
ryanofsky: ^ thoughts?
<phantomcircuit>
josie: ryanofsky and hebasto might have better thoughts since they authored the test, im guessing we're missinng something about how it works
<phantomcircuit>
or at least i certainly feel like i am
abubakarsadiq has joined #bitcoin-core-dev
jespada has joined #bitcoin-core-dev
f321x_ has joined #bitcoin-core-dev
f321x has quit [Remote host closed the connection]
hernanmarino has joined #bitcoin-core-dev
hernanmarino_ has quit [Ping timeout: 252 seconds]
josie has quit [Remote host closed the connection]
josie has joined #bitcoin-core-dev
joetor5 has joined #bitcoin-core-dev
joetor5 has quit [Quit: joetor5]
TheCharlatan has quit [Quit: WeeChat 4.1.1]
TheCharlatan has joined #bitcoin-core-dev
bitdex has quit [Quit: = ""]
bugs_ has joined #bitcoin-core-dev
fgarau has joined #bitcoin-core-dev
jonatack has joined #bitcoin-core-dev
Christoph_ has joined #bitcoin-core-dev
Christoph_ has quit [Client Quit]
Christoph_ has joined #bitcoin-core-dev
SpellChecker has quit [Remote host closed the connection]
SpellChecker has joined #bitcoin-core-dev
flow has quit [Server closed connection]
flow has joined #bitcoin-core-dev
Talkless has joined #bitcoin-core-dev
jerryf has joined #bitcoin-core-dev
jon_atack has joined #bitcoin-core-dev
jonatack has quit [Ping timeout: 252 seconds]
<laanwj>
phantomcircuit: it merges every commit into master to make sure that intermediate changes in master are also taken into account; this can prevent silent merge conflicts. this was done in #32218
<bitcoin-git>
[bitcoin] sr-gi closed pull request #32986: Adds transaction propagation information to mempool transactions (master...2025-07-propagation-times) https://github.com/bitcoin/bitcoin/pull/32986
f321x has quit [Remote host closed the connection]
Randolf has joined #bitcoin-core-dev
fgarau has quit [Ping timeout: 276 seconds]
jarthur has joined #bitcoin-core-dev
mudsip has joined #bitcoin-core-dev
mudsip has quit [Client Quit]
Randolf has quit [Quit: Leaving]
Talkless has quit [Quit: Konversation terminated!]
Christoph_ has quit [Quit: Christoph_]
Holz has quit [Ping timeout: 252 seconds]
Holz has joined #bitcoin-core-dev
Cory77 has quit [Quit: Client closed]
Cory77 has joined #bitcoin-core-dev
Christoph_ has joined #bitcoin-core-dev
abubakarsadiq has quit [Quit: Connection closed for inactivity]
jespada has joined #bitcoin-core-dev
Christoph_ has quit [Client Quit]
jespada_ has joined #bitcoin-core-dev
jespada has quit [Ping timeout: 248 seconds]
oneeyedalien has joined #bitcoin-core-dev
jespada has joined #bitcoin-core-dev
jespada_ has quit [Ping timeout: 276 seconds]
fgarau has joined #bitcoin-core-dev
hernanmarino has quit [Ping timeout: 252 seconds]
hernanmarino has joined #bitcoin-core-dev
oneeyedalien has quit [Quit: Leaving]
joetor5 has joined #bitcoin-core-dev
bugs_ has quit [Quit: Leaving]
<phantomcircuit>
laanwj: ah, yes i was missing something
jonatack has joined #bitcoin-core-dev
jon_atack has quit [Ping timeout: 252 seconds]
<phantomcircuit>
laanwj: that's kinda confusing though, since it's running against master when the pr is updated, not when it's merged, so possibly it would be less confusing overall to run on the individual commits and deal with testing merge conflicts in some other way
<phantomcircuit>
or in addition in a separate test?