**** BEGIN LOGGING AT Sat Jun 27 02:59:58 2015 Jun 27 19:51:22 jkridner: Any news on the BeagleBone green yet? Jun 27 19:52:04 I got my real one on Thursday.... I'm working a bit this weekend to try to test the Fingerprint Sensor over UART/JavaScript. Jun 27 19:53:08 cool Jun 27 19:54:58 jkridner: Running 4.1 and Jessie, or still on Wheezy on the Green? Jun 27 19:55:20 Still Wheezy for the moment, but moving to 4.1 and Jessie quickly. Jun 27 19:57:07 jkridner: btw, I was able to patch and compile 3.14's PRUSS drivers on the 4.1, but yet to test them and shubhangi's work. Jun 27 20:22:26 jkridner: I know that you are busy these days ,, but is there a way that we could arrang a time to finish up with the current PR? Jun 27 20:24:02 jkridner: plus I don't think that it would be a nice idea to make a PR with that big next time ,, so I suggest if I could make a PR with a single feature that way it will me easy to solve any issue with the commits. Jun 27 20:36:36 ebadawy: i think you should start with a merge of current master Jun 27 20:37:14 for conflicts that have been cherry-picked already just take master Jun 27 20:38:16 nerdboy: you mean jadonk:master to ehab93:merge_branch Jun 27 20:38:37 any other conflicts will take some cleanup/fixes, then you can rebase/squash the ones you want to Jun 27 20:39:24 yes, jadonk:master and address conflicts Jun 27 20:40:16 should always pull on the main branch before you try merging your stuff in Jun 27 20:40:52 ok, I'll do it. do u have some time in case of I stuck in any thing? Jun 27 20:41:00 should not to be too hard to sort out/clean up your changes before rebase/squash Jun 27 20:41:23 yeah, i'm around working on stuff Jun 27 20:42:10 if you get backed into a corner during merge, you can abort the merge and try again Jun 27 20:47:41 helps if you enable the git bash prompt/completion stuff Jun 27 20:48:14 prompt will show you branch name, merge state, etc Jun 27 20:48:34 * nerdboy likes handy reminders Jun 27 20:48:46 nerdboy: I think that I have done it now ,, https://github.com/jadonk/bone101/pull/20 Jun 27 20:48:48 s/likes/needs/ Jun 27 20:49:43 did you review the actual commits/contents of your branch after? Jun 27 20:50:23 they should be the same, shouldn't they? Jun 27 20:51:46 minus whatever got cherry-picked Jun 27 20:52:23 should have your stuff plus any changes since you branched Jun 27 20:53:01 makes it a clean ff merge for jkridner Jun 27 20:53:08 should I do that using a rebase? Jun 27 20:53:35 you didn't rebase/squash your stuff yet? Jun 27 20:53:56 I mean for deleting any unrelated commits Jun 27 20:54:14 as long as you have a good idea what you want to squash you can do that on your branch Jun 27 20:54:24 what I did so far is merging jadonk:master Jun 27 20:55:12 then look at your commits and see if any make a logical group you can squash into a single commit Jun 27 20:55:34 * ebadawy hates doing a rebase for a long history commits Jun 27 20:56:27 rebasing might ungroup some of your commits Jun 27 20:57:20 first look for logical groups where your "change" would be incomplete/broken without one Jun 27 20:57:36 *one of N commits Jun 27 20:57:59 if you stuff like that they are squash candidates Jun 27 21:00:05 nerdboy: I think that I did the step before, not sure if jkridner will like the current commits but what I need to do is to eliminate the first two commits Jun 27 21:00:22 ebadawy: it needs to be done again based on the cherry-picks I did. Jun 27 21:01:00 oh, I see the pull can now be fast-forwarded! Jun 27 21:01:20 guess you did that with a merge. Jun 27 21:01:39 jkrinder: yes, I just made a merge ,, but still there is some commit that u cherry picked exist Jun 27 21:01:46 * nerdboy did not review any commits Jun 27 21:01:54 odd, I thought I'd already merged https://github.com/ehab93/bone101/commit/b51b45f398195614673a37f2e23b98afc2d410d6 Jun 27 21:02:30 oh... those are getting picked up by your merge. Jun 27 21:02:30 there hashed were changed from a rebase Jun 27 21:02:50 if something looks weird check the current state/history of the file(s) Jun 27 21:03:26 making many rebases get the history looks weird! Jun 27 21:04:05 jkridner: have u got my comment ,, https://github.com/jadonk/bone101/commit/93eb9a29c5e693698230e204f7f4a98a481467c3 Jun 27 21:04:51 * nerdboy is generally reluctant to rewrite history without a really good reason... Jun 27 21:05:22 ebadawy: yes, but the history of the merged patches should look good. and, the history of the other branches isn't lost. the result is that there is consolidated history for new people coming to look at the project (if I was better at managing my own history) Jun 27 21:06:10 you mean history on his branch or master? Jun 27 21:06:57 history is preserved on his branch and different (summary) history is preserved on master. Jun 27 21:08:06 is having a third_party directory the way we all want to go? guess I just got the memo. Jun 27 21:09:32 yes, what I was saying that these two commits that u have cherry picked were updated Jun 27 21:09:33 * jkridner is no longer clear on what to merge without a rebase. Jun 27 21:10:18 jkridner: is the third_party dir is a good thing to do? Jun 27 21:12:02 sure, I guess. Jun 27 21:12:08 your merge would pick up his changes Jun 27 21:12:40 not sure of that ,, coz they both have differnet hashes! Jun 27 21:12:56 different* Jun 27 21:13:08 git can figure that out Jun 27 21:13:16 * jkridner isn't sure what to do other than clean up the patches hisself. Jun 27 21:13:23 I don't trust the huge list of patches. Jun 27 21:13:27 I don't know what all has changed. Jun 27 21:13:48 I mean, even the patch for adding the Python examples is different and I don't know why. Jun 27 21:13:53 then stay with cherry-picked stuff for now Jun 27 21:14:11 that what was i saying ,, next time I shouldn't make a PR with that big. Jun 27 21:14:28 yes, a smaller PR would be easier. Jun 27 21:15:01 jkridner: that's wired, I haven't changed any thing with the Python examples! Jun 27 21:15:21 it is however you did your rebase or where you forked from. Jun 27 21:15:55 oh, that's right, the first two commit were inside a rebase range Jun 27 21:15:57 maybe just keep that branch but start with a fresh one Jun 27 21:16:09 so there hashes were changed too! Jun 27 21:16:38 migrate what you want to fresh branch, send PR for "small" change sets Jun 27 21:16:44 what are 'bonecard-{code,micro,preview}'? Jun 27 21:17:02 repeat Jun 27 21:17:29 nerdboy: +1 Jun 27 21:17:39 "migrate what you want to fresh branch, send PR for "small" change sets" Jun 27 21:17:49 code is that one the dark bg ,, micro for the list in create page ,, preview for the tutorial page Jun 27 21:18:02 ok, I think I can do that. Jun 27 21:18:06 ebadawy: you can rebase --onto one set at a time, squash as needed, make PR Jun 27 21:18:44 also, please keep patches separate for style vs. function. I don't like merging a bunch of name changes and whitespace changes that don't have any relation to a functional change. Jun 27 21:18:52 it makes me not trust the patch. Jun 27 21:19:11 okay. Jun 27 21:19:49 a commit should be able to stand by itself Jun 27 21:20:46 if it's a bunch of related stuff in several commits, squashing it to one makes sense Jun 27 21:21:57 * nerdboy trying to kill an ssd testing kernel source package changes Jun 27 22:04:15 jkridner: what is the approach that I should follow for connecting BBB with the page? Jun 27 22:05:22 Check out the implementation of setTargetAddress() Jun 27 22:07:06 The current way bone101 connects to a target is using https://github.com/jadonk/bone101/blob/master/static/bonescript.js and calling setTargetAddress()... Jun 27 22:07:31 it would be great if it was enhanced to allow disconnections and halting execution of running scripts in some way. Jun 27 22:07:50 I added a disconnect button. Jun 27 22:08:03 * ebadawy was looking in beagle-ui.js Jun 27 22:08:53 yeah, that's where I do it for the existing tutorials. Jun 27 22:09:43 but, that is very much built around the current concept, with the red box at the top of the screen that you can turn green by discovering a board. Jun 27 22:09:52 * jkridner has to run to a family dinner. Jun 27 22:10:04 ok, great ,, I check them. Jun 27 22:10:16 I'll * Jun 27 22:10:58 go ahead :) Jun 28 00:44:02 jkridner: check this one ,, https://github.com/jadonk/bone101/pull/21 **** ENDING LOGGING AT Sun Jun 28 02:59:58 2015