Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 375993 - eclipse.platform.releng.git and eclipse.platform.git stale in R4_HEAD
Summary: eclipse.platform.releng.git and eclipse.platform.git stale in R4_HEAD
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Releng (show other bugs)
Version: 3.7.1   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 4.2 M7   Edit
Assignee: John Arthorne CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-04-03 14:48 EDT by John Arthorne CLA
Modified: 2012-04-03 16:37 EDT (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description John Arthorne CLA 2012-04-03 14:48:32 EDT
The R4_HEAD branch of these repositories is out of date and needs merging from master:

eclipse.platform.git
eclipse.platform.releng.git
Comment 1 John Arthorne CLA 2012-04-03 16:36:57 EDT
My god that was an epic merge. I think R4_HEAD is now up to date. I added some extra directories and features in the process that were missing from R4_HEAD. When in doubt anything that was added in master since the fork I added in R4_HEAD. Maybe not all of this is needed in R4 and we can prune it out later. Here are the merge commits:

http://git.eclipse.org/c/platform/eclipse.platform.releng.git/commit/?h=R4_HEAD&id=843a497ad57490afaa12515fac7900f9772d080e

http://git.eclipse.org/c/platform/eclipse.platform.git/commit/?h=R4_HEAD&id=b8db24d6cec6865c2b7e3a7702042b518d1fa46d