Page Comparison

[08:05:57 CDT(-0500)] <Justin_o> cindyli: is this one all finished and just needs to be reviewed and pushed? http://issues.fluidproject.org/browse/FLUID-4210
[08:06:19 CDT(-0500)] <cindyli> exactly, Justin_o
[08:06:34 CDT(-0500)] <Justin_o> cindyli: thanks.. i'll change the jira status to needs commit
[08:08:09 CDT(-0500)] <cindyli> thx, Justin_o. michelle did code review yesterday and gave some comments. i made changes and pushed in. she may have more comments on the new changes.
[08:08:32 CDT(-0500)] <Justin_o> cindyli: okay.. thanks... for the update...
[08:08:38 CDT(-0500)] <cindyli> np
[09:06:11 CDT(-0500)] <harriswong> Justin_o, anastasiac: for FLUID-2495, i don't see "tooltipDelay" and "tooltipId" in pager anymore, does it mean we are only adding "annotateColumnRange" to the option?
[09:07:38 CDT(-0500)] <Justin_o> harriswong: i think the wrapper has the tooltipDelay
[09:07:52 CDT(-0500)] <Justin_o> harriswong: but thinking about this, i wonder if we should just push this one off till the next release
[09:10:24 CDT(-0500)] <harriswong> Justin_o: Does the wrapper use the term 'tooltipDelay'? I don't think i am finding it...
[09:11:35 CDT(-0500)] <Justin_o> harriswong: no i guess it just uses the term delay
[09:11:43 CDT(-0500)] <harriswong> Justin_o: Would pushing it to the next release be better?
[09:11:47 CDT(-0500)] <Justin_o> harriswong: the thing to also remember is that we'll have to maintain backwards compatability
[09:12:21 CDT(-0500)] <Justin_o> harriswong: i think it might... we'll probably want to change a bunch of things for pager, and we'll need to use the options transformations stuff i would guess
[09:12:46 CDT(-0500)] <Justin_o> harriswong: i think i'll actually push all of the pager issues to another release
[09:13:11 CDT(-0500)] <harriswong> Justin_o: okay, thanks.
[09:13:30 CDT(-0500)] <Justin_o> harriswong: okay.. sorry to drop your jira
[09:14:06 CDT(-0500)] <harriswong> Justin_o: oh no don't worry, I was just poking around. thanks for letting me know early.
[09:14:55 CDT(-0500)] <Justin_o> harriswong: okay..
[09:16:44 CDT(-0500)] <Justin_o> michelled: do you know if this is a jira we'll have to take a look at for 1.4 http://issues.fluidproject.org/browse/FLUID-1653
[09:17:43 CDT(-0500)] <michelled> not for 1.4 Justin_o
[09:17:46 CDT(-0500)] <michelled> maybe 1.5?
[09:17:50 CDT(-0500)] <michelled> we need to do it soon
[09:18:13 CDT(-0500)] <Justin_o> michelled: thanks
[09:18:51 CDT(-0500)] <harriswong> mlam: should I merge your FLUID-3878 now? i noticed master is updated
[09:19:08 CDT(-0500)] <mlam> harriswong: let me merge it with the upstream master again
[09:19:14 CDT(-0500)] <harriswong> mlam: thanks.
[09:19:55 CDT(-0500)] <mlam> harriswong: done
[09:22:20 CDT(-0500)] <harriswong> mlam: pushed
[09:22:26 CDT(-0500)] <mlam> cool
[09:27:58 CDT(-0500)] <mlam> cindyli, Justin_o: I see the error. It was a result of me refactoring the formData creator into it's own function causing it to run all the time regardless of which HTML5 strategy is used. I'll create another JIRA for this and fix it
[09:28:27 CDT(-0500)] <cindyli> thanks, mlam
[09:28:47 CDT(-0500)] <mlam> np, sorry for the bug
[09:28:51 CDT(-0500)] <cindyli> np
[09:39:24 CDT(-0500)] <Justin_o> mlam: please send me the jira in question and I'll add it to the bug parade
[09:40:52 CDT(-0500)] <mlam> Justin_o: http://issues.fluidproject.org/browse/FLUID-4256
[09:41:24 CDT(-0500)] <Justin_o> mlam: thanks
[09:41:51 CDT(-0500)] <Justin_o> mlam: thanks.. it's on now
[09:41:57 CDT(-0500)] <mlam> ok
[12:10:30 CDT(-0500)] <Justin_o> michelled, colinclark: i'm looking at ui options and there are beginning to be a lot of small sub components, and maybe even more based on our conversation from the other day. I'm wonder at what point do we split these things off into separate files
[12:10:45 CDT(-0500)] <colinclark> That's a really good question
[12:10:53 CDT(-0500)] <colinclark> It's one that we don't have a good answer to for any component, really
[12:11:03 CDT(-0500)] <colinclark> except to say that the Builder gives us a lot of flexibility in this regard
[12:11:25 CDT(-0500)] <colinclark> Perhaps unrelated, I noticed yesterday how annoying our inconsistent naming conventions can get
[12:11:35 CDT(-0500)] <colinclark> The Renderer is probably the worst for this
[12:12:38 CDT(-0500)] <colinclark> Justin_o: When do you think it's best to create a new file?
[12:13:01 CDT(-0500)] <colinclark> I guess it's a balance between not annoying those of us who still link to individual files sometimes, and creating nice, small, easy-to-navigate files
[12:14:23 CDT(-0500)] <Justin_o> colinclark: yes. i'm not sure of where that balance lies.. I think it's more obvious when the subcomponent is useful in other components
[12:14:31 CDT(-0500)] <Justin_o> to break it out
[12:14:50 CDT(-0500)] <Justin_o> but i'm finding the current UIOptions.js a bit hard to navigate through
[12:15:25 CDT(-0500)] <colinclark> That's probably a sign that, if nothing else, the TextfieldSlider needs its own file
[12:15:31 CDT(-0500)] <colinclark> for exactly the argument you make above
[12:16:02 CDT(-0500)] <colinclark> By the way, here's a fairly wild example of JavaScript these days: http://bellard.org/jslinux/
[12:16:13 CDT(-0500)] <colinclark> And an explanation of how it works: http://bellard.org/jslinux/tech.html
[12:17:55 CDT(-0500)] <Justin_o> colinclark: that's pretty crazy
[12:19:26 CDT(-0500)] <colinclark> hey jameswy, I'm just catching up on my backlog of email
[12:19:36 CDT(-0500)] <colinclark> I saw anastasiac's post about the new yellow and black theme
[12:19:56 CDT(-0500)] <colinclark> those seemed like interesting questions
[12:20:48 CDT(-0500)] <jameswy> colinclark: Yes. I had meant to get back on that--sorry, anastasiac!
[12:21:02 CDT(-0500)] <anastasiac>
[12:21:06 CDT(-0500)] <colinclark> no worries, I just mentioned it because I'll be excited to see the response
[12:21:13 CDT(-0500)] <colinclark> not wanted to add extra pressure
[13:22:23 CDT(-0500)] <Bosmon> Justin_o - can you explain what you did to fix the network diagram?
[13:22:32 CDT(-0500)] <Bosmon> And do you have any idea how this problem can be avoided in future?
[13:22:57 CDT(-0500)] <Justin_o> Bosmon: sure.. did you want me to do that now or as part of the dev meeting?
[13:23:06 CDT(-0500)] <Bosmon> Oh, dev meeting is fine
[13:23:07 CDT(-0500)] <Justin_o> Bosmon: by the way i think we'll do the dev meeting here in the channel
[13:30:57 CDT(-0500)] <Justin_o> fluid-everyone: time for dev meeting.. i think we can just have the meeting here in the channel today... i don't think it will be too long
[13:31:53 CDT(-0500)] <mlam> what's on the agenda, Justin_o?
[13:32:05 CDT(-0500)] <Justin_o> This is what i have so far for the agenda
[13:32:22 CDT(-0500)] <Justin_o> 1) quick update on what everyone is doing for bug parade for the Infusion 1.4 release
[13:32:43 CDT(-0500)] <Justin_o> 2) a quick chat about what happened with the network graph over the weekend
[13:33:00 CDT(-0500)] <Justin_o> 3) Yura will mention some issues he's hit with his Infusion upgrade in CSpace
[13:33:15 CDT(-0500)] <Justin_o> fluid-everyone: anyone else have anything they'd like to talk about?
[13:35:17 CDT(-0500)] <Bosmon> I guess I wanted to quickly pick up a naming discussion I saw with cindyli, anastasiac and michelled from yesterday
[13:35:31 CDT(-0500)] <Justin_o> Bosmon: sure.. so that will be item 4) then
[13:36:01 CDT(-0500)] <Bosmon> There was some debate over the naming of a final init function... between "finalInitControlsComponent", and "fluid.uiOptions.controlsFinalInit"
[13:36:28 CDT(-0500)] <Bosmon> A "standard" which we are beginning to use, and which the framework has specific support for, is the use of names like "fluid.uiOptions.controls.finalInit"
[13:36:42 CDT(-0500)] <Bosmon> We may even make such a function automatically picked up in a future release
[13:37:01 CDT(-0500)] <Justin_o> Bosmon: that's interesting
[13:37:03 CDT(-0500)] <anastasiac> Bosmon, what do you mean when you say "the framework has specific support for"?
[13:37:24 CDT(-0500)] <cindyli> meaning each finalInit must be namespaced under its own component name?
[13:37:44 CDT(-0500)] <Bosmon> anastasiac - it requires special support to ensure that the name can be used, possibly before the creator function has been constructed
[13:37:57 CDT(-0500)] <Bosmon> yura_ ran into some awkward issues with this, before we had support
[13:38:01 CDT(-0500)] <anastasiac> in this case, the function was shared among several components, so it was NOT the final init for "fluid.uiOptions.controls"
[13:38:20 CDT(-0500)] <Bosmon> That's interesting.... what is it actually the finalInit for?
[13:38:36 CDT(-0500)] <cindyli> for 3 sub-components of fluid.uiOptions
[13:38:40 CDT(-0500)] <Bosmon> The "ants"?
[13:38:43 CDT(-0500)] <cindyli> true
[13:38:57 CDT(-0500)] <cindyli> they basically share the same finalInit
[13:39:16 CDT(-0500)] <cindyli> with their own parameterized "that"
[13:39:30 CDT(-0500)] <Bosmon> Ok, that's interesting, I'll be interested to see the code
[13:40:01 CDT(-0500)] <cindyli> digging
[13:40:35 CDT(-0500)] <anastasiac> so Bosmon, let me see if I understand correctly: Are you saying that I can't call my component's final init function "foofer.doodle" if I feel like it? I have to call it "mycomponentname.finalInit" ?
[13:40:46 CDT(-0500)] <Bosmon> No, you can call it what you like
[13:40:52 CDT(-0500)] <colinclark> that'd be a pretty funny name
[13:41:14 CDT(-0500)] <Bosmon> My suggestion was that in the future, if a function named component.finalInit could be found, it would be automatically registered as a finalInit function
[13:41:24 CDT(-0500)] <Bosmon> Similarly for the other lifecycle points
[13:41:45 CDT(-0500)] <anastasiac> ah, gotcha. that's pretty nice, actually - that means you wouldn't have to specify it in the defaults, Bosmon?
[13:42:00 CDT(-0500)] <Bosmon> Yes
[13:42:09 CDT(-0500)] <anastasiac> neat
[13:42:14 CDT(-0500)] <cindyli> Bosmon: https://github.com/cindyli/infusion/blob/FLUID-4210/src/webapp/components/uiOptions/js/UIOptions.js#L444-605
[13:42:45 CDT(-0500)] <cindyli> the finalInit that's being shared: fluid.uiOptions.controlsFinalInit
[13:43:12 CDT(-0500)] <cindyli> https://github.com/cindyli/infusion/blob/FLUID-4210/src/webapp/components/uiOptions/js/UIOptions.js#L421-435
[13:43:12 CDT(-0500)] <Bosmon> I'm SO glad they finally fixed line numbers on github
[13:44:14 CDT(-0500)] <cindyli> there's still a bit offset. i have to experiment a couple of times to figure out the correct range
[13:46:09 CDT(-0500)] <Bosmon> cindyli - isn't the addition of "that.refreshView" at line 427 redundant?
[13:46:20 CDT(-0500)] <Bosmon> The renderer component grade already makes a top-level refreshView function
[13:46:23 CDT(-0500)] <colinclark> Hey, can I ask a question?
[13:46:28 CDT(-0500)] <Bosmon> UNless the one it makes does something you don't like...
[13:46:33 CDT(-0500)] <colinclark> Is this the dev meeting, or are we just doing a code review instead?
[13:46:47 CDT(-0500)] <Bosmon> Sorry, got sidetracked
[13:46:59 CDT(-0500)] <colinclark> Don't get me wrong, this is really good
[13:47:13 CDT(-0500)] <colinclark> I'm just thinking we might want to get through Justin_o's highest priority agenda items to start
[13:47:13 CDT(-0500)] <cindyli> Bosmon: i see ur point. trying
[13:47:30 CDT(-0500)] <colinclark> Justin_o: Go for it, King
[13:48:36 CDT(-0500)] <Justin_o> colinclark: okay
[13:48:54 CDT(-0500)] <cindyli> Bosmon: u r right. removing it. thx
[13:49:06 CDT(-0500)] <Justin_o> so i guess we can just go in alphabetical order and talk about what you are doing for bug parade at the moment.. feel free to bring up any questions you might have about it too
[13:49:11 CDT(-0500)] <Justin_o> anastasiac: i guess you can start
[13:49:55 CDT(-0500)] <anastasiac> Right now, I'm working on framework docs: working out what's new that still needs docs. UI Options is too much of a moving target to document yet
[13:51:14 CDT(-0500)] <Justin_o> Bosmon: you want to go next
[13:51:20 CDT(-0500)] <Justin_o> anastasiac: thanks for the update
[13:52:20 CDT(-0500)] <Bosmon> Hi Justin_o - I am not looking at anything too specifically right now, although I am prepared to be a "SWAT" team for any upgrade issues that we encounter
[13:52:30 CDT(-0500)] <Bosmon> Naturally there's the standard issues with framework docs etc.
[13:52:41 CDT(-0500)] <colinclark> It's nice to see that our framework docs are slowly growing
[13:52:49 CDT(-0500)] <colinclark> I've used several of them successfully over the past few days
[13:52:55 CDT(-0500)] <colinclark> How's Kettle looking, Bosmon?
[13:53:20 CDT(-0500)] <Bosmon> I fianlly started to push some Kettle progress last night...
[13:53:26 CDT(-0500)] <Bosmon> And got over my "hump" with URL rewriting
[13:53:30 CDT(-0500)] <colinclark> cool
[13:53:53 CDT(-0500)] <Bosmon> Started to think about how IoC should be properly used in the design, there are so many areas where it was wrongly designed without it
[13:54:30 CDT(-0500)] <Bosmon> Are there any Bug Parade issues anyone specifically wants me to look at?
[13:55:06 CDT(-0500)] <Justin_o> Bosmon: speaking of bug parade issues.. have you had a chance to look at the frameworky ones that are on the list
[13:55:14 CDT(-0500)] <Justin_o> and see which can be dropped from this release
[13:56:23 CDT(-0500)] <Justin_o> cindyli: i guess you can go now
[13:56:37 CDT(-0500)] <cindyli> integrating jameswy and heidi's new ui options templates with ui options. the jira #4216
[13:56:44 CDT(-0500)] <cindyli> that's pretty much it
[13:56:59 CDT(-0500)] <Justin_o> cindyli: thanks
[13:57:01 CDT(-0500)] <Bosmon> I'm interested by http://issues.fluidproject.org/browse/FLUID-3783 Justin_o
[13:57:07 CDT(-0500)] <Bosmon> I don't think I saw that one being reported
[13:57:46 CDT(-0500)] <Justin_o> Bosmon: i think i talked to you about that one when i filed it.. but that was a long time ago
[13:58:27 CDT(-0500)] <Justin_o> i think colinclark is in another meeting.. so harriswong why don't you go ahead now
[13:58:45 CDT(-0500)] <Bosmon> 4106 can be resolved, 4056 will be "pushed"
[13:59:06 CDT(-0500)] <harriswong> Justin_o: Working on Reorderer related blockers, resolved 3954 and now working on 3953
[13:59:43 CDT(-0500)] <Bosmon> Justin_o - can 4226 be reproduced?
[13:59:46 CDT(-0500)] <Bosmon> it works in Chrome for me
[14:00:06 CDT(-0500)] <harriswong> Justin_o: also suggested to push back all pager related jiras from this release.
[14:00:18 CDT(-0500)] <Justin_o> harriswong: thanks.. pushed those pager ones alreday
[14:00:27 CDT(-0500)] <Justin_o> harriswong: can you quickly test FLUID-4226 for Bosmon
[14:02:30 CDT(-0500)] <Justin_o> So i guess it's my turn to update.. I sent a couple of pull requests for some outstanding FSS work that heidi and I have been doing. Just got the last one in shortly after standup today. I was going to look at the livePreview for UI Options, but I think the latest commits that I had made for it in the FLUID-3782 branch have it pretty much working. It could use some refactoring once the UI Enhancer is sorted out. I'm going to turn my attentions to the Ta
[14:02:30 CDT(-0500)] <Justin_o> Contents issues now.
[14:02:37 CDT(-0500)] <Justin_o> mlam: you're up
[14:03:17 CDT(-0500)] <harriswong> Bosmon, Justin_o: 4226 is now passing. It could be related to some of the updates from i last tested it. Bosmon, i think you can resolve it since it cannot be reproduced anymore.
[14:03:28 CDT(-0500)] <Bosmon> ok, thanks harriswong
[14:03:28 CDT(-0500)] <mlam> Working on FLUID-4256 – The new image gallery in FF3.6 and IE are reporting an error that FormData isn't supported
[14:03:53 CDT(-0500)] <harriswong> Bosmon: IE8, 9 on Windows 7 are also passing
[14:04:25 CDT(-0500)] <Justin_o> mlam: thanks..
[14:04:28 CDT(-0500)] <Justin_o> yura_: your turn
[14:06:03 CDT(-0500)] <yura_> hi, so this is actually related to what I would have to mention later anyways. Michelle and I are realized that logging seems to be set to true by default when i build infusion. I wonder if that's a bug. Also, she mentioned that it doesnt feel right to include FluidDebugging into framework for build
[14:06:32 CDT(-0500)] <Justin_o> yura_: thanks.. did you want to just jump right into that
[14:07:09 CDT(-0500)] <yura_> well this is basically it, Bosmon do you think it should be included into the framework for builds?
[14:08:43 CDT(-0500)] <Bosmon> It should be an option in the builder
[14:08:51 CDT(-0500)] <Bosmon> It should either produce production, or debug builds
[14:09:01 CDT(-0500)] <yura_> right makes sense
[14:09:08 CDT(-0500)] <Justin_o> yura_: i think it being on by default is not a bug, we have a jira to turn debugging off when we tag the release
[14:09:08 CDT(-0500)] <yura_> right now it is always included
[14:09:14 CDT(-0500)] <Bosmon> Certainly logging set to true by default is a bug, and will cause appalling performance problems
[14:09:28 CDT(-0500)] <Justin_o> yura_: http://issues.fluidproject.org/browse/FLUID-4252
[14:09:50 CDT(-0500)] <Bosmon> Actually there should be no call within framework code which sets logging to on
[14:09:52 CDT(-0500)] <yura_> ok so i am doing manually now as well in cspace, so i guess that is fine
[14:10:17 CDT(-0500)] <Bosmon> Justin_o - that issue is about the behaviour of fluid.fail() specifically, rather than the logging state
[14:10:46 CDT(-0500)] <Justin_o> Bosmon: well there is an etc there
[14:11:44 CDT(-0500)] <yura_> Bosmon: Uploader seems to have it set to true
[14:12:17 CDT(-0500)] <Bosmon> That is an anomaly then... it is ok to turn it in for test cases and demos
[14:12:22 CDT(-0500)] <Bosmon> turn it on
[14:12:51 CDT(-0500)] <Bosmon> Justin_o - in which case we need a further JIRA to JIRA the matter that the description of 4252 is incomplete
[14:13:23 CDT(-0500)] <Justin_o> Bosmon:
[14:14:54 CDT(-0500)] <Justin_o> yura_, Bosmon does that cover it or more to discuss still?
[14:15:05 CDT(-0500)] <yura_> Justin_o: that is all
[14:15:50 CDT(-0500)] <Justin_o> Bosmon: okay.. so the next two items were both your requests.. would you prefer to talk about the graph flipping or the naming issue first
[14:16:04 CDT(-0500)] <Bosmon> Let's hear about graph flipping
[14:16:10 CDT(-0500)] <Justin_o> okay..
[14:16:26 CDT(-0500)] <Bosmon> So, other than getting a "funny message" after I updated, I didn't notice any odd effects at all, which is pretty impressive
[14:16:32 CDT(-0500)] <Bosmon> It told me there was a "forced update"
[14:16:55 CDT(-0500)] <Justin_o> Bosmon: i guess you got that when you pushed right
[14:17:07 CDT(-0500)] <Bosmon> No, when I did a "git pull" after your fix
[14:18:23 CDT(-0500)] <Bosmon> From github.com:fluid-project/infusion
[14:18:23 CDT(-0500)] <Bosmon> + 9c409ef...083228a master -> origin/master (forced update)
[14:18:28 CDT(-0500)] <Justin_o> Bosmon: ah right
[14:18:44 CDT(-0500)] <Bosmon> So, what did you actually do
[14:18:48 CDT(-0500)] <Justin_o> Bosmon: yes.. that's because i think it had to overright your local copy of the remote repo
[14:19:14 CDT(-0500)] <Bosmon> You mean, the reference to which the branch was?
[14:19:28 CDT(-0500)] <Bosmon> I guess all that was really overwritten was the reference to "origin/master"?
[14:19:50 CDT(-0500)] <Justin_o> i put my steps in the e-mail to the fluid-work list http://old.nabble.com/JQuery-1.6.1-branch-merged-to31615604.html
[14:19:57 CDT(-0500)] <Bosmon> ah ok
[14:20:02 CDT(-0500)] <Justin_o> Bosmon: i think it's more than just a reference though..
[14:20:13 CDT(-0500)] <Justin_o> when you fetch, it actually gets copied down to your local machine
[14:20:34 CDT(-0500)] <Bosmon> Well, aren't all git branches just references?
[14:20:45 CDT(-0500)] <Justin_o> well okay.. to change sets i guess
[14:21:00 CDT(-0500)] <Justin_o> but there were actually very few differnces between the two masters
[14:21:19 CDT(-0500)] <Bosmon> So... do I still actually need to do the steps listed in part 1 of your mail?
[14:21:21 CDT(-0500)] <Justin_o> the differences ended up being a couple merge commits
[14:21:27 CDT(-0500)] <Justin_o> Bosmon: yes
[14:21:29 CDT(-0500)] <Justin_o>
[14:21:31 CDT(-0500)] <Bosmon> Or have the "forced branch updates" fixed it
[14:21:32 CDT(-0500)] <Bosmon> I see
[14:21:45 CDT(-0500)] <Bosmon> So... one big question is.... how did you KNOW you had fixed the branch?
[14:21:51 CDT(-0500)] <Justin_o> Bosmon: if you don't you will retain the incorrect state of master
[14:22:22 CDT(-0500)] <Justin_o> since all the actual changes were identical if you just did a merge it won't really change anything
[14:22:31 CDT(-0500)] <Justin_o> by changes here, i mean commits
[14:23:12 CDT(-0500)] <Justin_o> Bosmon: what do you mean by "had to fix the branch"?
[14:23:24 CDT(-0500)] <Bosmon> I said, "Had fixed the branch"
[14:23:29 CDT(-0500)] <Bosmon> How did you know you had done it right?
[14:23:36 CDT(-0500)] <Justin_o> Bosmon: i guess i should learn to read a bit better
[14:23:48 CDT(-0500)] <Bosmon> Before being able to look at the graph being rendered in github?
[14:24:02 CDT(-0500)] <Justin_o> Bosmon: I created a new github repo space for it to test out
[14:24:09 CDT(-0500)] <Bosmon> ha
[14:24:21 CDT(-0500)] <Justin_o> https://github.com/jobara/infusion_network_graph
[14:24:30 CDT(-0500)] <Bosmon> Of course, great...
[14:24:53 CDT(-0500)] <Bosmon> Justin_o: I guess i can deal with the first half of your instructions by just deleting my local repo clone and recloning it?
[14:24:59 CDT(-0500)] <Justin_o> Bosmon: whenever i push anything to the project repo i always push up to my personal github repo first.. then i can check the network graph there
[14:25:14 CDT(-0500)] <Bosmon> It's only the actions on my personal fork that I really need to do specifically?
[14:25:19 CDT(-0500)] <Justin_o> Bosmon: you'll also have to take out the master branch on your github fork
[14:25:28 CDT(-0500)] <Justin_o> Bosmon: yes
[14:26:34 CDT(-0500)] <Bosmon> Well, thanks so much for helping us out of this one, Justin_o - do you have any recommendations about how to stop this happening again?
[14:26:47 CDT(-0500)] <Justin_o> Bosmon: np
[14:27:08 CDT(-0500)] <Justin_o> as for stopping it in the future.. i think we just always have to use the --no-ff flag when merging things into our master branches
[14:27:33 CDT(-0500)] <Bosmon> Does the flag really do something, if the merge can only be a true merge?
[14:28:19 CDT(-0500)] <Justin_o> Bosmon: so all it says is "don't do a fast forward" when a "fast forward" happens.. it basically replaces one branch with another
[14:29:25 CDT(-0500)] <Bosmon> So I assumed that my merge of 4113 couldn't possibly be a fast-forward... since it was such a huge branch
[14:29:28 CDT(-0500)] <Justin_o> ah.. now i think i get it.. if branch A contains all of branch B, then instead of merging A into B, it will just replace B with A
[14:29:29 CDT(-0500)] <Bosmon> And I don't think it was
[14:29:47 CDT(-0500)] <Bosmon> However, when I got the merge message, it was listed "the other way round"
[14:29:59 CDT(-0500)] <Bosmon> The message said, "merging master into 4113" rather than "merging 4113 into master"
[14:30:20 CDT(-0500)] <Bosmon> Clearly neither master nor 4113 contained all of the other, at the time I did the merge...
[14:30:23 CDT(-0500)] <Justin_o> what command did you execute and on which branch?
[14:30:29 CDT(-0500)] <Bosmon> So I am wondering what exactl provoked the disaster
[14:30:32 CDT(-0500)] <Bosmon> Let me scroll back
[14:30:40 CDT(-0500)] <Bosmon> Luckily I still have the same terminal window open
[14:31:05 CDT(-0500)] <Justin_o> Bosmon: since Friday.. i'm impressed
[14:31:21 CDT(-0500)] <Bosmon> Well, it stretches back at least a month
[14:31:52 CDT(-0500)] <Bosmon> So, I was in my local clone of infusion master, in the master branch
[14:31:57 CDT(-0500)] <Bosmon> The commands I did were as follows:
[14:32:02 CDT(-0500)] <Bosmon> $ git fetch harriswong jkkremer-FLUID-4113:harriswong/FLUID-4113
[14:32:21 CDT(-0500)] <Bosmon> I then got: * [new branch] jkkremer-FLUID-4113 -> harriswong/FLUID-4113
[14:32:35 CDT(-0500)] <Bosmon> oh crap!
[14:32:40 CDT(-0500)] <Bosmon> It was a fast-forward!!!
[14:32:53 CDT(-0500)] <Bosmon> $ git merge --log harriswong/FLUID-4113
[14:32:54 CDT(-0500)] <Bosmon> Updating 275f559..9049a73
[14:32:54 CDT(-0500)] <Bosmon> Fast-forward
[14:32:58 CDT(-0500)] <Bosmon> Damn damn damn
[14:33:00 CDT(-0500)] <Bosmon> How could this be!
[14:35:57 CDT(-0500)] <Justin_o> Bosmon: that remote branch was probably updated from upstream already
[14:36:29 CDT(-0500)] <Bosmon> Justin_o - can you explain?
[14:38:40 CDT(-0500)] <Justin_o> Bosmon: https://github.com/harriswong/infusion/network
[14:39:04 CDT(-0500)] <Bosmon> AH!!!!!!!
[14:40:01 CDT(-0500)] <Justin_o> Bosmon: so if you notice it was updated from upstream, and then it was merged back in before any other changes occured
[14:40:27 CDT(-0500)] <Justin_o> on the upstream/master branch
[14:40:51 CDT(-0500)] <Bosmon> yes
[14:40:55 CDT(-0500)] <Bosmon> It is all clear now
[14:41:23 CDT(-0500)] <Bosmon> I will just remember to always use the flag
[14:41:33 CDT(-0500)] <Bosmon> Even if a further case occurs where I can't understand why it might be necessary
[14:41:57 CDT(-0500)] <Justin_o> Bosmon: i think that's the safest way to go and the --log flag gives a nice summary of the merged commits
[14:42:34 CDT(-0500)] <Justin_o> Bosmon: so i guess we can go back to your naming thing if there was more to talk about
[14:43:16 CDT(-0500)] <Bosmon> Justin_o - sure
[14:43:34 CDT(-0500)] <Bosmon> I think that was pretty much done too
[14:44:04 CDT(-0500)] <Bosmon> It looks like the current state of UIOptions is a bit provisional anyway, so there's no point fussing about the names of things in it too much
[14:44:24 CDT(-0500)] <Justin_o> Bosmon: yes.. i guess that's true
[14:44:35 CDT(-0500)] <Bosmon> But I thought I would mention this general possibility and advice to use the component's name as a namespace if and when it makes sense
[14:45:39 CDT(-0500)] <Justin_o> Bosmon: makes sense.. colinclark was mentioning how our inconsistencies in naming was causing him grief, earlier
[15:30:28 CDT(-0500)] <mlam> Justin_o: FLUID-4256 has been fixed. Needs to be committed
[15:30:52 CDT(-0500)] <mlam> colinclark: FLUID-4256 fixes the FormData issue in cindyli's image gallery
[15:30:59 CDT(-0500)] <colinclark> oh, great
[15:31:00 CDT(-0500)] <colinclark> okay
[15:31:02 CDT(-0500)] <Justin_o> mlam: thank you.. did you send a pull request?
[15:31:09 CDT(-0500)] <mlam> Justin_o: Yah, i did
[15:31:09 CDT(-0500)] <colinclark> #49
[15:31:15 CDT(-0500)] <colinclark> I'll review and push
[15:31:18 CDT(-0500)] <mlam> ok, cool
[15:31:22 CDT(-0500)] <colinclark> either tonight or tomorrow morning
[15:31:40 CDT(-0500)] <Justin_o> mlam: thanks.. can you add a link to the pull request on the jira
[15:31:54 CDT(-0500)] <mlam> Yah, ok
[15:33:57 CDT(-0500)] <Justin_o> mlam: thanks
[15:34:10 CDT(-0500)] <mlam> yw
[15:36:57 CDT(-0500)] <colinclark> mlam: go ahead and assign the JIRA to me as well
[15:37:11 CDT(-0500)] <mlam> ok, sure
[17:03:39 CDT(-0500)] <mpolizzotti> Afternoon everyone. I have a quick question about the Simple Text Inline Edit component. I am using Infusion 1.3.1. and I was curious if API for the Simple Text Inline Edit component was up to date? I'm looking at http://wiki.fluidproject.org/display/fluid/Simple+Text+Inline+Edit+API
[17:20:19 CDT(-0500)] <mpolizzotti> Nevermind. I found my answer.