Correct logic so that not both lines are displayed #3786

pull rebroad wants to merge 1 commits into bitcoin:master from rebroad:RemoveRedundantNetDebugLine changing 1 files +1 −1

rebroad commented at 6:17 PM on March 3, 2014: contributor

e.g.:- 2014-02-25 06:56:39 received getdata (1 invsz) 2014-02-25 06:56:39 received getdata for: tx 8e2e08d1d851eb1ac800e814796dd7b86fd6d3a8fad41d5bdcb873ac6f4aba8d

The first line isn't necessary since the 2nd line includes the same information, and more.

Correct logic so that not both lines are displayed

e.g.:-
2014-02-25 06:56:39 received getdata (1 invsz)
2014-02-25 06:56:39 received getdata for: tx 8e2e08d1d851eb1ac800e814796dd7b86fd6d3a8fad41d5bdcb873ac6f4aba8d

5548acce36

ghost commented at 6:47 PM on March 3, 2014: none

Shouldn't this be applied to the 0.9.0 branch instead of master?
rebroad commented at 2:41 AM on May 16, 2014: contributor

@gmaxwell @sipa @laanwj Please may this pull request get some comments/ACKs?
laanwj commented at 1:18 PM on May 28, 2014: member

ACK after rebase
BitcoinPullTester commented at 3:21 PM on June 23, 2014: none

Automatic sanity-testing: FAILED MERGE, see http://jenkins.bluematt.me/pull-tester/p3786_5548acce365699f162844dad1acba2a0e514dbeb/ for test log.

This pull does not merge cleanly onto current master This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
laanwj commented at 8:57 AM on June 25, 2014: member

Closing because of inactivity.
laanwj closed this on Jun 25, 2014
rebroad deleted the branch on Jun 27, 2014
rebroad commented at 3:30 AM on June 27, 2014: contributor

it took 3 months to deal with this for a one line change... and then you close it because it needed rebasing...

you are serious?!
laanwj commented at 11:23 AM on June 29, 2014: member

Yes. After it took you more than a month to rebase a silly one-line change.
laanwj commented at 7:37 AM on June 30, 2014: member

Anyhow, if you resubmit it rebased I'll try to merge it immediately.
DrahtBot locked this on Sep 8, 2021

Contributors