**** BEGIN LOGGING AT Thu Jun 25 02:59:59 2015
Jun 25 04:12:44 <nerdboy> if not submodules then repo tool maybe
Jun 25 04:13:12 <nerdboy> ebadawy: how many external repos?  just that one?
Jun 25 04:14:15 <nerdboy> submodules are okay, but the parent repo needs --recursive switch or you get an empty dir
Jun 25 04:14:50 <nerdboy> then you get to do the submodule init dance
Jun 25 04:15:05 <ebadawy> nerdboy: 4 till now
Jun 25 04:15:21 <nerdboy> "put your right branch in, take your left branch out..."
Jun 25 04:15:43 <nerdboy> then maybe a repo manifest is what you want
Jun 25 04:16:15 <ebadawy> nerdboy: u have come on the right time ,, there is another big issue I am facing right now
Jun 25 04:16:20 <nerdboy> "init each submodule and shake it all about"
Jun 25 04:16:45 <nerdboy> or is that "scream and shout"?
Jun 25 04:16:58 <ebadawy> forget about submodule .. I'm not sure that I am using rebase thing in the right way
Jun 25 04:17:19 <ebadawy> i.e.
Jun 25 04:18:10 <ebadawy> say there a commit i want to squash with another commit that is very far away in the log history
Jun 25 04:18:27 <ebadawy> so what I am doning is renase for 70 commit
Jun 25 04:18:39 <ebadawy> this coz to change the hash of all these commits!
Jun 25 04:18:44 <ebadawy> is that normal?
Jun 25 04:19:18 <ebadawy> ^^ rebase*
Jun 25 04:20:02 <nerdboy> probably, but i don't normally rebase much
Jun 25 04:20:30 <ebadawy> but that is the case with me!
Jun 25 04:20:59 <ebadawy> because of that I have changed the hash of commit that is not mine ,, https://github.com/jadonk/bone101/pull/20
Jun 25 04:21:13 <ebadawy> and now the pull request is not mergeable
Jun 25 04:22:35 <ebadawy> jkridner: (when u come) ^
Jun 25 04:25:42 <nerdboy> rebase rewrites a linear history
Jun 25 04:26:00 <nerdboy> merge does not
Jun 25 04:26:00 <ebadawy> don't get it?
Jun 25 04:26:19 <nerdboy> end result is the same, just histroy is different
Jun 25 04:27:06 <ebadawy> so how to resolve this "This pull request contains merge conflicts that must be resolved"?
Jun 25 04:27:25 <nerdboy> merge command literally merges in branch history from (sometimes) multiple branches with parallel changes
Jun 25 04:27:54 <nerdboy> rebase rewrites commit history so it's all "linear"
Jun 25 04:28:19 <nerdboy> conflicts will always need resolving
Jun 25 04:28:20 <ebadawy> oh, that's why it is changing the hashes?
Jun 25 04:28:53 <nerdboy> it sounds like you might want to try it a different way
Jun 25 04:29:45 * ebadawy get confused each time using rebase!
Jun 25 04:29:46 <nerdboy> are you trying to pick out one commit 70-odd commits back from HEAD?
Jun 25 04:30:29 <ebadawy> let it be 'edit'
Jun 25 04:30:44 <nerdboy> which i assume you want next to some other commits?  (not that i get why yet)
Jun 25 04:31:17 <nerdboy> that's it?  edit one commit?
Jun 25 04:31:52 <ebadawy> yea, let's foucs on just 'edit' for now
Jun 25 04:32:03 <nerdboy> both commit message and "content"?
Jun 25 04:32:09 <ebadawy> yes
Jun 25 04:32:20 <ebadawy> or jsut content :)
Jun 25 04:32:46 <nerdboy> if you change public history it affects everyone with a clone
Jun 25 04:32:59 <ebadawy> what I did "git rebase -i HEAD~70 && git reset --soft HEAD^"
Jun 25 04:33:26 <nerdboy> that seems brutal
Jun 25 04:33:45 <ebadawy> why ? :D
Jun 25 04:33:55 <nerdboy> cleaner to revert the one commit and make new changes/new commit
Jun 25 04:34:13 <ebadawy> how to go back there then?
Jun 25 04:34:45 <nerdboy> you don't go back or change history
Jun 25 04:35:20 <nerdboy> one new commit reverts old change, second new commit fixes/extends it
Jun 25 04:35:54 <ebadawy> yea, but jkridner want me to change the commit it self
Jun 25 04:36:18 <nerdboy> the (second) new commit makes that change
Jun 25 04:36:40 <nerdboy> plus the original
Jun 25 04:36:52 <ebadawy> https://github.com/ehab93/bone101/commit/bd71f5ab6fe5089ba085823dcaee5491002cd433
Jun 25 04:37:12 <ebadawy> ^ check this comment and tell me if I get him right?
Jun 25 04:37:21 * nerdboy is still unclear on the driving requirement
Jun 25 04:38:48 <nerdboy> he does say "edit this commit"
Jun 25 04:39:32 <ebadawy> so, what I am doning meets what he want?
Jun 25 04:39:39 <nerdboy> but without clarification i would probably interpret as "make this change"
Jun 25 04:40:39 <ebadawy> ok I did a commit that do this change :) ,, https://github.com/ehab93/bone101/commit/bc0a92060b8fa5d4149c641a89622f8557c55176
Jun 25 04:40:45 <ebadawy> made*
Jun 25 04:40:55 <nerdboy> changing history is bad juju
Jun 25 04:41:43 <nerdboy> to be avoided in general without special circumstances
Jun 25 04:41:43 <ebadawy> I think what he want is a clean history
Jun 25 04:42:40 <nerdboy> then i would think about making new/"clean" branch
Jun 25 04:43:19 <ebadawy> I did it also
Jun 25 04:43:29 <nerdboy> history is data, data is valuable, i can't throw it out or mangle it without serious coercion
Jun 25 04:44:10 <ebadawy> this is a second branch ,, have cherry picked this commit from the original one
Jun 25 04:44:19 <nerdboy> as for you, i would just make sure you know what he's asking for
Jun 25 04:44:22 <ebadawy> but here comes another modifications
Jun 25 04:44:46 <ebadawy> yes
Jun 25 04:44:57 <nerdboy> because i do not
Jun 25 04:45:49 <ebadawy> jkridner: could u please review this conversation when u come?
Jun 25 04:48:38 * nerdboy takes responsibility for adding confusion
Jun 25 04:49:18 <nerdboy> sorry, i'm kinda particular about this stuff
Jun 25 04:49:57 <ebadawy> no worries, confusion is already there :)
Jun 25 04:49:57 <nerdboy> understanding requirements, using tools properly, not mangling data, etc
Jun 25 04:50:03 <nerdboy> sue me
Jun 25 04:51:10 <nerdboy> anyway, IV&V hat is permanent if you wear it long enough...
Jun 25 04:52:20 <nerdboy> few jobs are quite like calling the "emperor" naked in front of the Col. at monthly engineering reviews
Jun 25 04:53:05 <ebadawy> what is "IV&V hat" ???
Jun 25 04:54:25 <nerdboy> 20+ years of criticizing engineering/ops contractors and the govt...
Jun 25 04:55:41 <nerdboy> mostly it's always the contractor's fault but sometimes the govt let's them get away with crap for too long
Jun 25 04:55:42 <ebadawy> still don't get it ?! :)
Jun 25 04:56:59 <nerdboy> iv&v is mostly done on safety-critical stuff
Jun 25 04:57:01 <nerdboy> http://www.nasa.gov/centers/ivv/home/index.htm
Jun 25 04:58:08 <ebadawy> "404 The cosmic object you are looking for has disappeared beyond the event horizon"
Jun 25 04:58:11 <nerdboy> nasa has their somewhat idealized version, mostly we got stuck doing it after the fact
Jun 25 04:59:04 <nerdboy> i get pages...   http://www.nasa.gov/centers/ivv/about/index.html
Jun 25 05:01:51 <ebadawy>  what are u try to tell me there ,, it's 7 am and i haven't slept yet !! :D
Jun 25 05:05:32 <nerdboy> well, you got a cosmic 404 and i didn't!!  mommy!!
Jun 25 05:05:56 <ebadawy> no got it now ,, it was missing 'l' for html
Jun 25 11:58:59 * karki_ knew it was lua. Deep down I know it had to be.
Jun 25 11:59:06 <karki_> *knew
Jun 25 12:59:09 <shubhangi> Abhishek_: i'll try to get the overlay thing done
Jun 25 13:04:42 <shubhangi> Abhishek_: ping
Jun 25 13:05:43 <shubhangi> do you have a dts file which are able to compile and load using capemgr. i'll add pru to it
Jun 25 13:18:17 <Abhishek_> shubhangi: Have a look at github.com/RobertCNelson/bb.org-overlays
Jun 25 13:19:14 <shubhangi> Abhishek_: i'll am giving you the overlay
Jun 25 13:19:19 <shubhangi> Abhishek_: just a minute
Jun 25 13:20:01 * Abhishek_ has his intern project endterm presentation tomorrow
Jun 25 13:20:23 <shubhangi> best of luck
Jun 25 14:34:15 <av500> vvu: azizulhakim; btw, what was the ffmpeg question?
Jun 25 14:36:44 <azizulhakim> av500: is there any library for compressing audio video data in kernel space. ffmpeg is for user space. so can't use it in kernel space.
Jun 25 14:37:54 <av500> nope
Jun 25 14:38:35 <av500> anyway, the BBB does not really have enough CPU power to compress video
Jun 25 14:38:42 <av500> other than something like RLE
Jun 25 14:38:50 <av500> which you already do, no?
Jun 25 14:39:11 <av500> for audio, you can go mono and drop bit depth
Jun 25 14:39:37 <av500> from 16 bit stereo to e.g. 12 bit mono you get  ~2.5 reduction
Jun 25 14:40:02 <av500> if you resample down to e.g. 22khz you get another 2x
Jun 25 14:40:18 <av500> there are resample libs you can use
Jun 25 14:40:42 <av500> azizulhakim: but I would like to know what raw bandwidth you can achieve
Jun 25 14:49:07 <azizulhakim> av500: will inform you today
Jun 25 15:33:39 <nerdboy> moin
Jun 25 16:03:28 <shubhangi> Abhishek_: ping
Jun 25 16:03:33 <shubhangi> try this https://drive.google.com/file/d/0Bw03ajxXQwSoUXVfaU1RVk01RzA/view?usp=sharing
Jun 25 16:04:10 <Abhishek_> better to upload as a gist
Jun 25 16:05:02 <shubhangi> Abhishek_: https://gist.github.com/shubhi1407/1abb1c8f8334a2551a98
Jun 25 16:06:45 <shubhangi> confirm if it works
Jun 25 16:09:41 <Abhishek_> had a look, but not home yet
Jun 25 16:09:52 <shubhangi> okay
Jun 25 16:10:00 <shubhangi> compiles fine
Jun 25 16:10:50 <shubhangi> reg #address-size was an issue .. you might have faced it too i guess
Jun 25 16:11:02 <Abhishek_> the overlay should apply without errors
Jun 25 16:11:04 <shubhangi> some warning .. fixed it
Jun 25 16:11:07 <Abhishek_> yep
Jun 25 16:11:47 <Abhishek_> if you have a 4.1 tree, check arch/arm/boot/dts for device tree files related to the BBB, am335x-boneblack.dts
Jun 25 16:13:06 <shubhangi> yes, they were my reference
Jun 25 16:13:27 <shubhangi> by now i have all tress :p
Jun 25 16:13:31 <shubhangi> trees*
Jun 25 16:15:40 <Abhishek_> cool, will let you know when I check
Jun 25 16:19:08 <nerdboy> jkridner: i'm not clear on exactly what ebadawy was trying to do
Jun 25 16:19:31 <nerdboy> can you explain your actual requirement?
Jun 25 21:57:29 <jkridner> nerdboy: in respect to? his whole project or certain patches?
Jun 25 21:58:19 <jkridner> nerdboy: I'm looking for ebhadawy to create patches where it is clear what I'm merging and isn't cluttering up an already pretty cluttered code base.
Jun 25 21:59:27 <jkridner> I started pulling in some of his pre-req patches and I could probably pull in some of the more related, but I'm a bit concerned about some of the CSS changes wiping out the numbers I took straight from the board design.
Jun 25 22:01:58 <nerdboy> do you have a clean-ish branch now, or are trying to make one?
Jun 25 22:02:47 <nerdboy> i was just trying to figure out what he was trying to do...
Jun 25 22:03:16 <nerdboy> what and why
Jun 25 22:05:10 <nerdboy> mostly to avoid rewriting public history
Jun 25 22:06:11 <nerdboy> jkridner: got something i can look at to get a better clue?
Jun 25 22:07:54 <jkridner> nerdboy: not sure what is needed. I'm merging into http://github.com/jadonk/bone101/tree/master
Jun 25 22:08:17 <jkridner> I've been cherry-picking some of his patches off of https://github.com/jadonk/bone101/pull/20
Jun 25 22:08:56 <nerdboy> what was the "edit this commit" comment about then?
Jun 25 22:09:46 <jkridner> I've been asking him to rebase and squash some of his patches, including comments I've made on specific patches.
Jun 25 22:10:13 <jkridner> some of my comments were against patches he's recreated now (so don't show the comments anymore unless you go to his gh-pages branch).
Jun 25 22:11:13 <jkridner> are you seeing that some of my comments are unclear?
Jun 25 22:11:27 * jkridner has to run to a meet-up at the local hackerspace.
Jun 25 22:12:14 <nerdboy> mostly i was unclear on what he was doing
Jun 25 22:12:52 <nerdboy> let me know (later) if you'd like me to butt in more, er, help...
**** ENDING LOGGING AT Fri Jun 26 02:59:58 2015