[01:01:44] *** rcjsuen_ has quit IRC
[01:02:51] *** rcjsuen has joined #eclipse-e4
[01:08:27] *** rcjsuen has quit IRC
[01:10:32] *** rcjsuen has joined #eclipse-e4
[01:17:21] *** rcjsuen_ has joined #eclipse-e4
[01:17:57] *** rcjsuen_ has quit IRC
[01:20:32] *** rcjsuen has quit IRC
[02:20:07] *** Arbalest has quit IRC
[03:25:17] *** echelog has joined #eclipse-e4
[07:45:49] *** paulweb515_ has quit IRC
[07:54:45] *** paulweb515_ has joined #eclipse-e4
[12:54:34] *** Arbalest has joined #eclipse-e4
[13:57:03] *** rcjsuen has joined #eclipse-e4
[14:45:31] *** yarthorn has joined #eclipse-e4
[15:49:30] <rcjsuen> emoffatt: Right now we need the team lead to +1 changes going in, correct?
[15:49:51] <emoffatt> we're RC1 or 2 ?
[15:50:21] <rcjsuen> emoffatt: we have an rc2 build this thurs
[15:51:01] <rcjsuen> I think team lead +1 and a committer +1?
[15:51:11] <emoffatt> then I think it's yes, I'm just taking another attack at *trying* to get my original fixes in
[15:51:35] <rcjsuen> briandealwis: sorry we didn't outlien rules of engagement to you ^
[15:52:22] <emoffatt> but due to lack of people it looks like we only have one person available (each other) to check patches
[15:52:57] <rcjsuen> we would need Brian or Oleg
[15:53:24] <briandealwis> Oops.  Sorry rcjsuen. We really need to revisit how we're using branches.   We should be carving off new branches for RCs.
[15:53:50] <rcjsuen> briandealwis: you mean so that there is still a "dev stream"?
[15:53:56] <briandealwis> yeah
[15:54:16] <rcjsuen> briandealwis: we wouldn't have this problem if we had a 4.2 stream and a 4.1.x stream, you are right
[15:54:37] <briandealwis> Perhaps have a R4_maintenance?
[15:55:01] <rcjsuen> we should have an R4_1_maintenance, the decision was not to do this originally as we'd be fixing bugs opened by the community
[15:55:12] <rcjsuen> (and we'd just be backporting everything)
[15:55:21] <emoffatt> briandealwis: we were going to make the split post-4.1.1
[15:55:25] <rcjsuen> but now we're in rc phase for 4.1.1 and it slows 4.2 dev completely
[15:55:54] <emoffatt> rcjsuen: it's been doing that already (that's why I delayed work on Capabilities...)
[15:56:21] <briandealwis> Many DVCS projects find a useful approach is to perform the changes in the maintenance branch and merge them forward ? much less pain that back porting
[15:56:27] <rcjsuen> I don't think I've committed anything for two weeks
[15:57:41] <emoffatt> the two fixes I'm currently working on are both applicable for 4.1.1, is there a need to split now? I'm certainly no GIT expert but the chirn at this point might be more trouble than it's worth IMO
[15:58:19] <emoffatt> It would mean changing the build scripts...
[15:58:49] <briandealwis> I think we can wait.
[15:59:25] <emoffatt> since we're treating our current 'head' fixes under the RC2 rules of engagement I don't think it's an immediate problem
[15:59:51] <emoffatt> once 4.1.1 goes out it should be the first thing to happen though
[16:03:38] <briandealwis> We could branch 4_1_maintenance off now ? it's a single branch ref that will require fixing.  We can branch off from a previous commit
[16:51:50] <rcjsuen> emoffatt: this one affects our day-to-day work so should be fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=355118
[16:52:07] <rcjsuen> emoffatt: this was reported by some guy testing his rcp app so should likely be given priority https://bugs.eclipse.org/bugs/show_bug.cgi?id=354739
[17:01:58] <emoffatt> briandealwis: I'm a bit more concerned about changing the build scripts et al (it's not just making the branch..I wish :) )
[17:02:24] <briandealwis> I realize that ? but it's a single ref.  So it should be easy :)
[17:03:57] <yarthorn> emoffatt: the build script change is not hard - the branch to use is an argument when invoking the builder.. Andrew can do that any time
[17:04:12] <emoffatt> yarthorn: we're trying to identify and code review those fixes that we really think should go into 4.1.1, perhaps we can then 'lock down' 4.1.1 by making the branch and move on to dev work
[17:05:33] <emoffatt> do you know of anybody that is consuming 4.1.1 ? if not then we can just say we're done 4.1.1 once these defects are in and go be to regular dev work
[17:06:30] <emoffatt> of course if there's a major (but simple) defect reported we could add it to both, I'm just talking about perhaps moving the timing for the branch up a bit
[18:14:22] *** briandealwis has quit IRC
[21:27:01] *** echelog has joined #eclipse-e4
[22:39:18] *** rcjsuen is now known as rcjsuen_
[23:14:57] *** yarthorn has quit IRC
[23:18:02] *** rcjsuen has joined #eclipse-e4





top