12016-01-06T00:03:35  *** d_t has quit IRC
  22016-01-06T00:25:56  <Luke-Jr> MarcoFalke: fwiw, I am no longer rebasing and in fact discouraging rebasing
  32016-01-06T00:26:19  <Luke-Jr> I'll do a merge when someone is ready to push it
  42016-01-06T00:26:45  <MarcoFalke> Here you could change the lines a bit to avoid a rebase: https://github.com/bitcoin/bitcoin/pull/7192/files#r48915192
  52016-01-06T00:26:57  <MarcoFalke> Would this make sense?
  62016-01-06T00:28:20  <Luke-Jr> the point is to avoid ever changing a commit once it has been published
  72016-01-06T00:53:06  *** MarcoFalke has quit IRC
  82016-01-06T01:07:12  *** dcousens has left #bitcoin-core-dev
  92016-01-06T01:07:17  *** dcousens has quit IRC
 102016-01-06T01:24:34  *** Ylbam has quit IRC
 112016-01-06T01:30:49  <maaku> Luke-Jr what do you propose instead?
 122016-01-06T01:35:17  *** cryptopeddler has quit IRC
 132016-01-06T01:37:14  *** cryptopeddler has joined #bitcoin-core-dev
 142016-01-06T01:48:59  *** cryptopeddler has quit IRC
 152016-01-06T01:50:30  *** cryptopeddler has joined #bitcoin-core-dev
 162016-01-06T01:54:49  *** cryptopeddler has quit IRC
 172016-01-06T01:56:40  *** cryptopeddler has joined #bitcoin-core-dev
 182016-01-06T02:00:17  *** d_t has joined #bitcoin-core-dev
 192016-01-06T02:00:48  *** d_t has joined #bitcoin-core-dev
 202016-01-06T02:15:17  <morcos> Luke-Jr: yes can you please explain how that would work?  i agree rebasing can introduce errors, but if we all have a chance to see the rebased commit and the merge is clean it seems there is less likely to be problems compared to only one person ever seeing the resolution of merge conflicts
 212016-01-06T02:15:21  *** laurentmt has joined #bitcoin-core-dev
 222016-01-06T02:15:41  <morcos> or are you proposing that we would then separately review the merge commit before its actually merged?
 232016-01-06T02:16:19  *** laurentmt has quit IRC
 242016-01-06T02:16:34  <morcos> For testing purposes, if you rebase then everyone will be testing the same thing that is going to be merged.  Otherwise how will we know what the final code is going to look like.
 252016-01-06T02:19:46  *** d_t has quit IRC
 262016-01-06T02:22:26  <Luke-Jr> maaku: merges were designed for this purpose
 272016-01-06T02:22:49  <Luke-Jr> morcos: rebasing/revising is anti-decentralised development
 282016-01-06T02:23:41  <Luke-Jr> morcos: when the merge substantially changes the code, I agree the changes need review again, just as if it had been rebased
 292016-01-06T02:24:08  <morcos> Luke-Jr: any change, not just substantial
 302016-01-06T02:24:36  <morcos> if someone is going to test, they need to be able to test the code thats going to exist
 312016-01-06T02:24:39  <Luke-Jr> any change does not need re-review. for example, the gitian timestamp thing
 322016-01-06T02:25:09  <morcos> i mean any merge conflict, might appear trivial but 2 people might resolve it in different ways
 332016-01-06T02:25:45  <morcos> if i want to test 7192 now, how do i know i'm testing the same thing that you are going to end up merging
 342016-01-06T02:25:48  <morcos> i don't
 352016-01-06T02:26:09  <morcos> but if you rebase it so its a clean merge.  the anyone that merges it into master will be testing the exact same code
 362016-01-06T02:26:23  <morcos> which sure may contain a rebase or merge error, but at least we'll be testing it
 372016-01-06T02:26:36  <Luke-Jr> rebase errors are not the problem with rebasing.
 382016-01-06T02:26:54  <morcos> what is the problem then?
 392016-01-06T02:27:46  <Luke-Jr> morcos: git merge <pre-rebase> conflicts with git merge <post-rebase>
 402016-01-06T02:28:05  <Luke-Jr> because rebasing is not intentional workflow in git
 412016-01-06T02:28:33  <morcos> sorry, i didn't follow...  what do you mean conflicts with?
 422016-01-06T02:32:43  <Luke-Jr> morcos: for an example using real-world terms, say I merge the "Unify name" PR into Bitcoin LJR yesterday; and now I rebase it for Core master. Trying to merge this rebased branch into Bitcoin LJR will not work, even after I merge Core master into LJR, because the rebased branch conflicts with the pre-rebase branch
 432016-01-06T02:36:50  <morcos> hmm.. ok I see what you mean.  I guess it's not clear to me how that situation shows up in our work flow very often.
 442016-01-06T02:36:54  <Luke-Jr> perhaps worth reading: https://lwn.net/Articles/328436/
 452016-01-06T02:37:06  <Luke-Jr> morcos: it doesn't, because we have a very centralised workflow so far
 462016-01-06T02:37:18  <Luke-Jr> morcos: which has rightly been criticised and should change
 472016-01-06T02:38:48  <Luke-Jr> (LWN article is based on original post by Linus at http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html )
 482016-01-06T02:39:22  *** bsm117532 is now known as Guest65074
 492016-01-06T02:39:42  *** belcher has quit IRC
 502016-01-06T02:52:27  *** p15 has joined #bitcoin-core-dev
 512016-01-06T02:53:11  *** cryptopeddler has quit IRC
 522016-01-06T02:54:45  *** cryptopeddler has joined #bitcoin-core-dev
 532016-01-06T03:05:56  <maaku> We use got like it is svn, this is true.
 542016-01-06T03:12:58  <Luke-Jr> Actually, svn is even better than git-rebase in this regard :/
 552016-01-06T03:24:11  *** brg444 has joined #bitcoin-core-dev
 562016-01-06T03:44:47  *** cryptopeddler has quit IRC
 572016-01-06T03:46:39  *** cryptopeddler has joined #bitcoin-core-dev
 582016-01-06T03:47:59  *** d_t has joined #bitcoin-core-dev
 592016-01-06T03:59:47  *** p15 has quit IRC
 602016-01-06T04:04:38  *** p15 has joined #bitcoin-core-dev
 612016-01-06T04:18:23  *** cryptopeddler has quit IRC
 622016-01-06T04:20:15  *** cryptopeddler has joined #bitcoin-core-dev
 632016-01-06T04:26:00  *** cryptopeddler has quit IRC
 642016-01-06T04:27:30  *** cryptopeddler has joined #bitcoin-core-dev
 652016-01-06T04:42:11  *** cryptopeddler has quit IRC
 662016-01-06T04:43:52  *** cryptopeddler has joined #bitcoin-core-dev
 672016-01-06T04:48:06  *** cryptopeddler has quit IRC
 682016-01-06T04:50:07  *** cryptopeddler has joined #bitcoin-core-dev
 692016-01-06T04:57:35  *** cryptopeddler has quit IRC
 702016-01-06T04:59:18  *** cryptopeddler has joined #bitcoin-core-dev
 712016-01-06T05:06:04  *** cryptopeddler has quit IRC
 722016-01-06T05:07:28  *** cryptopeddler has joined #bitcoin-core-dev
 732016-01-06T05:20:44  *** cryptopeddler has quit IRC
 742016-01-06T05:21:46  *** cryptopeddler has joined #bitcoin-core-dev
 752016-01-06T05:29:21  *** cryptopeddler has quit IRC
 762016-01-06T05:30:57  *** cryptopeddler has joined #bitcoin-core-dev
 772016-01-06T06:21:39  <btcdrak> merging in pull-requests is ugly to the extreme and makes the main tree disgusting to look at. Just take a gander at Counterparty's source repositiories to see. It's a nightmare to determine what is going on. a PR branch can and should be rebased to make the patch clear and concise.
 782016-01-06T06:23:21  <btcdrak> it is wrong to rebase the main tree (i.e. the working master branch and maintenance branches) of course, because that screws up history for everyone, but for patches before they are merged it absolutely makes sense.
 792016-01-06T06:24:30  <btcdrak> most of the arguments I've read do not make the clear distinction between PR patches and the upstream repository, which is essential.
 802016-01-06T07:00:47  *** Ylbam has joined #bitcoin-core-dev
 812016-01-06T07:34:53  *** d_t has quit IRC
 822016-01-06T07:36:14  *** ghtdak has quit IRC
 832016-01-06T07:38:11  *** ghtdak has joined #bitcoin-core-dev
 842016-01-06T07:46:43  *** d_t has joined #bitcoin-core-dev
 852016-01-06T08:58:41  *** Guyver2 has joined #bitcoin-core-dev
 862016-01-06T09:17:36  *** Quent1 has quit IRC
 872016-01-06T09:22:01  *** d_t has quit IRC
 882016-01-06T09:31:37  *** jtimon has joined #bitcoin-core-dev
 892016-01-06T10:04:09  *** MarcoFalke has joined #bitcoin-core-dev
 902016-01-06T10:12:26  *** randy-waterhouse has quit IRC
 912016-01-06T10:39:02  *** xiangfu has joined #bitcoin-core-dev
 922016-01-06T10:40:18  *** p15 has quit IRC
 932016-01-06T10:40:47  <jtimon> https://www.youtube.com/watch?v=47xbkT3calM
 942016-01-06T10:41:01  <jtimon> sorry, wrong channel
 952016-01-06T10:42:06  <jtimon> I was actually waiting for an answer for this song, wrong channell if you're looking for answers...
 962016-01-06T10:42:20  *** p15 has joined #bitcoin-core-dev
 972016-01-06T10:42:38  <jtimon> https://www.youtube.com/watch?v=MGQjyGT1-mc
 982016-01-06T10:43:00  *** p15 has quit IRC
 992016-01-06T10:49:07  *** p15 has joined #bitcoin-core-dev
1002016-01-06T11:02:22  *** xiangfu has quit IRC
1012016-01-06T11:22:05  <jtimon> ping wunpus
1022016-01-06T11:27:05  *** jtimon has quit IRC
1032016-01-06T12:06:31  *** brg444 has quit IRC
1042016-01-06T12:21:23  *** p15 has quit IRC
1052016-01-06T12:55:43  <maaku> btcdrak: the flip argument is that fully decentralized development processes (with independent trees that merge back and forth freely, like linux does) offers a much easier development style
1062016-01-06T12:55:47  <maaku> process be damned
1072016-01-06T12:55:59  <maaku> er, *clean history be damned
1082016-01-06T13:01:57  <MarcoFalke> Imo, it still makes sense to rebase when there is only one commit that can't be merged cleanly. But specifically the unifiy_prodname pull should not be rebased as it is rather huge and collected some tested ACK
1092016-01-06T13:10:09  *** arowser has quit IRC
1102016-01-06T13:10:38  *** arowser has joined #bitcoin-core-dev
1112016-01-06T13:16:02  *** trippysalmon has joined #bitcoin-core-dev
1122016-01-06T13:26:51  *** trippysalmon has quit IRC
1132016-01-06T13:46:18  *** Guest68507 is now known as ChillazZ
1142016-01-06T14:00:53  *** laurentmt has joined #bitcoin-core-dev
1152016-01-06T14:22:05  *** laurentmt has quit IRC
1162016-01-06T14:50:18  *** d_t has joined #bitcoin-core-dev
1172016-01-06T15:15:55  *** laurentmt has joined #bitcoin-core-dev
1182016-01-06T15:16:59  *** laurentmt has quit IRC
1192016-01-06T15:28:29  *** PaulCapestany has quit IRC
1202016-01-06T15:30:11  *** PaulCapestany has joined #bitcoin-core-dev
1212016-01-06T15:35:28  *** PaulCape_ has joined #bitcoin-core-dev
1222016-01-06T15:37:40  *** PaulCapestany has quit IRC
1232016-01-06T15:54:19  <GitHub134> [bitcoin] MarcoFalke opened pull request #7304: [contrib] Add clang-format-diff.py (master...Mf1601-clang-format-diff) https://github.com/bitcoin/bitcoin/pull/7304
1242016-01-06T15:55:22  *** treehug88 has joined #bitcoin-core-dev
1252016-01-06T16:10:28  *** PaulCape_ has quit IRC
1262016-01-06T16:10:54  *** PaulCapestany has joined #bitcoin-core-dev
1272016-01-06T16:18:53  *** jtimon has joined #bitcoin-core-dev
1282016-01-06T16:22:57  *** dermoth has quit IRC
1292016-01-06T16:23:31  *** dermoth has joined #bitcoin-core-dev
1302016-01-06T16:30:01  *** MarcoFalke has quit IRC
1312016-01-06T16:30:57  *** MarcoFalke has joined #bitcoin-core-dev
1322016-01-06T16:34:18  *** Guest65074 is now known as bsm117532
1332016-01-06T16:44:53  *** MarcoFalke has quit IRC
1342016-01-06T16:45:03  *** d_t has joined #bitcoin-core-dev
1352016-01-06T16:46:27  *** MarcoFalke has joined #bitcoin-core-dev
1362016-01-06T16:51:36  *** murch has joined #bitcoin-core-dev
1372016-01-06T16:58:03  *** arowser has quit IRC
1382016-01-06T16:58:35  *** arowser has joined #bitcoin-core-dev
1392016-01-06T16:59:54  *** trippysalmon has joined #bitcoin-core-dev
1402016-01-06T17:44:48  <morcos> sipa: speaking of benchmarks, did you see my comment yesterday about the slowdown in smartfees.py due to the Poisson/trickle change?
1412016-01-06T17:45:23  <morcos> Overall the non-extended RPC tests only went from 6 min 9 sec to 9 min 30 sec
1422016-01-06T17:46:13  <morcos> so that maybe not enough to do anythign about, but I wonder if just for speed of development testing it woudl be worth adding a chainparam to reduce the inv broadcast interval for regtest?
1432016-01-06T17:46:22  <sipa> morcos: hmm
1442016-01-06T17:46:40  <sipa> morcos: or just a configurable latency factor
1452016-01-06T17:47:58  <morcos> sipa: hmm..  any advantage for mainnet nodes to use that.  if you're a fast node you coudl turn it down a bit and if you're barely squeaking by you could turn it up?
1462016-01-06T17:48:35  <morcos> let me see how much it speeds up rpc tests to make it 1 sec
1472016-01-06T17:56:18  *** jtimon has quit IRC
1482016-01-06T18:21:05  *** trippysalmon has quit IRC
1492016-01-06T18:31:45  <morcos> sipa: with 1sec poisson its down to 6 min 37 sec for non-extended suite and 85 secs for smartfees
1502016-01-06T18:33:30  <morcos> 38 secs for smartfees with 0
1512016-01-06T19:25:12  <morcos> sipa: your suggestion to forget wallet txs by conflicting with the genesis block?  is that motivated by wanting to be able to save the state of whether its forgotten?  Because introducing something else would mess with wallet serialization format?
1522016-01-06T19:25:34  <morcos> I was tryign to understand why to hack it in there (or even whether that was a serious solution) and then I ran into that problem
1532016-01-06T19:26:47  <sipa> morcos: it's sort of a hack; if you have a better solution, feel free :)
1542016-01-06T19:29:00  <morcos> sipa: i think its important to remember that state so then when you restart you don't try to reaccept/broadcast any txs you've said to forget, so i'll go with that approach.  i'm excited for jonas's new wallet?  What the eta on that?  March? :)
1552016-01-06T19:32:15  *** arubi has quit IRC
1562016-01-06T19:39:52  *** arubi has joined #bitcoin-core-dev
1572016-01-06T19:48:56  <jonasschnelli> morcos: March would be very optimistic. :)
1582016-01-06T19:51:15  <btcdrak> jonasschnelli: sounds like you need a dealine to work to :)
1592016-01-06T19:51:36  <jonasschnelli> btcdrak: hah. Deadlines make it worse...
1602016-01-06T19:52:01  <jonasschnelli> need to finish my hardware wallet stuff first... then i'll focus on the core-wallet
1612016-01-06T19:52:21  <btcdrak> what hardware wallet are you working on?
1622016-01-06T19:52:28  <jonasschnelli> digitalbitbox.com
1632016-01-06T19:52:54  <btcdrak> great, so it will be the first segwit supporting hardware wallet then :)
1642016-01-06T19:53:07  <jonasschnelli> 1000 pieces are ready for shipping... finalizing the software now.
1652016-01-06T19:53:46  <jonasschnelli> btcdrak: sure. the hardware wallet itself is just a secp256k1 signing device that can hold and derive keys.
1662016-01-06T19:54:09  <jonasschnelli> + some fancy crypto to verify your data-to-sign over a smartphone.
1672016-01-06T20:03:37  <phantomcircuit> jonasschnelli, secure element or microcontroller in epoxy?
1682016-01-06T20:03:49  <phantomcircuit> (looks pretty neat either way)
1692016-01-06T20:03:55  <jonasschnelli> phantomcircuit: yes. Both.
1702016-01-06T20:04:24  <jonasschnelli> Black epoxy... so, if you want to reset the bootloader or visually extract a seed,... it's going to be very difficult.
1712016-01-06T20:05:00  <jonasschnelli> and it should be relatively side-channel attack proof, thanks to libsecp256k1
1722016-01-06T20:17:27  *** arubi has quit IRC
1732016-01-06T20:33:50  *** arubi has joined #bitcoin-core-dev
1742016-01-06T20:49:26  *** paveljanik has joined #bitcoin-core-dev
1752016-01-06T20:49:26  *** paveljanik has joined #bitcoin-core-dev
1762016-01-06T20:55:46  *** jtimon has joined #bitcoin-core-dev
1772016-01-06T21:22:37  *** randy-waterhouse has joined #bitcoin-core-dev
1782016-01-06T21:43:38  *** d_t has quit IRC
1792016-01-06T21:51:19  *** paveljanik has quit IRC
1802016-01-06T21:53:53  *** zookolaptop has joined #bitcoin-core-dev
1812016-01-06T22:04:34  *** mr_burdell has quit IRC
1822016-01-06T22:04:35  *** Amnez777 has quit IRC
1832016-01-06T22:04:36  *** ChillazZ has quit IRC
1842016-01-06T22:04:37  *** mr_burdell_ has joined #bitcoin-core-dev
1852016-01-06T22:04:56  *** aj has quit IRC
1862016-01-06T22:05:01  *** mr_burdell_ is now known as mr_burdell
1872016-01-06T22:05:16  *** Ylbam has quit IRC
1882016-01-06T22:05:16  *** Squidicuz has quit IRC
1892016-01-06T22:05:16  *** Thireus has quit IRC
1902016-01-06T22:05:31  *** mr_burdell is now known as Guest31456
1912016-01-06T22:05:33  *** Amnez777 has joined #bitcoin-core-dev
1922016-01-06T22:05:34  *** Amnez777 has quit IRC
1932016-01-06T22:05:51  *** ChillazZ has joined #bitcoin-core-dev
1942016-01-06T22:06:01  *** Amnez777 has joined #bitcoin-core-dev
1952016-01-06T22:06:02  *** aj has joined #bitcoin-core-dev
1962016-01-06T22:06:02  *** Amnez777 has quit IRC
1972016-01-06T22:06:16  *** Thireus has joined #bitcoin-core-dev
1982016-01-06T22:06:26  *** ChillazZ is now known as Guest87962
1992016-01-06T22:06:40  *** Amnez777 has joined #bitcoin-core-dev
2002016-01-06T22:06:41  *** Amnez777 has quit IRC
2012016-01-06T22:07:12  *** Amnez777 has joined #bitcoin-core-dev
2022016-01-06T22:18:32  *** treehug88 has quit IRC
2032016-01-06T22:19:38  *** Arnavion has quit IRC
2042016-01-06T22:19:48  *** Ylbam has joined #bitcoin-core-dev
2052016-01-06T22:20:02  *** Arnavion has joined #bitcoin-core-dev
2062016-01-06T22:21:03  *** AtashiCon has quit IRC
2072016-01-06T22:21:22  *** AtashiCon has joined #bitcoin-core-dev
2082016-01-06T22:25:03  *** brg444 has joined #bitcoin-core-dev
2092016-01-06T22:25:08  *** Guyver2 has quit IRC
2102016-01-06T22:25:34  *** Squidicuz has joined #bitcoin-core-dev
2112016-01-06T22:26:01  <GitHub137> [bitcoin] morcos opened pull request #7306: Make sure conflicted wallet tx's update balances (master...fixconflicts) https://github.com/bitcoin/bitcoin/pull/7306
2122016-01-06T22:33:05  *** jtimon has quit IRC
2132016-01-06T22:42:11  <jcorgan> jonasschnelli: finally
2142016-01-06T22:51:45  *** JackH has quit IRC
2152016-01-06T22:55:41  *** cryptopeddler has quit IRC
2162016-01-06T22:57:10  *** cryptopeddler has joined #bitcoin-core-dev
2172016-01-06T22:57:36  *** JackH has joined #bitcoin-core-dev
2182016-01-06T23:11:24  *** cryptopeddler has quit IRC
2192016-01-06T23:13:29  *** cryptopeddler has joined #bitcoin-core-dev
2202016-01-06T23:14:41  *** murch has quit IRC
2212016-01-06T23:21:12  *** cryptopeddler has quit IRC
2222016-01-06T23:22:41  *** cryptopeddler has joined #bitcoin-core-dev
2232016-01-06T23:29:34  *** Squidicuz has quit IRC
2242016-01-06T23:45:37  *** MarcoFalke has quit IRC