Thursday, 2017-08-31

*** tpb has joined #timvideos00:00
mithroIshan_Bansal: can't see file on your local computer but it sounds like progress00:14
*** sb0 has quit IRC01:58
*** sb0 has joined #timvideos02:58
*** rohitksingh_work has joined #timvideos03:35
mithroIshan_Bansal: Ping? I merged your current pull request, can you send the next one?04:23
mithropaddatrapper: ping?07:26
paddatrappermithro: pong07:26
mithropaddatrapper: Had any luck?07:27
paddatrappermithro: haven't had a chance to try further. Been trying to catch up assignments. Hope to be able to try again this weekend07:28
mithropaddatrapper: Okay, I should be around on the weekend too07:31
paddatrappermithro: ok cool07:31
*** [d__d] has quit IRC08:19
*** [d__d] has joined #timvideos08:22
*** thaytan_ has joined #timvideos08:55
*** thaytan has quit IRC08:59
*** sb0 has quit IRC09:05
John_KMithro: if you re-pull CypressFX into your checkout it should start working09:22
John_KI reduced the required change set to a one line fix09:22
Ishan_Bansalmithro : ping09:24
*** tangrs has quit IRC10:02
*** tangrs has joined #timvideos10:14
Ishan_Bansalmithro : Sorry for the previous one. The documentation is in the following link:10:21
tpbTitle: litejpeg/Documentation at Adding_Documentation · ishan98/litejpeg · GitHub (at
*** rohitksingh_work has quit IRC10:40
*** rohitksingh_work has joined #timvideos10:41
mithroIshan_Bansal: pong10:43
mithroIshan_Bansal: Did you see I merged your pull request? You can send the next one now...10:44
*** rohitksingh_wor1 has joined #timvideos10:45
Ishan_Bansalmithro : ya, Actually I have added some additional commits in the rle core branch and those are not in the huffman. So isn't it create problem while merging the two ?10:45
mithroIshan_Bansal: You might have to manually merge the new rle-core branch into the huffman before sending the pull request10:46
*** rohitksingh_work has quit IRC10:46
mithroIshan_Bansal: You can also enable "readthedocs" for your GitHub repo so that you can have them automatically published10:49
*** sb0 has joined #timvideos11:23
Ishan_Bansalmithro : ping11:27
mithroIshan_Bansal: pong11:32
Ishan_Bansalmithro : How can I check that what things are creating problems while merging the two branches12:24
Ishan_Bansalmithro : Also I have added all the files which are changed in the RLE into the huffman but still it is showing not able to merge automatically.12:30
Ishan_Bansalmithro : With this thing should I generate a pull request or I have to do something first to get it automatic merge.12:30
mithroIshan_Bansal: do a "git remote add upstream; git fetch" then a "git merge upstream/master"12:45
Ishan_Bansalmithro : following thing is coming :12:50
Ishan_Bansalmerge: upstream/master - not something we can merge12:50
mithrooh sorry12:51
mithrogit fetch upstream12:51
Ishan_Bansalmithro : Here is the file where the conflict is taking place but I am not able to catch what is the problem12:54
Ishan_Bansalmerge: upstream/master - not something we can merge12:54
Ishan_Bansalmithro :sorry wrong one12:55
tpbTitle: Understanding Git conflict markers · (at
tpbTitle: Dealing With Merge Conflicts (at
tpbTitle: 30. Resolving Conflicts (at
mithroIshan_Bansal: do they help?12:59
*** rohitksingh_wor1 has quit IRC12:59
Ishan_Bansalmithro : I think they will, I am going through them.13:00
mithrookay cool13:00
*** ChanServ sets mode: +v thaytan_13:22
*** thaytan_ is now known as thaytan13:22
Ishan_Bansalmithro : Done. Now you can review the pull request. :)13:25
*** nueces has joined #timvideos18:16
*** thaytan_ has joined #timvideos19:31
*** thaytan has quit IRC19:35
cr1901_modernmithro: flterm xmodem support is nearly complete, but the transfer locks up at the last packet and blocks in write() syscall when I try sending the last packet (what the hell?!)22:38
cr1901_modernmithro: Wait... that's not possible. serialfd was opened as O_NONBLOCK.22:40
cr1901_modernErrr, nevermind... logic error22:42
* cr1901_modern really needs to work on not assuming the impossible as happened...22:42

Generated by 2.13.1 by Marius Gedminas - find it at!