Do not reorganize if new branch has same amount of work #1980

pull sipa wants to merge 1 commits into bitcoin:master from sipa:noreorgsame changing 1 files +1 −1

sipa commented at 12:40 PM on November 4, 2012: member

No description provided.
BitcoinPullTester commented at 1:34 PM on November 5, 2012: none
Automatic sanity-testing: FAILED BUILD/TEST, see http://jenkins.bluematt.me/pull-tester/ef3c7a8403c07c79880cf028c109abaeb8f40e61 for binaries and test log.

This could happen for one of several reasons:
1. It chanages paths in makefile.linux-mingw or otherwise changes build scripts in a way that made them incompatible with the automated testing scripts
2. It does not build on either Linux i386 or Win32 (via MinGW cross compile)
3. The test suite fails on either Linux i386 or Win32
4. The block test-cases failed (lookup the first bNN identifier which failed in https://github.com/TheBlueMatt/test-scripts/blob/master/FullBlockTestGenerator.java)
Do not reorganize if new branch has same amount of work cd6dc96c4f
sipa commented at 12:36 PM on November 10, 2012: member

/poke @BitcoinPullTester
jgarzik commented at 2:26 AM on November 16, 2012: contributor

ACK

Seems somewhat important to merge this, yes?
Diapolo commented at 7:38 AM on November 16, 2012: none

Guess there is no need to wait fot @BitcoinPullTester as it seems to be down?
sipa commented at 9:56 AM on November 16, 2012: member

@jgarzik Yes, kinda.

Reason I want @BitcoinPullTester, is because Matt claimed it had tests for this issue in particular, though it seems to validate head just fine.
BitcoinPullTester commented at 11:52 PM on November 21, 2012: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/cd6dc96c4fb24f3c40e989442a6503403a944e78 for binaries and test log.
Diapolo commented at 6:59 AM on November 22, 2012: none

It seems "he" is working again :), nice.
sipa referenced this in commit c07a1a6ee4 on Nov 22, 2012
sipa merged this on Nov 22, 2012
sipa closed this on Nov 22, 2012
laudney referenced this in commit c854758f0a on Mar 19, 2014
KolbyML referenced this in commit 6f2f2e876b on Dec 5, 2020
DrahtBot locked this on Sep 8, 2021

Contributors