--- Log opened Mon Dec 16 00:00:38 2019 01:04 -!- belcher [~belcher@unaffiliated/belcher] has joined #rust-bitcoin 01:26 -!- jonatack [~jon@2a01:e0a:53c:a200:bb54:3be5:c3d0:9ce5] has quit [Ping timeout: 252 seconds] 01:54 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has quit [Quit: My MacBook has gone to sleep. ZZZzzz...] 01:55 -!- Kiminuo [~mix@213.128.80.60] has joined #rust-bitcoin 02:05 -!- jkczyz [~jkczyz@135.84.132.250] has joined #rust-bitcoin 02:05 -!- gwillen [~gwillen@unaffiliated/gwillen] has joined #rust-bitcoin 02:05 -!- fiatjaf [~fiatjaf@162.243.220.95] has joined #rust-bitcoin 02:06 -!- warren [~warren@198.199.105.216] has joined #rust-bitcoin 02:06 -!- warren [~warren@198.199.105.216] has quit [Changing host] 02:06 -!- warren [~warren@fedora/wombat/warren] has joined #rust-bitcoin 02:09 -!- jonatack [~jon@213.152.161.85] has joined #rust-bitcoin 02:17 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 02:27 -!- jonatack [~jon@213.152.161.85] has quit [Ping timeout: 276 seconds] 02:29 -!- mryandao [~mryandao@gateway/tor-sasl/mryandao] has quit [Remote host closed the connection] 03:04 -!- Laury38Murray [~Laury38Mu@ns334669.ip-5-196-64.eu] has joined #rust-bitcoin 04:45 -!- Laury38Murray [~Laury38Mu@ns334669.ip-5-196-64.eu] has quit [Ping timeout: 268 seconds] 05:07 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has quit [Read error: Connection reset by peer] 05:08 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 05:32 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has quit [Ping timeout: 246 seconds] 05:47 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 06:36 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has quit [Ping timeout: 276 seconds] 06:37 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 07:04 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has quit [Ping timeout: 248 seconds] 07:04 -!- orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 07:34 < stevenroose> orlovsky: could you rebase the newtype pr and address the nits? 07:34 < stevenroose> Would really like to finally get the rust-bitcoin PR out. 07:47 -!- andytoshi [~apoelstra@wpsoftware.net] has joined #rust-bitcoin 07:47 -!- andytoshi [~apoelstra@wpsoftware.net] has quit [Changing host] 07:47 -!- andytoshi [~apoelstra@unaffiliated/andytoshi] has joined #rust-bitcoin 07:48 -!- orlovsky [~dr-orlovs@194.230.155.171] has quit [Ping timeout: 245 seconds] 07:48 -!- Kiminuo [~mix@213.128.80.60] has quit [Ping timeout: 276 seconds] 07:49 < stevenroose> Is anyone sending me PMs on IRC? I can't find them. They are buried in old spam. Sorry, please ping me here so I know who it is :) 07:50 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 07:55 < dr-orlovsky> stevenroose: sure, working on it today. Can you give me an instruction how to re-base if there are merge commits? Such a re-base always results in a merge problem again, since of the different histories 08:07 < stevenroose> dr-orlovsky: have you done rebases before? You basically make sure master is up to date and then go to your own branch and do `git rebase master`. Whenever it blocks with conflicts you can do `git status` to see which files have conflicts, open them and search for <<<< sections. Resolve the conflicts, `git add` the files that had conflicts and `git rebase --continue`. 08:20 -!- jonatack [~jon@2a01:e0a:53c:a200:bb54:3be5:c3d0:9ce5] has joined #rust-bitcoin 08:34 -!- Dean_Guss [~dean@gateway/tor-sasl/deanguss] has joined #rust-bitcoin 08:51 -!- Kiminuo [~mix@213.128.80.60] has joined #rust-bitcoin 09:17 < dr-orlovsky> stevenroose: thanks, got it. Messed with git rebase --continue originally 09:31 -!- Dean_Guss [~dean@gateway/tor-sasl/deanguss] has quit [Remote host closed the connection] 09:56 -!- DeanGuss [~dean@gateway/tor-sasl/deanguss] has joined #rust-bitcoin 10:04 < dr-orlovsky> stevenroose: sorry, `git checkout hashtypes && git rebase master` is not working. It does wipe out half of my code without conflicts, randomly - seems like it decides that some of the master branch commits are "older" 10:09 < dr-orlovsky> all the requested changes are already there 10:53 < Kiminuo> dr-orlovsky, what about: create a new branch from master, and cherry-pick your stuff from merge of your-old-feature-branch & master 10:53 < Kiminuo> it's often easier than solving merge conflicts 10:53 < Kiminuo> just a tip, dunno if it helps you 11:09 < elichai2> Kiminuo: well technically that's exactly what rebase does :) 11:09 < elichai2> Oh but if you already have merge commits than you might be required to cherry pick or interactive rebase removing the merge commits 11:09 < Kiminuo> elichai2, yeah, but the difference may be how much manual work is needed to achieve similar results 11:10 < Kiminuo> elichai2, also when you have several commits in older feature branch then when rebasing you may solve some conflicts several times 11:17 < dr-orlovsky> I do not have merges from the master, but do know why the rebase is not performing as expected. Will try to do with cherrypicking 11:29 < dr-orlovsky> > well technically that's exactly what rebase does :) 11:30 < dr-orlovsky> due to some strange reason it does not; it squashes all commits and tries to apply them on top of master. It works well the oterh direction (rebasing master on my branch), showing the correct history (but in the wrong order, with master replacing my changes). 11:39 < dr-orlovsky> got the problem. Rebase fails on the first commit it tries to apply and does not proceeds with the history, so `git rebase --continue` must be performed multiple times. Didn't know that 11:40 < stevenroose> yeah continue goes to the next commit and you can have conflicts on every commit 11:40 < stevenroose> and if you ever merged master into your feature branch, you could have trouble, never did that myself 11:46 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has quit [Ping timeout: 248 seconds] 11:47 -!- orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 12:04 -!- orlovsky [~dr-orlovs@194.230.155.171] has quit [Read error: Connection reset by peer] 12:05 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 12:20 < dr-orlovsky> the rebased version is fine and ready for final review. Travis error is its own internal error (happens often) and if you trigger rebuild will not be there 12:26 -!- Christine65Labad [~Christine@ns334669.ip-5-196-64.eu] has joined #rust-bitcoin 12:29 -!- Christine65Labad [~Christine@ns334669.ip-5-196-64.eu] has quit [Remote host closed the connection] 12:31 -!- Dee1Mitchell [~Dee1Mitch@ns334669.ip-5-196-64.eu] has joined #rust-bitcoin 12:54 -!- Dee1Mitchell [~Dee1Mitch@ns334669.ip-5-196-64.eu] has quit [Remote host closed the connection] 12:59 -!- Christelle23Witt [~Christell@ns334669.ip-5-196-64.eu] has joined #rust-bitcoin 13:00 -!- Christelle23Witt [~Christell@ns334669.ip-5-196-64.eu] has quit [Remote host closed the connection] 13:02 -!- Velma23DuBuque [~Velma23Du@ns334669.ip-5-196-64.eu] has joined #rust-bitcoin 13:29 < stevenroose> dr-orlovsky:could you ask for the rebuild until it works? Or can't you do that? 13:37 -!- Velma23DuBuque [~Velma23Du@ns334669.ip-5-196-64.eu] has quit [Remote host closed the connection] 13:44 -!- Kiminuo [~mix@213.128.80.60] has quit [Quit: Leaving] 13:44 -!- Graham14Rempel [~Graham14R@ns334669.ip-5-196-64.eu] has joined #rust-bitcoin 13:54 -!- Graham14Rempel [~Graham14R@ns334669.ip-5-196-64.eu] has quit [Remote host closed the connection] 13:58 -!- Cecilia24Rowe [~Cecilia24@ns334669.ip-5-196-64.eu] has joined #rust-bitcoin 14:01 -!- Cecilia24Rowe [~Cecilia24@ns334669.ip-5-196-64.eu] has quit [Remote host closed the connection] 14:03 -!- Armani69Kihn [~Armani69K@ns334669.ip-5-196-64.eu] has joined #rust-bitcoin 14:10 -!- dr-orlovsky [~dr-orlovs@194.230.155.171] has quit [Read error: Connection reset by peer] 14:10 -!- orlovsky [~dr-orlovs@194.230.155.171] has joined #rust-bitcoin 14:44 -!- DeanGuss [~dean@gateway/tor-sasl/deanguss] has quit [Remote host closed the connection] 14:45 -!- DeanGuss [~dean@gateway/tor-sasl/deanguss] has joined #rust-bitcoin 15:48 < orlovsky> stevenroose: I can do it only my closing/reopening PR. Done it twice, it fails unpredictably. Seems like Travis is overloaded. I will try once again in the morning 15:52 -!- Armani69Kihn [~Armani69K@ns334669.ip-5-196-64.eu] has quit [Ping timeout: 265 seconds] 18:13 -!- Dean_Guss [~dean@gateway/tor-sasl/deanguss] has joined #rust-bitcoin 18:16 -!- DeanGuss [~dean@gateway/tor-sasl/deanguss] has quit [Ping timeout: 260 seconds] 23:15 -!- Kiminuo [~mix@213.128.80.60] has joined #rust-bitcoin --- Log closed Tue Dec 17 00:00:40 2019