**** BEGIN LOGGING AT Mon Jun 22 02:59:59 2015 Jun 22 05:35:16 av500 - only the primary mentors for each project fill in the student review, right ? Jun 22 05:35:31 I would say so Jun 22 05:39:58 thanks :) Jun 22 06:02:53 inputs are always good.... Jun 22 13:12:49 * jkridner looks around for ebadawy Jun 22 13:28:29 ebadawy, jkridner : ping Jun 22 13:29:49 Abhishek_: ask, don't ask to ask. Jun 22 13:30:08 ebadawy: just saw you joined... I made a few comments. still working on some more. Jun 22 13:30:31 ebadawy: let me know if my new 'issue' is clear. I want to try to get some of your code merged. Jun 22 13:30:35 jkridner: The purpose was to connect you to ebadawy. Jun 22 13:30:44 Abhishek_: pong Jun 22 13:30:49 Abhishek_: ah, thanks for pointing out that he joined! Jun 22 13:31:10 Abhishek_: sorry for being snarky. Jun 22 13:31:15 jkridner: yes, it's clear and I'll replay now. Jun 22 13:56:30 ebadawy: thanks. I hope you appreciate me trying to clean it up now on its way in, rather than trying to have you clean it up afterwards. let me know if I'm not being clear enough as I don't want to slow you down. Jun 22 13:57:52 jkridner: no, that is acutely helping me alot! thanks for your feedback. and I'll always keep you updated Jun 22 13:59:25 jkridner: btw, what's the status on the BeagleBone Green requested? Jun 22 14:00:21 Abhishek_: I'm not looking into it until I have confirmation they are shipping. Jun 22 14:01:07 jkridner: okay, waiting. Did they run into further issues? Jun 22 14:04:44 I've only been waiting for an updated prototype... I think they sent me the wrong version. rcn-ee too. Jun 22 14:49:00 Abhishek_: ping. did you try compiling Jun 22 14:58:04 jkridner: I understand about 'create' dir, but do want a 'bonecard' dir inside bone101 ,, coz it currently doesn't exists ,, https://github.com/ehab93/bone101/commit/2ac0988b13e2e64f1745adc1234020752b3678fd Jun 22 14:58:43 I think /Support/bonecard/create/ is best. Jun 22 14:58:47 no need for under bone101 Jun 22 14:59:04 https://github.com/ehab93/bone101/tree/gh-pages/Support/bonecard is how I have it today. Jun 22 14:59:07 I like that better. Jun 22 14:59:27 and for my_tutorial&tutorial pages? Jun 22 14:59:48 what are those? Jun 22 15:00:16 like /Support/bonecard/tutorial/ ? Jun 22 15:00:29 my_tutorial for previewing the creating tutorials for the currenty user, and tutorial page for previewing a specific tutorial Jun 22 15:00:38 yes Jun 22 15:02:57 I'd think that /Support/bonecard/ should be showing the list of available tutorials. Does that work? Jun 22 15:03:13 or, it could show a list of lists. Jun 22 15:03:32 but, I'd not think that you'd need to go deeper to start getting to lists. Jun 22 15:04:09 the existing index.html in there was a placeholder example until we had some actual tutorials. Jun 22 15:05:18 don't you think that /Support/bonecard/ will be more suitable for showing a single tutorial ? Jun 22 15:05:50 I think showing a list of tutorials need to go some where else. Jun 22 16:43:09 shubhangi: Compiling the kernel right now Jun 22 16:43:39 ok Jun 22 16:44:05 vvu_: got a chance to test the driver? Jun 22 17:01:51 ah, looks like remoteproc ain't going to compile cleanly Jun 22 17:05:03 Compile errors https://www.irccloud.com/pastebin/x16fb4qi/4.1%20compile Jun 22 17:23:30 Abhishek_: what kernel version/fork? Jun 22 17:37:25 This is 4.1 Jun 22 17:37:25 4.1-rc8-bone9 Jun 22 18:41:14 Abhishek_: you are looking into this issue ? Jun 22 19:56:15 shubhangi: I will, but you're also welcome to trace it assuming your other tasks aren't affected. Jun 22 20:03:19 ok (y) Jun 22 20:04:03 cloned 4.1 tree. will try Jun 22 21:53:17 * Abhishek_ is able to compile pruss-remoteproc with a few bits and pieces taken from the 3.14 tree, some more patchwork might be needed. Jun 22 21:53:46 shubhangi: Do you have the device tree bits posted somewhere? Jun 22 21:54:54 *pruss-remoteproc on 4.1 Jun 22 22:01:53 jkridner: the only advantage that I know ckeditor for now is that I already used it and know how it works, changing it will cause to a change multiply lines of code, if we don't use tinymce any where else couldn't ckeditor replace it for now? Jun 22 22:05:50 jkridner: check last 4 commits ,, I still didn't change my_tutorials(this page get current user tutorials) page as I want to confirm with where should it be and if this is a good name for it. Jun 22 22:10:01 ebadawy: the opposite is true for me (I know ckeditor works and it is more work for me to replace it). burden is generally on the one making the change. I'll be quicker to take in changes that don't add libraries that duplicate existing functionality. Jun 22 22:13:42 jkridner: ok, np ,, I'll change it. Jun 22 22:13:57 do you know how to "rebase and squash" patches? Jun 22 22:14:12 no acutely Jun 22 22:14:30 didn't try it before, but I can search for it Jun 22 22:15:29 acutely != actually Jun 22 22:15:48 pretty much what I had mentioned in one of the comments.... Jun 22 22:15:54 make a new branch off of master... Jun 22 22:16:06 I always getting wrong! :) Jun 22 22:16:16 then cherry-pick the "good" patches. Jun 22 22:16:37 use 'git commit --amend' to combine or fix-up patches. Jun 22 22:17:08 (after having done 'git add ' on the file changes you want to add to the previous commit) Jun 22 22:17:44 there is an interactive mechanism that tries to automate this: https://help.github.com/articles/using-git-rebase/ Jun 22 22:17:54 it is probably more complicated to understand that method though. Jun 22 22:18:08 I wonder who not making commits that fix these commits? Jun 22 22:19:05 * ebadawy likes to try new things with git anyway Jun 22 22:19:32 Abhishek_: this is rcn kernel with external patch? Jun 22 22:20:04 https://try.github.io/levels/1/challenges/1 is a lot of help, but doesn't seem to go to rebasing/squashing. Jun 22 22:21:01 ebadawy: if needed, I can accept the series with fixes for names, etc., it just isn't ideal. what I don't want is to add a bunch of files that will simply get removed. Jun 22 22:22:01 ^^oh ,, I got it till level 2 on codeschool! but that was few monthes ago Jun 22 22:25:02 ^^ I'm working now on these changes. I understand that and don't want this to be the situation neither. Jun 22 22:34:34 git is pretty safe since you are operating on a local copy right? Jun 22 22:35:29 there are many ways to unhork a repo too if you get in trouble, although i would recommend staying away from gui front-ends and us cli only Jun 22 22:35:46 some of those guis do really stupid stuff... Jun 22 22:36:00 *use even Jun 22 22:36:36 I do use just cli for git Jun 22 22:37:13 then you can have a cookie Jun 22 22:38:06 :) Jun 22 22:39:41 certain things work, but make for an insane/ugly commit history Jun 22 22:40:02 if you get that you can revert and do it different Jun 22 22:40:32 * nerdboy assuming you also made tmp-crap branch for experimenting Jun 22 22:41:29 no, didn't make it! Jun 22 22:42:06 but the main branch not that ugly now, I guess Jun 22 23:08:24 Abhishek_: awake ? Jun 22 23:42:29 jkridner, nerdboy: cherry-pick commits with --no-commit option could do the as rebase and squash, right? Jun 22 23:42:49 (do the same)* Jun 23 00:24:04 i have no idea what you're trying to achieve, so... Jun 23 00:28:04 nerdboy: there is some commits that need to have some modifications and squashed to a single to commit, so was thinking of cherry-pick them with --no-commit option and do these changes. Jun 23 00:28:48 ^ jkridner: that is what need to be done, right? Jun 23 00:29:25 i would branch, squash, make new commit(s), merge back Jun 23 00:31:07 then you can make a sensible patch if needed (pack-port, etc) Jun 23 00:31:57 at least i would try that first... Jun 23 00:33:34 ie, branch before the part you want to squash, merge those commits in, squash, yada yada Jun 23 00:34:23 * nerdboy not really doing anything fancy with git atm Jun 23 00:35:37 drawing it helps to define what you need... Jun 23 00:46:10 nerdboy: I guess --no-commit option will do :) Jun 23 00:46:29 nerdboy: thanks for your help anyway Jun 23 02:58:24 * ebadawy is confused when making his first rebase&squash, did it on gh-pages branch and jkridner's comments gone with a force push! Jun 23 02:58:59 but I still have these comments on my mail though. **** ENDING LOGGING AT Tue Jun 23 02:59:58 2015