[08:35:16 CDT(-0500)] <Justin_o> anastasiac: did you get a chance to look at the "Contributing Code" page during the doc sprint? If not, I can do it this morning
[08:35:43 CDT(-0500)] <anastasiac> Justin_o, no, I'm sorry - I started, and then was interrupted
[08:36:09 CDT(-0500)] <Justin_o> anastasiac: np... i'll try to get it done this morning..
[08:36:16 CDT(-0500)] <anastasiac> thanks
[09:50:57 CDT(-0500)] <heidi_> hey Justin_o i'm checking out clearfix stuff again this morning. in the css, the links for old clearfix and new clear fix are the same. it looks like new clear fix was taken from it, what about old ?
[09:51:59 CDT(-0500)] <Justin_o> heidi_: yes... they are from the same page, the old one is at the top of the page, the new one is at the bottom
[09:52:10 CDT(-0500)] <heidi_> ok
[09:52:39 CDT(-0500)] <heidi_> i think it's from position is everything
[10:06:46 CDT(-0500)] <greggy> colinclark: It looks like you need to re-register as a project admin for GSoC
[10:17:50 CDT(-0500)] <colinclark> greggy: Thanks for letting me know.
[10:17:52 CDT(-0500)] <colinclark> I wonder what happened?
[10:20:55 CDT(-0500)] <greggy> the mentor/admin tool got reset
[10:21:42 CDT(-0500)] <greggy> though interestingly it did not delete silvia. she's just a menotr though
[11:39:44 CDT(-0500)] <Justin_o> anastasiac: I think I have the http://wiki.fluidproject.org/display/fluid/Contributing+Code page done
[11:40:14 CDT(-0500)] <Justin_o> I'm wondering if we should think about refering to committers as something else, now that we're using git. Not sure what yet though..
[11:40:15 CDT(-0500)] <anastasiac> Justin_o, that's great, thanks
[11:40:42 CDT(-0500)] <anastasiac> hm, good point. "pushers" might not be appropriate
[11:40:58 CDT(-0500)] <Justin_o>
[11:41:05 CDT(-0500)] <Justin_o> yes.. i think you're right
[11:43:02 CDT(-0500)] <Justin_o> heidi_: how's it going with the clearfix stuff
[11:44:01 CDT(-0500)] <heidi_> Justin_o i might need to read yr git page for making a patch. added new tests and now making the pros/cons list for each solution
[11:44:37 CDT(-0500)] <Justin_o> heidi_: cool, there's some info on making a patch on this page http://wiki.fluidproject.org/display/fluid/Contributing+Code
[11:44:58 CDT(-0500)] <heidi_> Justin_o is that the best way to submit my changes? or can i send a pull request or?
[11:46:23 CDT(-0500)] <Justin_o> heidi_: i think you can only send a pull request to the repo you forked
[11:46:27 CDT(-0500)] <Justin_o> so in this case it would be the project repo
[11:46:33 CDT(-0500)] <heidi_> ah
[11:46:55 CDT(-0500)] <heidi_> Justin_o i could add a 4023 branch to my repo i guess?
[12:03:25 CDT(-0500)] <Justin_o> heidi_: you could do that, and i could just merge in your changes to mine then push them up to my fork
[12:03:43 CDT(-0500)] <heidi_> ok
[12:09:03 CDT(-0500)] <cindyli> Justin_o: anastasiac: done with "Image Gallery QA Test Plan". should it be linked in somewhere, say, a child of another page, or left there up to the search tool to locate it?
[12:20:41 CDT(-0500)] <Justin_o> cindyli: we should probably merge it into the current uploader qa test plan
[12:21:07 CDT(-0500)] <Justin_o> heidi_: interesting.. in your version of the clearfix test page, the jquery ui one no longer seems to work
[12:22:07 CDT(-0500)] <cindyli> Justin_o: so, link in as a child of current uploader test plan?
[12:23:54 CDT(-0500)] <Justin_o> cindyli: That's probably a good start.. i think in the end it should just be one page though
[12:23:57 CDT(-0500)] <Justin_o> if possible
[12:24:14 CDT(-0500)] <cindyli> Justin_o: ok. thx
[12:24:52 CDT(-0500)] <heidi_> Justin_o works for me. what browser you in?
[12:28:00 CDT(-0500)] <Justin_o> heidi_: safari
[12:29:06 CDT(-0500)] <Justin_o> heidi_: i'm having the same problem with FF4
[12:29:27 CDT(-0500)] <Justin_o> i wonder if it's not referencing jquery properly or something
[12:31:09 CDT(-0500)] <heidi_> Justin_o it's working fine in mine - i wonder what's up
[12:31:27 CDT(-0500)] <Justin_o> heidi_: me too
[12:31:30 CDT(-0500)] <heidi_> Justin_o OH
[12:31:44 CDT(-0500)] <heidi_> jquery ui was added right, i didn't commit that
[12:32:27 CDT(-0500)] <heidi_> i'll add that dir now
[12:32:50 CDT(-0500)] <Justin_o> heidi_: oh.. you didn't create your branch from mine?
[12:33:17 CDT(-0500)] <heidi_> Justin_o i copied my work from your clone to mine
[12:33:37 CDT(-0500)] <Justin_o> heidi_: oh i see
[12:34:30 CDT(-0500)] <Justin_o> it will be interesting to see how git tries to handle that...
[12:35:52 CDT(-0500)] <Justin_o> heidi_: let me know when you've added the jquery directory in
[12:35:56 CDT(-0500)] <heidi_> Justin_o it's up
[12:36:00 CDT(-0500)] <Justin_o> and i'll try to pull it down and merg
[12:36:00 CDT(-0500)] <Justin_o> ah thanks
[12:36:04 CDT(-0500)] <heidi_> what should i have done instead of copying?
[12:36:13 CDT(-0500)] <Justin_o> hmm..
[12:36:45 CDT(-0500)] <Justin_o> heidi_: so what i'm doing with yours is setting up a new remote to your repo
[12:37:08 CDT(-0500)] <heidi_> ah
[12:37:09 CDT(-0500)] <heidi_> and?
[12:37:33 CDT(-0500)] <Justin_o> which i can fetch in your updates from.. for your FLUID-4150 branch i have a branch called heidi-FLUID-4150
[12:37:56 CDT(-0500)] <Justin_o> it's easier to keep things up-to-date this way
[12:38:05 CDT(-0500)] <Justin_o> since i can just fetch and merge when you update
[12:39:22 CDT(-0500)] <Justin_o> heidi_: okay.. so it's working.. now i'll try to merge it with mine
[12:40:22 CDT(-0500)] <heidi_> Justin_o that makes sense. i'll do that next time
[12:41:05 CDT(-0500)] <Justin_o> heidi_: merge conflicts
[12:41:36 CDT(-0500)] <heidi_> Justin_o because i copied stuff?
[12:41:45 CDT(-0500)] <Justin_o> I figured that would happen though...
[12:41:48 CDT(-0500)] <Justin_o> yes.. i think so
[12:41:57 CDT(-0500)] <Justin_o> so we technically have changes to the same lines
[12:42:01 CDT(-0500)] <Justin_o> i guess
[12:42:03 CDT(-0500)] <heidi_> ah i see
[12:42:05 CDT(-0500)] <heidi_> hm
[12:42:26 CDT(-0500)] <heidi_> how do two ppl work on a jira together!
[12:42:30 CDT(-0500)] <heidi_>
[12:42:36 CDT(-0500)] <Justin_o> anyways.. i'll try to add it as a patch or play around with rebase.. but it means that you probably won't be able to merge it back into your branch
[12:42:42 CDT(-0500)] <heidi_> hm
[12:42:44 CDT(-0500)] <Justin_o> heidi_:
[12:42:55 CDT(-0500)] <Justin_o> well i think you just have to treat one of the repos as the master
[12:43:00 CDT(-0500)] <heidi_> Justin_o what's the best way to do this cos it seems like it will be very common?
[12:43:31 CDT(-0500)] <Justin_o> heidi_: so i think you can just work like you would with the main repo
[12:43:33 CDT(-0500)] <heidi_> Justin_o not sure what that means in practice - set it up the way you described above? set your hub as another remote?
[12:43:47 CDT(-0500)] <Justin_o> yep you can do that
[12:43:52 CDT(-0500)] <Justin_o> i think that's the best way
[12:44:00 CDT(-0500)] <heidi_> Justin_o that would solve merge probs?
[12:44:21 CDT(-0500)] <Justin_o> heidi_: yep... because your branches are basically identical
[12:44:49 CDT(-0500)] <Justin_o> at least starting off from the same spot.. so it's like working in a fork of the project repo and getting your changes back into the project repo
[12:44:53 CDT(-0500)] <Justin_o> did that make sense?
[12:45:07 CDT(-0500)] <heidi_> sort of...
[12:45:19 CDT(-0500)] <heidi_> so should i do that now or are you doing something on your end to fix it?
[12:45:49 CDT(-0500)] <Justin_o> heidi_: um.. i'll get your changes into my branch, then you can delete the branch that you just created...
[12:46:05 CDT(-0500)] <Justin_o> after that you can make a branch of my branch in your repo...
[12:46:18 CDT(-0500)] <heidi_> okay gonna grab a late lunch bbs
[12:46:27 CDT(-0500)] <Justin_o> heidi_: sure np
[12:50:16 CDT(-0500)] <Bosmon2> Hi yura_ - are you there?
[12:51:35 CDT(-0500)] <Bosmon2> Hey Justin_o - I have some more SVN material to be converted... can you talk me through the procedure you and jamon used for Fluid?
[12:51:50 CDT(-0500)] <Bosmon2> Is it necessary to recreate a working SVN repository to do the conversion, or can it work directly on a dump file?
[12:52:23 CDT(-0500)] <Justin_o> Bosmon2: I think it can work on the dump file
[12:53:53 CDT(-0500)] <Justin_o> Bosmon2: so you need this tool
[12:53:54 CDT(-0500)] <Justin_o> http://gitorious.org/svn2git/svn2git
[12:54:04 CDT(-0500)] <Justin_o> also known as svn-all-fast-export
[12:54:16 CDT(-0500)] <Bosmon2> Thanks
[12:54:36 CDT(-0500)] <Justin_o> Bosmon2: here's a good guide http://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git
[12:54:59 CDT(-0500)] <Justin_o> so you need to setup a rules file
[12:55:21 CDT(-0500)] <Justin_o> where you tell it how to match the parts of your svn code base into the git repo
[12:55:40 CDT(-0500)] <Justin_o> oh and don't forget to use your authorfile to map the authors
[12:56:30 CDT(-0500)] <Bosmon2> Wow... a site with even more unperformant servers than github
[12:56:37 CDT(-0500)] <Justin_o> haha
[12:56:47 CDT(-0500)] <Bosmon2> Wow
[12:56:49 CDT(-0500)] <Bosmon2> a C++ app
[12:56:55 CDT(-0500)] <Justin_o> and the ui is definitely not as nice..
[12:57:05 CDT(-0500)] <Bosmon2> And apparently no Makefile
[12:57:16 CDT(-0500)] <Bosmon2> Or readme
[12:57:17 CDT(-0500)] <Justin_o> yes.. i guess that's why it's as fast as it is.. or maybe part of the reason why
[12:57:28 CDT(-0500)] <Justin_o> yes.. the documentation is lacking
[12:57:38 CDT(-0500)] <Justin_o> that's why you'll have to look at the other page i sent you
[12:57:40 CDT(-0500)] <Bosmon2> This is the New Wave of git-enabled, modern software
[12:58:18 CDT(-0500)] <Justin_o> Bosmon2: i don't know.. i think software was always like that.. we just didn't know where to find it before
[12:58:28 CDT(-0500)] <Bosmon2> I guess these "pro" files are something like the makefile for "qmake"?
[12:58:44 CDT(-0500)] <Justin_o> oh yes.. how do you build the thing.. right
[12:59:12 CDT(-0500)] <Justin_o> "Make sure you have Qt4 installed, then simply issue qmake && make to build the executable called "svn-all-fast-export""
[12:59:31 CDT(-0500)] <Justin_o> Bosmon2: ^
[13:18:58 CDT(-0500)] <heidi_> Justin_o back, lemee know when i can get yr branch
[13:19:38 CDT(-0500)] <Justin_o> heidi_: still working on it..
[13:19:41 CDT(-0500)] <Justin_o> but soon
[13:19:44 CDT(-0500)] <heidi_> k np
[13:22:38 CDT(-0500)] <jhung> anastasiac: I have tech docs site question for you.
[13:22:40 CDT(-0500)] <Justin_o> heidi_: https://github.com/jobara/infusion/tree/FLUID-4023
[13:22:49 CDT(-0500)] <anastasiac> jhung, shoot
[13:23:05 CDT(-0500)] <heidi_> Justin_o and i set another remote to be https://github.com/jobara/infusion ?
[13:23:24 CDT(-0500)] <jhung> where would API documentation for FSS, a11y plugin, and UI Options be on the site?
[13:23:44 CDT(-0500)] <Justin_o> heidi_: yep you could do that
[13:23:53 CDT(-0500)] <heidi_> Justin_o what did you do?
[13:23:57 CDT(-0500)] <anastasiac> UI Options is a component, so it would be in the Components section. The other two are framework, so they'd go in the framework section, jhung
[13:24:23 CDT(-0500)] <Justin_o> heidi_: so you can do something like this
[13:24:27 CDT(-0500)] <Justin_o> git remote add justin git://github.com/jobara/infusion.git
[13:25:35 CDT(-0500)] <jhung> anastasiac: thanks!
[13:26:05 CDT(-0500)] <cindyli> Justin_o: i don't find a way to remove a wiki page, is it not publicized?
[13:26:21 CDT(-0500)] <Justin_o> cindyli: you might have to be an admin to do that...
[13:26:37 CDT(-0500)] <heidi_> Justin_o then i delete my current branch, and checkout the remote FLUID-4023 somehow?
[13:26:55 CDT(-0500)] <Justin_o> cindyli: when you are ready to have it deleted you can let anastasiac or myself know.. there's some others who are admins as well but i don't quite remember who
[13:27:13 CDT(-0500)] <cindyli> Justin_o: great. can u help to delete http://wiki.fluidproject.org/display/fluid/Image+Gallery+QA+Test+Plan
[13:27:17 CDT(-0500)] <Justin_o> heidi_: yes.. that's correct.. what i usually do is
[13:27:26 CDT(-0500)] <Justin_o> git checkout justin/FLUID-4023
[13:27:34 CDT(-0500)] <cindyli> Justin_o: i've moved it to somewhere else
[13:27:37 CDT(-0500)] <Justin_o> git checkout -b justin-FLUID-4023
[13:27:48 CDT(-0500)] <heidi_> cool thanks justin!
[13:27:57 CDT(-0500)] <Justin_o> heidi_: no problem.. let me know if that works for you
[13:28:06 CDT(-0500)] <Justin_o> cindyli: so you don't need anything that is on this page anymore?
[13:28:29 CDT(-0500)] <cindyli> Justin_o: no, i have the whole page somewhere else
[13:30:01 CDT(-0500)] <Justin_o> cindyli: okay
[13:30:13 CDT(-0500)] <cindyli> Justin_o: thx. i'm now looking for more work to do
[13:30:28 CDT(-0500)] <heidi_> Justin_o how do i delete the branch on my github (i already did locally)
[13:31:15 CDT(-0500)] <Justin_o> git push origin :FLUID-4023
[13:31:33 CDT(-0500)] <Justin_o> that basically says.. push nothing into the FLUID-4023 branch in repo origin
[13:31:41 CDT(-0500)] <heidi_> interesting, thanks
[13:34:43 CDT(-0500)] <heidi_> Justin_o when i do the git checkout justin/FLUID-4023 i get: error: pathspec 'justin/FLUID-4023' did not match any file(s) known to git.
[13:35:45 CDT(-0500)] <Justin_o> did you name the remote justin?
[13:35:48 CDT(-0500)] <Justin_o> if you do git branch -a
[13:35:49 CDT(-0500)] <heidi_> yes
[13:35:53 CDT(-0500)] <Justin_o> what do you see?
[13:36:24 CDT(-0500)] <heidi_> Justin_o i don't see justin. but if i do 'git remote' i do
[13:36:49 CDT(-0500)] <Justin_o> heidi_:
[13:36:50 CDT(-0500)] <Justin_o> ah
[13:36:51 CDT(-0500)] <Justin_o> okay..
[13:36:53 CDT(-0500)] <Justin_o> you need to do
[13:36:56 CDT(-0500)] <Justin_o> git fetch justin
[13:38:08 CDT(-0500)] <Justin_o> cindyli: i've just removed the page
[13:38:55 CDT(-0500)] <cindyli> Justin_o: great, thx. pls also worry about what's next for me.
[13:42:26 CDT(-0500)] <Justin_o> cindyli: sure... i'm going to be chatting with colinclark about that soon but in the meantime did you want to take a look at some of the issues on this page http://wiki.fluidproject.org/display/fluid/FSS+1.4+-+1.5+Roadmap
[13:43:09 CDT(-0500)] <Justin_o> heidi_: and I have branches for the FLUID-4023 and FLUID-4150 that could use some eyes and the rest could use some work.
[13:43:23 CDT(-0500)] <cindyli> Justin_o: sure
[13:43:36 CDT(-0500)] <Justin_o> cindyli: thanks
[13:43:41 CDT(-0500)] <heidi_> Justin_o git fetch justin gives me all yr branches, cool
[13:44:04 CDT(-0500)] <Justin_o> heidi_:
[13:44:09 CDT(-0500)] <Justin_o> glad it's working
[13:58:08 CDT(-0500)] <Bosmon2> Justin_o: Looks like this code depends on a utility which was only added in version 3.6 of Qt4
[13:58:21 CDT(-0500)] <Bosmon2> Whereas the most recent version I can find for cygwin is 3.5.21
[13:58:44 CDT(-0500)] <Justin_o> Bosmon2:
[14:02:34 CDT(-0500)] <Justin_o> Bosmon2: interested in switching to a different OS?
[14:05:02 CDT(-0500)] <Justin_o> Bosmon2: i think these are the ubuntu binaries for it https://launchpad.net/ubuntu/+source/svn-all-fast-export
[14:59:29 CDT(-0500)] <Bosmon2> Justin_o - I managed to build it, finally
[15:09:56 CDT(-0500)] <jhung> ping anastasiac
[15:10:06 CDT(-0500)] <anastasiac> jhung, polo
[15:11:45 CDT(-0500)] <jhung> in this diagram, would we be able to move some of the pages to the Framework API section, anastasiac? i.e. move the Renderer Trees, Templates, and Cutpoints docs to the Framework API section and link to those documents from the Renderer API page.
[15:11:48 CDT(-0500)] <jhung> http://wiki.fluidproject.org/download/attachments/22250245/architecture-framework.png?version=2&modificationDate=1297806424013
[15:12:51 CDT(-0500)] <anastasiac> jhung, my thinking with this diagram was that is isn't API info, it's technical background info - how things work, why they're designed the way they are, etc.
[15:12:59 CDT(-0500)] <anastasiac> this would be in addition to api info
[15:14:29 CDT(-0500)] <anastasiac> jhung, those architecture diagrams are getting a bit out of date, given the changes we've been making working on the actual layouts and navigation
[15:14:45 CDT(-0500)] <anastasiac> but we do still need the conceptual background info in addition to the API reference
[15:14:58 CDT(-0500)] <jhung> anastasiac: agree. I'm actually working on a new diagram using what we know now about the design and structure
[15:15:11 CDT(-0500)] <anastasiac> ah, excellent - great, thanks
[15:15:46 CDT(-0500)] <jhung> I should have something tomorrow morning. I'll ping you and Erin once it's up.
[15:15:54 CDT(-0500)] <jhung> for now here's an incomplete version: http://wiki.fluidproject.org/download/attachments/22250245/Infusion+Documentation+Website.png?version=3&modificationDate=1301338103614
[15:16:08 CDT(-0500)] <anastasiac> wow
[15:16:28 CDT(-0500)] <jhung> yeah.
[15:16:48 CDT(-0500)] <anastasiac> the scary thing, jhung, is that most of these pages still need to be written!
[15:17:06 CDT(-0500)] <jhung> lol anastasiac, I'm trying not to think about that.
[15:36:23 CDT(-0500)] <jhung> anastasiac: I've updated the diagram. Maybe tomorrow morning we can talk this over w Erin.
[15:36:48 CDT(-0500)] <anastasiac> jhung, sounds good - she's not on-list, do you want to ping her?
[15:43:25 CDT(-0500)] <jhung> anastasiac: yep. She's okay w meeting tomorrow morning. I'll ping you both then...
[15:43:35 CDT(-0500)] <anastasiac> great, thanks

Browser not supported