[01:13:11] *** briandealwis has quit IRC
[03:49:03] *** rcjsuen has quit IRC
[13:03:04] *** rcjsuen_ is now known as rcjsuen
[13:11:04] <rcjsuen> wait a minute.......
[14:12:14] <paulweb515> rcjsuen: did you push yet?
[14:12:25] <rcjsuen> paulweb515: I tried a few things, isn't doing anything
[14:12:31] <rcjsuen> <rcjsuen> paulweb515: I should push refs/heads/R4_development to refs/remotes/R4_development, right?
[14:13:10] <paulweb515> rcjsuen: my git remote show origin says: R4_development pushes to R4_development
[14:13:19] <paulweb515> where the second one is origin/R4_development
[14:13:34] <paulweb515> I need to load up my 4.2/4.1.1 workspace ... I'll do that now
[14:14:15] <rcjsuen> R4_development pushes to refs/remotes/R4_development (up to date)
[14:14:17] <rcjsuen> is what it says on mine
[14:17:29] <rcjsuen> paulweb515: It's there now...but I have a feeling I spawned some new branches in the process. http://git.eclipse.org/c/platform/eclipse.platform.ui.git/log/?h=R4_development
[14:19:03] <paulweb515> rcjsuen: haha ... ha
[14:19:39] <paulweb515> rcjsuen: my pull doesn't seem to complain
[14:49:22] <rcjsuen> paulweb515: Which pull strategy did you spec in EGit?
[14:49:25] <rcjsuen> rebase/merge/none
[14:53:48] <paulweb515> I think I left it as merge ... but I think that's not the right thing
[15:24:35] <rcjsuen> paulweb515: I see Dimitar making changes to the e4 builder. We haven't frozen it yet?
[15:26:49] <paulweb515> rcjsuen: no, I don't have a timeline to convert the releng project yet
[15:26:54] <rcjsuen> ah
[15:27:06] <paulweb515> rcjsuen: map files -> git fetch factory works
[15:27:19] <paulweb515> rcjsuen: but we need changes to the basebuilder to pull map files out of git
[15:27:26] <paulweb515> (i.e. we need to go one step back :-)
[15:56:04] <paulweb515> ~340088
[15:56:05] <Arbalest> Bug 340088 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340088 - Platform / UI / 4.1 - All / All - NEW / major / - Assignee: platform-ui-triaged - [Compatibility] Investigate API tooling errors on 4.1 against 3.7 baseline
[15:56:24] <paulweb515> can I add my changes to the platform-fliters/manifest for basing against 4.1 ?
[15:56:49] <rcjsuen> I right now have a 3.7 baseline actually (instead of a 4.1 baseline)
[15:57:21] <rcjsuen> these are my _errors_
[15:57:22] <rcjsuen> Description	Resource	Path	Location	Type
[15:57:22] <rcjsuen> The major version should be incremented in version 3.101.0, since API breakage occurred since version 3.7.0	MANIFEST.MF	/org.eclipse.ui.workbench/META-INF	line 5	Version Numbering Problem
[15:57:22] <rcjsuen> The major version should be incremented in version 3.7.100, since API breakage occurred since version 3.7.0	MANIFEST.MF	/org.eclipse.ui/META-INF	line 5	Version Numbering Problem
[15:57:22] <rcjsuen> The re-exported type org.eclipse.ui.presentations.PresentationUtil has been removed from org.eclipse.ui_3.7.0	MANIFEST.MF	/org.eclipse.ui/META-INF	line 1	Compatibility Problem
[15:57:27] <rcjsuen> The re-exported type org.eclipse.ui.presentations.WorkbenchPresentationFactory has been removed from org.eclipse.ui_3.7.0	MANIFEST.MF	/org.eclipse.ui/META-INF	line 1	Compatibility Problem
[15:57:30] <rcjsuen> The type org.eclipse.ui.presentations.PresentationUtil has been removed from org.eclipse.ui.workbench_3.101.0	MANIFEST.MF	/org.eclipse.ui.workbench/META-INF	line 1	Compatibility Problem
[15:57:33] <rcjsuen> The type org.eclipse.ui.presentations.WorkbenchPresentationFactory has been removed from org.eclipse.ui.workbench_3.101.0	MANIFEST.MF	/org.eclipse.ui.workbench/META-INF	line 1	Compatibility Problem
[16:05:17] <paulweb515> unless there's something that you think we need to fix in 4.2 compared to 3.7 (completely missing API we need to provide) I would record it and then make your baseline 4.1 for our 4.2 work
[16:05:21] <paulweb515> Does that sound reasonable?
[16:48:42] <rcjsuen> paulweb515: What do you mean by "record" it
[16:57:39] <paulweb515> rcjsuen: if there's really missing API we need to provide in 4.2, a baseline against 4.1 won't show it
[16:58:00] <paulweb515> rcjsuen: so you should write down any serious problems going from 3.7 to 4.2
[16:58:23] <rcjsuen> paulweb515: I fixed all of them besides the presentation ones
[16:58:33] <paulweb515> OK
[17:29:10] <paulweb515> rcjsuen: when you changed .../addons/perspectiveswitcher/PerspectiveSwitcher.java round about what lines were your change ?
[17:29:31] <paulweb515> 195
[17:29:38] <rcjsuen> paulweb515: 198?
[17:29:50] <paulweb515> I don't see any line ending problems here
[17:29:51] <rcjsuen> i also deleted a line
[17:30:01] <rcjsuen> so i guess it's 199
[17:31:46] <paulweb515> rcjsuen: what's your git config -l on your eclipse.platform.ui repo?
[17:32:00] <rcjsuen> probably nothing
[17:32:16] <rcjsuen> C:\git\eclipse.platform.ui>git config -l
[17:32:16] <rcjsuen> core.symlinks=false
[17:32:16] <rcjsuen> core.autocrlf=false
[17:32:16] <rcjsuen> color.diff=auto
[17:32:55] <paulweb515> rcjsuen: does notepad hate your file then?
[17:34:20] <rcjsuen> paulweb515: Well it's definitely all in one line
[17:34:27] <rcjsuen> so it's using non crlf
[17:34:35] <paulweb515> lesson here ... don't use notepad
[17:34:50] <rcjsuen> I like Notepad. It helps me identify these problems :)
[17:35:08] <rcjsuen> I'm still waiting for ~224814 to be fixed
[17:35:09] <Arbalest> Bug 224814 - https://bugs.eclipse.org/bugs/show_bug.cgi?id=224814 - Equinox / p2 / 3.6 - PC / Windows All - REOPENED / trivial / - Assignee: equinox.p2-inbox - UNIX linebreaks in Windows config.ini
[17:45:29] *** briandealwis has joined #eclipse-e4
[17:45:33] <paulweb515> rcjsuen: was it OK for me to check in my 4.2 vs 4.1 baseline changes?
[17:45:44] <rcjsuen> paulweb515: you mean your filters for the manifest files?
[17:45:55] <paulweb515> my filter, and updating the manifest to 3.102.0 ?
[17:46:14] <rcjsuen> paulweb515: Sounds okay to me.
[17:46:26] <paulweb515> OK
[18:00:58] <paulweb515> rcjsuen: for your initial branch checkout, you don't get a choice.  But for the other branches if you use Switch To>New Branch it lets you set the strategy
[18:01:19] <rcjsuen> That would explain why I don't recall seeing that option on Eric's computer :3
[19:33:48] <rcjsuen> paulweb515: What bug are you looking at right now
[20:38:44] <rcjsuen> paulweb515: Build failed
[20:43:36] <paulweb515> rcjsuen: I'm trying to get a 4.2 build
[20:44:37] <rcjsuen> paulweb515: oh I just pinged you about it in case you didn't see the email come in yet
[21:04:19] <rcjsuen> looks like it failed again
[21:14:36] <paulweb515> I in theory fixed the problem ... but didn't tag the feathre
[21:14:38] <paulweb515> feature
[21:14:43] <paulweb515> trying to tag it right now
[22:07:27] *** rcjsuen has quit IRC





top