| Summary: | migration platform.resources to git | ||
|---|---|---|---|
| Product: | [Eclipse Project] Platform | Reporter: | Kim Moir <kim.moir> |
| Component: | Resources | Assignee: | Platform-Resources-Inbox <platform-resources-inbox> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | aniefer, daniel_megert, dj.houghton, jamesblackburn+eclipse, john.arthorne, pwebster, remy.suen, sptaszkiewicz, Szymon.Brandys |
| Version: | 3.7 | ||
| Target Milestone: | 3.8 M2 | ||
| Hardware: | PC | ||
| OS: | Windows XP | ||
| Whiteboard: | |||
| Bug Depends on: | |||
| Bug Blocks: | 345479 | ||
|
Description
Kim Moir
core.resources tests pass. I can commit to master and the history looks fine. Kim, could you spin a build using core.resources Git repo? Kim, is there anything else we should look at? Please update the map files for core.resources bundles in the git_test branch of org.eclipse.releng and I'll start a test build. Adding Andrew. He seems to know where are scripts to tag/release Git repos. We plan to make the final migration on Aug 18th (Thursday). I already asked committers on platform-core-dev to freeze commits this day. If I clone the repo, I always get CVSROOT folder in the main folder of the local cloned repository. Is it working as expected or something is wrong there? regarding comment #6 I will fix that when I run the real migration. Sorry about that. http://wiki.eclipse.org/E4/Git#Submitting_for_a_build contains instructions and links to scripts. This still involves a number of manual steps, we need a proper UI releng tool, see bug 345668 and blockers Szymon, the git_test branch of org.eclipse.releng isn't updated. You need to change the map files to refer to git instead of CVS for the bundles in the platform.resources repo For example here is the osgi bundle plugin@org.eclipse.osgi=GIT,tag=v20110808-1537,repo=git://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git,path=bundles/org.eclipse.osgi Map files updated on the git_test branch. Kim, I compared core.resources repo with core.runtime one. Could we group projects by types i.e. tests and bundles in the final repo? The following projects are empty org.eclipse.core.resources.hpux org.eclipse.core.resources.linux org.eclipse.core.resources.macosx org.eclipse.core.resources.qnx The functionality supplied by them has been moved to the org.eclipse.core.filesystem.* projects. org.eclipse.core.resources.win32 is also empty. The fragment has been replaced by specific fragments for each supported architecture: org.eclipse.core.resources.win32.x86 org.eclipse.core.resources.win32.ia64 I see they were crossed out on http://wiki.eclipse.org/Platform-releng/Git_Migration_Granularity As I see crossed out projects in SWT were not moved to Git. Thanks. okay, I'll add subdirectories when I migrate them so there is a bundles and tests subdirectories. Also, I'll exclude the old bundles you mentioned. (In reply to comment #11) > Also, I'll exclude the old bundles you mentioned. What do you mean by exclude? If the content was moved within the repo (without physically moving the ,v files), then you'll lose history without importing those directories. If this is the case it would be better to delete the directories from master having done the conversion rather than exclude the directories altogether. (In reply to comment #12) > What do you mean by exclude? If the content was moved within the repo (without > physically moving the ,v files), then you'll lose history without importing > those directories. If this is the case it would be better to delete the > directories from master having done the conversion rather than exclude the > directories altogether. Our conversion process involves creating a copy of the CVS repository, and then running the conversion on that copy. When we exclude bundles, we simply delete that entire subtree from the CVS copy before running the conversion tool. These fragments only contain binaries from old releases that will just bloat our Git repository. (In reply to comment #8) > http://wiki.eclipse.org/E4/Git#Submitting_for_a_build contains instructions and > links to scripts. > Andrew, you have the best release scripts on build.eclipse.org. Could you update the ones in the releng/org.eclipse.e4.builder/scripts directory to those? You said you needed to make sure they worked with Orion too. PW (In reply to comment #14) > (In reply to comment #8) > > http://wiki.eclipse.org/E4/Git#Submitting_for_a_build contains instructions and > > links to scripts. > > > > Andrew, you have the best release scripts on build.eclipse.org. Could you > update the ones in the releng/org.eclipse.e4.builder/scripts directory to > those? You said you needed to make sure they worked with Orion too. > > PW I have released new versions of these scripts and updated the wiki page with a new description of their use. ding ding your repo is ready :-) your_comitter_id@git.eclipse.org:/gitroot/platform/eclipse.platform.resources I deleted my local repo within Eclipse and re-replicated just to be sure. Let me know if you see any issues. Also, please update the map files in HEAD to point to the git repository so I can run a test build. (In reply to comment #16) > Let me know if you see any issues. Also, please update the map files in HEAD > to point to the git repository so I can run a test build. I have updated core.map. Thanks John, test build has started here https://hudson.eclipse.org/hudson/view/Eclipse%20and%20Equinox/job/eclipse-equinox-test-N/361/ There was a typo in the maps which I fixed. New test build here https://hudson.eclipse.org/hudson/view/Eclipse%20and%20Equinox/job/eclipse-equinox-test-N/362/ (In reply to comment #16) > Let me know if you see any issues. I cloned the repo and I saw the following project is also empty: - org.eclipse.core.filesystem.macosx.ppc It is not crossed out on http://wiki.eclipse.org/Platform-releng/Git_Migration_Granularity so probably it should be crossed out and excluded from migration (if it is not too late for that). There is also one nonempty project that is crossed out and was migrated to git: - org.eclipse.core.resources.win32.ia64 I think that this one should be just un-crossed out. (In reply to comment #20) > I cloned the repo and I saw the following project is also empty: > - org.eclipse.core.filesystem.macosx.ppc > It is not crossed out on > http://wiki.eclipse.org/Platform-releng/Git_Migration_Granularity so probably it > should be crossed out and excluded from migration (if it is not too late for > that). The functionality was moved to org.eclipse.core.filesystem.macosx. > There is also one nonempty project that is crossed out and was migrated to git: > - org.eclipse.core.resources.win32.ia64 > I think that this one should be just un-crossed out. See comment 10. This project should be in our Git repo. So it is just wrongly crossed out on the wiki. I fixed the wiki. So the repo is okay? We were able to build these bundles from git for build N20110818-2000. If you are happy with the conversion, please update the maps in the R3_7_maintenance stream as well to reflect the new git location. (In reply to comment #22) > So the repo is okay? Yes. We just need to delete later one empty bundle mentioned by Szymon P. > We were able to build these bundles from git for build N20110818-2000. If you > are happy with the conversion, please update the maps in the R3_7_maintenance > stream as well to reflect the new git location. The map in the R3_7_maintenance stream is updated. According to Kim we may close the bug now. Thanks Kim! This is very cool, thanks all! |