**** BEGIN LOGGING AT Wed Jun 29 02:59:58 2016 Jun 29 05:25:16 Hmmm Jun 29 14:40:40 alexhiam: when is the meeting? Jun 29 14:43:32 kiran4399: 1hr 20min Jun 29 14:46:34 hi amragaey Jun 29 14:47:08 amragaey: selecting pins still doesn't work. do you expect it to yet? Jun 29 14:47:57 amragaey: I also can't highlight pwms Jun 29 14:48:11 amragaey: what phase in the functionality are you currently working? Jun 29 14:48:21 * jkridner is examining http://amragaey.github.io/bone101/Support/bone101/UI/ for progress Jun 29 14:54:07 hi jkridner Jun 29 14:54:26 yes, I'm drawing each component "onoff, bar, wires.." now separately, then I'll go with selectPin and pinSelected events, the events will use components after that Jun 29 14:55:47 jkridner, I'm fixing highlighted pins now, so when you drag the led button for example, the pins will kept highlighted till you choose one pin Jun 29 14:56:46 Visaoni: any new code to push? Would love to see the userspace stuff starting to come together, just using fake data as we discussed Jun 29 14:56:53 jkridner, How can't you highlight pwms ? Jun 29 14:57:14 same way you highlight the other pins. Jun 29 14:57:57 amragaey: look for pwm attribute to be set and true: https://github.com/jadonk/bone101/blob/gh-pages/Support/bone101/UI/bbui.js#L476 Jun 29 14:58:33 looks like I already tried to have some code for this: https://github.com/jadonk/bone101/blob/gh-pages/Support/bone101/UI/bbui.js#L775 Jun 29 15:00:22 jkridner, have a look at this : http://i.imgur.com/Chec8nn.png Jun 29 15:00:30 amragaey: seems my struggle is I can't even highlight the PWM button. Jun 29 15:00:48 I can't highlight the button even. Jun 29 15:01:04 jkridner, in the dropdown menu :O ? Jun 29 15:01:15 that is, the dropdown menu disappears Jun 29 15:01:22 jkridner, amragaey: same here, on firefox Jun 29 15:01:23 but, I can see the PWM pins. Jun 29 15:01:39 and chrome Jun 29 15:01:48 of course chrome Jun 29 15:01:54 ouch! Jun 29 15:02:31 I didn't change any code in this part Jun 29 15:02:53 https://www.flickr.com/photos/jadon/shares/b0LAVZ Jun 29 15:03:05 https://www.flickr.com/photos/jadon/shares/b0LAVZ Jun 29 15:03:59 https://flic.kr/p/JcRSG1 Jun 29 15:04:04 there's a preview! Jun 29 15:04:35 ohhh, I can get to it if I keep my mouse on the far right of the button Jun 29 15:04:56 almost to the edge Jun 29 15:04:58 yes, I see. this was an old issue Jun 29 15:05:06 alexhiam: that seems to work for me too. Jun 29 15:05:27 amragaey: k. fix it or add it to the issue tracker to fix later. Jun 29 15:05:54 jkridner, ok will see it Jun 29 15:06:25 jkridner, can you drag pwm button from dropdown menu easily ? Jun 29 15:06:32 amragaey: what should be working? are you breaking down the commits in smaller chunks so I can merge? Jun 29 15:06:33 the buttons also get stuck to my mouse on firefox... Jun 29 15:06:56 amragaey: all of the "select a pin" functions are broken. Jun 29 15:07:13 amragaey: I can drag the button down... I wouldn't say "easily". Jun 29 15:07:37 jkridner, the past commits were smaller and related Jun 29 15:07:39 amragaey: but, I can't finish making any probes currently as none of the "select a pin" operations work... the highlighting goes away for me. Jun 29 15:08:20 amragaey: I've tried to point out specific places where the commits had multiple things going on making it difficult to review. Jun 29 15:08:25 alexhiam: have you looked at the commits? Jun 29 15:08:42 yes, I know this I fixed it now and will commit it shortly. Jun 29 15:09:13 * alexhiam looks at commit history.. Jun 29 15:09:22 amragaey: it seems like the "select a pin" function should be completed before adding things like the on/off and slider items to the probes. Jun 29 15:09:27 could you provide links for commits you see, jkridner ? Jun 29 15:09:36 https://github.com/amragaey/bone101/commits/gh-pages Jun 29 15:10:08 seems like the slider is the source of some issues atm: bbui.js:1536 Uncaught TypeError: e.ui.probe.sliderTest is not a function Jun 29 15:10:24 I started make smaller commits on June27 Jun 29 15:10:31 specifically https://github.com/amragaey/bone101/commit/ea518b81db8a057b3ede8cd3be9d6599e545ad1e is difficult to review. Jun 29 15:10:41 alexhiam: ah! Jun 29 15:11:16 amragaey: k... I might want you to go back and break https://github.com/amragaey/bone101/commit/ea518b81db8a057b3ede8cd3be9d6599e545ad1e into smaller commits, unless I can get a good review from someone like alexhaim. Jun 29 15:11:17 jkridner, yes this was the commit of last week! I took your advice after that about smaller commits Jun 29 15:11:33 yeah, adding new stuff in the same commit as other changes is no good Jun 29 15:12:13 How can I break a commit that is already pushed ? Jun 29 15:12:17 amragaey: k.... guess you might need someone to show you how to break up an older commit. Jun 29 15:12:33 google: http://stackoverflow.com/questions/6217156/break-a-previous-commit-into-multiple-commits Jun 29 15:12:47 the last handful of commits all look to be adding new functionality, but what's there now isn't quite working. I'd really like to see nothing new added until the core stuff that's already there is working Jun 29 15:13:16 it's already pushed to github though.. can you still rebase jkridner? Jun 29 15:13:41 alexhiam: yes, but it might need to be on a new branch at first. Jun 29 15:14:06 yeah, I don't think it'll accept the changed history on the same branch Jun 29 15:14:08 alexhiam: to push the update to github on the gh-pages branch, you'd need to do 'git push -f', which is naturally dangerous. Jun 29 15:14:19 alexhiam: it will accept 'git push -f' Jun 29 15:14:25 alexhiam, I added functionalities for some components but you wouldn't see it working now until I finish another part after it Jun 29 15:14:38 alexhiam: but, the warning is there for a reason, since you are rewriting history. Jun 29 15:16:17 I would do something in my local tree like 'git checkout -b gh-pages-old; git push origin gh-pages-old; git checkout -b my-rebase' to create an extra backup. Jun 29 15:17:00 what do rebase do ? Jun 29 15:17:10 when I completed the rebase, I would do the VERY DANGEROUS 'git push -f origin my-rebase:gh-pages' Jun 29 15:17:33 '$ man git rebase' Jun 29 15:18:03 jkridner: is that a merge and push in one? Jun 29 15:18:25 rebase takes all the patches that you made against some old point in your history and lets you reapply them, potentially modifying them as you step through each of them. Jun 29 15:19:29 alexhiam: no.... all merges are done locally. 'git push -f origin my-rebase:gh-pages' is simply forcing the 'gh-pages' branch on github to now point to the same revision history as your local 'my-rebase' branch. Jun 29 15:19:54 ah Jun 29 15:19:57 next time you do a 'git checkout gh-pages; git pull', you'll likely get some errors, since the history was rewritten. Jun 29 15:20:51 so, you'd do something like 'git checkout gh-pages; git branch -m gh-pages-old-local; git checkout gh-pages' to try to get in sync with the new rebased branch. Jun 29 15:21:55 or just 'git checkout my-rebase; git branch -d gh-pages; git checkout gh-pages' Jun 29 15:22:01 so, -f can be very dangerous if you don't know what you are doing, because you are throwing away information. Jun 29 15:22:15 alexhiam: yeah, but I always prefer moving stuff to deleting it. Jun 29 15:22:23 fair enough Jun 29 15:22:52 amragaey: are you following? Jun 29 15:23:29 do I have to do this rebase also ? Jun 29 15:23:59 amragaey: I am just currently blocked on accepting that one patch... it is too big for me to wrap my head around without doing a lot of work. Jun 29 15:24:43 amragaey: if alexhiam or others can review it, I can accept it. I've just seen too many bugs to want to blindly accept patches when the goal is to make this BBUI code more editable/readable. Jun 29 15:25:35 I want to be able to look back in the history and see where something started going wrong. Jun 29 15:25:44 could you mention bugs please? Jun 29 15:26:31 yes I know, but this long patch doesn't have something wrong. Jun 29 15:44:54 amragaey: what's the new stuff in that commit do? Jun 29 15:59:01 alexhiam, you can find some old fixes, and new functions. function like pin.test() test every pin you click/hover or whatever. probe.push() is used to push each new probe to probes array. Jun 29 15:59:37 Visaoni: fyi you need to actually say "Copyright" in your file headers, the (c) symbol doesn't actually have any legal meaning Jun 29 15:59:48 alexhiam, probe.cleardrage() is written to clear the effect of drawn button after dragging. Jun 29 16:00:40 alexhiam, probe.selectText for rendering text "select pin .. " Jun 29 16:01:21 OK, meeting time! Jun 29 16:01:28 alexhiam, probe.test() to test each probe I hover/click. Jun 29 16:01:36 ok Jun 29 16:01:49 1) WHO'S HERE? Jun 29 16:02:06 students, say something Jun 29 16:02:21 hi, I'm Jun 29 16:02:36 I am here Jun 29 16:02:41 Am I late? Jun 29 16:02:53 nope Jun 29 16:03:02 only 2 students?? Jun 29 16:03:28 amragaey: you were just here.... Jun 29 16:03:35 yes Jun 29 16:03:42 that's 3.... Jun 29 16:03:54 4, hi Jun 29 16:04:42 kiran4399? Visaoni? Jun 29 16:04:45 wake up! Jun 29 16:05:07 Hi!! Jun 29 16:05:10 alexhiam: Jun 29 16:05:15 5.. Jun 29 16:05:21 :/ Jun 29 16:05:57 here Jun 29 16:06:08 cool Jun 29 16:06:17 anyone heard from henrix? Jun 29 16:06:24 alhexhiam: I copied TI on the (C) thing actually, heh Jun 29 16:06:40 wow, good work TI! Jun 29 16:07:03 2) MIDTERMS Jun 29 16:07:16 well done everyone Jun 29 16:07:46 :) Jun 29 16:08:10 Thanks alexhiam . Jun 29 16:08:11 thank you Jun 29 16:08:20 Thanks to all the mentors :) Jun 29 16:08:47 thx m_w Jun 29 16:08:49 I think everyone got some feedback from their midterm eval, anyone have any questions about that? Everyone know where they need to pick up the pace? ;) Jun 29 16:09:22 pmezydlo: ZeekHuge: no problem Jun 29 16:09:31 mine was regarding commits . Jun 29 16:09:49 alexhiam: so should go ahead now or after the meeting ? Jun 29 16:10:09 ZeekHuge: go ahead with what? Jun 29 16:10:25 mine too was about testing code before committing. Jun 29 16:10:31 questions regarding the feedback Jun 29 16:10:40 oh, yeah, ask away Jun 29 16:10:42 it was a good motivation Jun 29 16:11:31 hmmm Jun 29 16:11:55 okay, so m_w : Abhishek_ : its about commits. Jun 29 16:12:15 I remember that i used to add a full single example Jun 29 16:12:21 and then commit it Jun 29 16:12:32 ds2: good motivation for further work Jun 29 16:12:57 After feedback from m_w , I started committing single files separately. Jun 29 16:13:11 so, does it look okay now ? Jun 29 16:13:18 it is better Jun 29 16:13:37 okay. Jun 29 16:13:44 commits should be relatively atomic Jun 29 16:13:52 I think I was doing the same as ZeekHuge, and now learned to add smaller commits Jun 29 16:14:01 each commit should do a particular thing Jun 29 16:14:16 and be properly signed off and explained Jun 29 16:14:16 keep related changes together if there's a dependency Jun 29 16:14:47 I was too commiting the same mistake but bradfa corrected me. One commit for one major change. Jun 29 16:14:47 just imagine yourself having to go back and find where a bug was introduced in last years commit history Jun 29 16:14:57 thank about backing it out and not leaving it fubar'd Jun 29 16:15:25 *think even Jun 29 16:15:47 ok, let's move on... Jun 29 16:16:00 3) ISSUES Jun 29 16:16:00 hmm, okay. So commits should be with respect to a functionality or feature and not the file. Jun 29 16:16:05 in other words, "can i revert this change without impacting other stuff?" Jun 29 16:16:16 anyone blocked right now? Jun 29 16:16:25 okay. Got it. Jun 29 16:17:15 ok well Jun 29 16:17:15 anyone stuck on something? Jun 29 16:17:25 alexhiam, bradfa I am currently unable to remove all errors from the char driver I have written. But I should be able to in a day Jun 29 16:17:32 or two. Jun 29 16:17:56 chanakya_vc: ok, keep at it, if you need specific help, please speak up Jun 29 16:18:10 after the meeting Jun 29 16:18:13 * alexhiam looks through the progress reports... Jun 29 16:18:19 okay bradfa .I will Jun 29 16:18:20 not stuck, but kind of slow crawling .. Jun 29 16:18:34 ZeekHuge: focus Jun 29 16:18:37 chanakya_vc: build/compile or runtime? Jun 29 16:18:44 Visaoni: you mentioned some issues with rpmsg, are you blocked at all? Jun 29 16:18:55 ds2 compile Jun 29 16:19:10 m_w: .. okay. Jun 29 16:19:16 alexhiam: No, I have a coupld ways forward. Checking into the possibility it isn't rpmsg Jun 29 16:19:24 Even I feel I am slow with my progress like ZeekHuge said. Jun 29 16:19:48 I was able to build up a simple example with rpmsg into something functional, so looking into it not being rpmsg Jun 29 16:20:04 Visaoni: ok, be sure to keep notes on what you're doing if you're debugging (e.g. on a github wiki page) and keep us in the loop here Jun 29 16:20:22 you guys should make daily task lists Jun 29 16:20:24 chanakya_vc: everything in engineering takes longer in the real world than you expect :) Jun 29 16:20:25 alright Jun 29 16:20:36 Visaoni: is that rpmsg code on github? Jun 29 16:20:42 push all code! Jun 29 16:20:49 m_w's suggestion to make a list of tasks can be very helpful Jun 29 16:20:55 this will help keep you on track Jun 29 16:21:00 yeah. Jun 29 16:21:11 okay. Jun 29 16:21:12 yes, and the github issue tracker is a great place for a task list! Jun 29 16:21:21 alexhiam: no, it isn't. I was expecting it to be a little throwaway that'd show me where I'd gone wrong with rpmsg Jun 29 16:21:21 certainly Jun 29 16:21:35 bradfa, Yes . I have learnt that. I mean I just miscalculated the time I would take to undertake these tasks : ) Jun 29 16:21:52 Jun 29 16:22:02 do we need to explain wip branch again? Jun 29 16:22:08 m_w, That is a very nice suggestion. I will do that. Jun 29 16:22:08 Visaoni: stick it on a wiki page, we want to see everything, esp. when it relates to figuring out PRU stuff Jun 29 16:22:31 * Visaoni has had bad experiences with branchs-as-repos that contain totally separate stuff Jun 29 16:23:00 like that damned gh-pages thing... great way to screw git up Jun 29 16:23:17 amragaey: you listed a couple issues in your report, are you blocked at all? Jun 29 16:23:18 * amragaey is lost here Jun 29 16:23:26 ruh roh Jun 29 16:23:37 not so bad, just shows up as divering/stale Jun 29 16:24:12 1) keep/push experimental/wip branches Jun 29 16:24:30 just create topic branches for features in progress Jun 29 16:24:31 2) it's not much code yet, no reason to worry Jun 29 16:24:46 alexhiam, I mentioned one issue in BBUI and it's fixed now will be pushed today. Jun 29 16:24:55 cool Jun 29 16:24:57 3) you can cleanup stale/old/wip stuff laster Jun 29 16:25:04 *later even Jun 29 16:25:20 4) use sensible branch names Jun 29 16:25:28 by "bad" I mean cases where I have to do some work (and research) to get git into a usable state Jun 29 16:25:32 pmezydlo: you have a couple issues in your report - you blocked at all? Jun 29 16:26:33 people always find new/interesting ways to hork up a git repo Jun 29 16:26:58 just ask for help if you need to, We Can Fix It For You... Jun 29 16:27:18 ok, if no more blocking issues to discuss... Jun 29 16:27:32 hi all, sorry, late Jun 29 16:27:34 should probably be a job title Jun 29 16:27:36 4) Project reports Jun 29 16:27:40 alexhiam: no it's ok, I had little time Jun 29 16:27:48 who talked about their projects first?? Jun 29 16:27:54 Senior Unhorker of Developer Repos Jun 29 16:27:59 we're back to the beginning Jun 29 16:28:14 pmezydlo maybe? Jun 29 16:28:19 * alexhiam can't remember... Jun 29 16:28:33 I do not have too much information Jun 29 16:28:46 maybe someone else Jun 29 16:29:21 I'd like to keep the same order... did you go first? Jun 29 16:29:32 if possible I would prefer for week Jun 29 16:29:49 ok, who else presented the first week? Jun 29 16:29:57 yeah I was first Jun 29 16:30:12 ZeekHuge maybe? Jun 29 16:30:31 henrix went first Jun 29 16:30:35 week Jun 29 16:30:39 ah... Jun 29 16:30:41 voluteers? Jun 29 16:30:52 volunteers Jun 29 16:30:55 quick, take one step back Jun 29 16:31:01 well, we need 2 people to talk about their projects! Jun 29 16:31:33 no volunteers means I choose :P Jun 29 16:31:51 ok I'll go for it Jun 29 16:31:57 10 sec bob... Jun 29 16:32:02 great Jun 29 16:32:05 and one more? Jun 29 16:32:56 geez, just like a real classroom... Jun 29 16:33:03 ok, alphabetical then! amragaey and chanakya_vc Jun 29 16:33:11 amragaey: go for it Jun 29 16:33:20 alexhiam, No :P Jun 29 16:33:37 Okay I will do it if you insist. Jun 29 16:33:46 we do Jun 29 16:34:00 ok, I'll try :D Jun 29 16:34:19 hi all Jun 29 16:34:54 I'm still working on BBUI, the first phase as you know Jun 29 16:36:08 the past week I added new functions, some were like the old implementation and some were new due to the new structure. Jun 29 16:37:37 in the UI object, we have some variable for different UI parts like pin, probe, graph,loop. Jun 29 16:38:46 functions added in that long commit, as jkridner and alexhiam seen :D were as follows Jun 29 16:39:20 pin.test() to test any pin in BB. Jun 29 16:39:20 probe.push() to push new probes in probes array in probe object, so I can access them later in need. Jun 29 16:39:20 probe.clearDrag() to remove the duplicate of inserted button after dragging it to the graph. Jun 29 16:39:20 probe.selectText() to advise the user to select the appropriate pin for current probe. Jun 29 16:39:20 probe.test() to test inserted probes in the graph. Jun 29 16:39:20 loop.clearProbe() to clear Probe if the user doesn't select a connection pin. Jun 29 16:39:22 loop.clearBB() to clear BB Active canvas, as to not draw over highlighted pins another time. Jun 29 16:40:34 after this commit the user was able to drag a button to the graph and see an alert text to choose the pin, and on hovering over probes he gets the corresponding highlighted pins on BB. If he doesn't select a pin the probe is removed. Jun 29 16:40:44 amragaey: did you need to cover the high-level first as to what you are doing for BBUI? Jun 29 16:41:32 define UI/Event/etc. and button/probe/pin/graph/etc. Jun 29 16:41:35 ? Jun 29 16:42:03 jkridner, yes I defined them in the previous project report Jun 29 16:42:14 Do I have to do it again ? Jun 29 16:42:57 no problem Jun 29 16:43:23 amragaey: just a few words on the high level goals are for enhancing BBUI for those that don't follow it daily Jun 29 16:43:54 ok Jun 29 16:44:48 The UI object is one of four main objects which is responsible for the actual drawing in canvas, is defined in the current structure. Jun 29 16:46:21 there's also Canvas, which is responsible for drawing a separate canvas for different layers in BBUI like Base,BTN,Active, LEDs and Bar Jun 29 16:48:22 Events object is responsible for listening to events, it contain functions for events like 'selectPin' , 'pinSelected', 'click down digital', 'zooming' .. etc. So when user do some action there would be an event function executing. Jun 29 16:49:15 Hardware object the last one, is responsible for bonescript calls. Jun 29 16:50:01 amragaey: so it sounds like you've made a number of the planned changes to clean up BBUI, is it mostly just debugging to do at this point? Jun 29 16:51:43 alexhiam, yes jkridner wrote the base structure for all these objects and made good progress with some UI elemnts and Events. also the Canvas object were done. Jun 29 16:52:51 I'm filling the missing components, fixing positions and dimensions. following the new structure to add new stuff. Jun 29 16:52:51 so for somebody with cursory knowledge of bone101/bbui....are probes defined to only to show an analog voltage or are they contextually aware of a pin's usage to show a logic state as well? Jun 29 16:53:35 for nonGPIO functions, that could be interesting ;) Jun 29 16:53:43 }:-) Jun 29 16:54:18 ds2, I did mention context ;) Jun 29 16:54:28 probe is defined as the current active button in canvas Jun 29 16:55:18 we use it define connection to voltage pins Jun 29 16:56:09 oops, we should move on! Jun 29 16:56:13 thanks amragaey Jun 29 16:56:13 ok Jun 29 16:56:29 chanakya_vc: few minutes left, go for it Jun 29 16:56:30 is this enough, alexhiam ? Jun 29 16:56:48 Namastey everyone! Jun 29 16:57:25 Since my last report, I have written the firmware Jun 29 16:57:42 to communicate with the 12kb shared RAM between the PRU's Jun 29 16:58:17 And also written a char driver to test this firmware by sending in data from the userland. Jun 29 16:58:48 The char driver basically uses ioremap Jun 29 16:59:00 To allocate memory in the shared RAM Jun 29 16:59:39 Sends in data to this memory location and then this data is picked up by the firmware and bitbanged. Jun 29 17:00:39 chanakya_vc: when will you get to the kernel interfaces part? Jun 29 17:00:50 I am currently facing problems with some compilation errors in the driver., which I guess I will be able to sort out pretty soon. Jun 29 17:00:54 i.e. implement a tty device or a spi master or i2c master etc Jun 29 17:01:08 ds2, I am working on that simulataneously. Jun 29 17:01:17 do throw it out on the channel if you need help (after mtg) Jun 29 17:01:57 It's just that I first wanted to get my fimware right and bradfa suggested that it would be a good idea to start with a char driver Jun 29 17:02:32 SPI is taking me a lot of time but I am hoping that once I am done with this, I2C won't take me much time. Jun 29 17:03:16 As then it will just be a question of repeating everything that I did for SPI and do it for I2C. Jun 29 17:04:25 I am currently reading up on the SPI kernel interfaces but I will put my foot firmly in it once I am sure about the firmware.And I am going to do it before the end of this week. Jun 29 17:05:53 That's all I have to say alexhiam . I have been communicating my problems to the mentors and will hopefully come up with a solution to the char driver pretty soon. Jun 29 17:06:10 ok, thanks chanakya_vc! Jun 29 17:06:26 I am sorry my report was pretty short. Jun 29 17:06:39 no prob Jun 29 17:06:57 ok, meeting adjourned Jun 29 17:07:21 questions anyone? Jun 29 17:07:49 nope. Jun 29 17:07:58 * chanakya_vc got to have dinner but will be back in a jiffy. Jun 29 17:08:06 how much wood can a woodchuck chuck if a wood chuck could chuck wood? Jun 29 17:08:08 :D Jun 29 17:08:59 I think I need to burn the mid night oil now. Seems to me that everyone is much further in their projects than me. bradfa ds2 Jun 29 17:09:01 woodchucks don't chuck wood, they keep it Jun 29 17:09:45 chanakya_vc: don't worry about others, just focus on your tasks Jun 29 17:10:18 I will just be back bradfa . Are you free today? Jun 29 17:10:39 chanakya_vc: I'm around, just mention me and I'll get back to you as soon as I can Jun 29 17:11:07 Okay bradfa . I will try my best to fix that char driver today. Jun 29 17:11:28 * chanakya_vc goes afk Jun 29 17:46:15 chanakya_vc: I'm also around today Jun 29 18:47:17 Visaoni: what are you working on today and is your green working okay? Jun 29 18:54:20 nerdboy, Visaoni: I think the working example rpmsg should be pushed into an example dir of an experimental branch, for one thing, plus quick comments contrasting in what way the example works and the real code doesn't Jun 29 18:59:10 i think i asked for that... Jun 29 19:00:00 push the code! mentors get the heebie-jeebies when they don't see commits Jun 29 19:00:10 * nerdboy looks sideways at alexhiam Jun 29 19:00:40 I think you did too Jun 29 19:01:19 you don't want to see the rash... Jun 29 19:01:49 I only added a specific request to contrast how this works vs how that fails, since some forget that part Jun 29 19:02:57 but it's always a good policy to give reviewers good context on the part you want them to review Jun 29 19:04:13 Visaoni it's also a good policy to start looking at "throwaway code" as "experimental branches" instead Jun 29 19:04:41 (in general not just this rpmsg case) Jun 29 19:09:06 so let's review then... Jun 29 19:10:34 1) committing new work on a separate wrk/tmp branch lets you track changes, roll back, and use the tools/not waste time Jun 29 19:11:42 something works, commit, change it, oops, checkout previous version of file, do it better... Jun 29 19:13:49 2) pushing the wrk/tmp branch gives *you* a backup, lets *us* help you better, stops the sad faces when we don't see anything new Jun 29 19:14:23 * Wormo cheers nerdboy on from the sidelines Jun 29 19:16:06 find a problem, make a small fix, make a commit with a relevant comment before you move on Jun 29 19:16:43 and don't forget to push the fix Jun 29 19:17:02 * Wormo notes that ssh agent makes this easy Jun 29 19:17:20 not having to type password or passphrase all the time Jun 29 19:19:06 that plus keychain Jun 29 19:27:57 3) do what alexhiam mentioned, enable and use the issue tracker for tasks/features/problems Jun 29 19:28:45 make an issue, give it meaningful title/description, give a label or two, assign it to yourself Jun 29 19:29:37 add issues to milestones, do some work (commit *and* push) and test it Jun 29 19:30:35 all that activity gets recorded, you can generate a nice changelog from it Jun 29 19:31:54 https://github.com/sarnold/medians-1D/blob/master/CHANGELOG.md Jun 29 19:32:46 use the tools and get bonus points Jun 29 20:49:39 wow, maybe git log could make a good start for status bullets... Jun 29 20:51:05 https://wiki.gentoo.org/wiki/Gentoo_git_workflow#Example <= note you can have a concise oneliner with more description Jun 29 20:51:42 just don't use -m"update foo" Jun 29 21:14:42 next year we need pre-commit hooks... Jun 29 21:15:24 or maybe a repoman wrapper thing Jun 30 02:42:29 Visaoni: nothing says a branch has to merge back to anything... Jun 30 02:43:58 that kind of branch can be deleted later, as long as anything useful is captured somewhere (comments, readme, wiki) Jun 30 02:45:28 I know, but it's rather hard to work between two files that exist soley on separate branches. and as I've said... that kind of repo-as-branch thing tends to cause git more than a few problems Jun 30 02:46:04 i don't understand the gh-pages thing Jun 30 02:47:37 if you need to work on same file(s) in both branches then checkout -- path/to/file is probably what you want Jun 30 02:47:56 do that when needed Jun 30 02:48:30 it's the same kind of deal. a repo masquerading as a branch. screwing with that stuff locally has resulted in me having to obliterate repos before Jun 30 02:48:57 then you weren't doing it "right" Jun 30 02:49:07 whatever that is... Jun 30 02:49:26 * Visaoni wasn't doing anything usual... checkout-modify-commit... Jun 30 02:49:32 *unusual, even Jun 30 02:49:34 yes you need to be careful, but then it's flexible and easy to fix/work around Jun 30 02:49:39 *easy-ish Jun 30 02:51:26 https://github.com/VCTLabs/vct-beagleboard-bsp-platform <= isn't this exactly that form of abuse? Jun 30 02:51:40 every branch is different and none of them merge Jun 30 02:52:15 when i make the "same" change across multiple branches i do just what i said Jun 30 02:52:46 make a change, commit, switch branch, checkout file, make small change, commit Jun 30 02:53:27 *checkout file from previous branch Jun 30 02:54:07 not exactly, no. the same things exist on the different branches Jun 30 02:54:15 some branches are similar but not identical Jun 30 02:55:00 you just need to know which branch you're on before you do git blah Jun 30 02:55:26 and git blah usually has git blah --abort now Jun 30 02:55:46 *for merge/rebase/etc Jun 30 02:57:11 do you use the git bash stuff? Jun 30 02:57:31 especially the branch name in your prompt Jun 30 02:57:43 I don't, no Jun 30 02:58:00 plus completion Jun 30 02:58:02 I'll take a look at it Jun 30 02:58:14 the promtp is very handy... Jun 30 02:59:47 I can give it another shot if you really insist, but I don't see any benefits to it - just massive overhead increase to trying anything **** ENDING LOGGING AT Thu Jun 30 02:59:58 2016