Bugzilla – Full Text Bug Listing
| Summary: | test migration of org.eclipse.equinox.p2 to git | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Community | Reporter: | Kim Moir <kim.moir> | ||||||
| Component: | Git | Assignee: | Eclipse Webmaster <webmaster> | ||||||
| Status: | RESOLVED INVALID | QA Contact: | |||||||
| Severity: | normal | ||||||||
| Priority: | P3 | CC: | dj.houghton, d_a_carver, jamesblackburn+eclipse, katya.stoycheva, matthew, pwebster, tjwatson | ||||||
| Version: | unspecified | ||||||||
| Target Milestone: | --- | ||||||||
| Hardware: | PC | ||||||||
| OS: | Windows XP | ||||||||
| Whiteboard: | |||||||||
| Bug Depends on: | |||||||||
| Bug Blocks: | 345479 | ||||||||
| Attachments: |
|
||||||||
|
Description
Kim Moir
Ok, I've created /gitroot/p2 to hold this repo, and given you ownership. Do you want to do the import or would you prefer we do it? -M. I wasn't able to see into that directory: drwxr-x--- 2 kmoir root 48 2011-05-12 13:08 p2 Also, the wiki suggests using cvs2git (part of svn2git) on build.eclipse.org, but those executables don't appear to exist: http://wiki.eclipse.org/Git/Migrating_to_Git#Using_cvs2git Was svn2git installed at one time on build.eclipse.org and lost in an upgrade? I did see the CDT guys wrote down a lot of their experiences using cvs2git in bug 316208 PW I've updated the group permissions, and re-installed svn2git (must have been lost with the build crash last year). -M. Have we made progress here? I ran a test migration of the p2 bundles yesterday following the instructions that the cdt project used in bug 316208. It looks like the export worked, but the import to git did not. I'm working on it :-) Created attachment 197716 [details]
output from the git import
Actually the migration seemed to work after all. Trying a build from this copy now. (In reply to comment #6) Those warnings are weird - I've never seen that before... I would guess those tags are broken? Are you using head of cvs2git? Also worth running cvs2svn-verify agains the git and CVS repo to check that they're identical. The cvs2svn mailing list is quite responsive if you're encountering an issue. Thanks James, I have to run the verify step. I'm using your recipe from bug 316208. Yes, I downloaded head of cvs2git yesterday. Thanks for the suggestions! Test build is running here with p2 bundles from git repository that I migrated as a test yesterday. https://hudson.eclipse.org/hudson/view/Eclipse%20and%20Equinox/job/eclipse-equinox-git-test-N/15/ Not sure if the p2 projects are organized in git as they should be in /gitroot/p2, perhaps an p2 committer could comment. Created attachment 198018 [details] log from running verify-cvs2svn.py 104 failures from comparing repos. Not really sure how to fix this. Here is the command I used to compare the repos. http://wiki.eclipse.org/Platform-releng/Juno_Git_Migration_Recipe#Verify_repo (In reply to comment #11) > Created attachment 198018 [details] > log from running verify-cvs2svn.py > > 104 failures from comparing repos. Not really sure how to fix this. Interesting. Nearly all the issues are incorrect expansion of $Id. The file content is otherwise correct. Note that in git the $Id tags will never change again so in some sense you don't need these in the future: after all what is revision 1.1? That said, cvs2git can get this right. I think it depends on which RCSRevisionReader you choose and how you configure keyword expansion: http://cvs2svn.tigris.org/cvs2svn.html In CDT we had a two instances of incorrect $Ids, which I've ignored... The other issue appears to be that the line-endings are broken on the Version.java, as reachable by some tags in the repo. The line-ending seems to be just '\r'. The import will likely have used the unix standard line-ending (which matches HEAD). If you really wanted you can make the import match the original CVS: http://cvs2svn.tigris.org/faq.html#eol-fixup However in this case, I think that would be wrong. For text files you really want all the text files in the repo to have the same line-ending. When the local working copy is checked out, line-endings are updated to match the user's preference (and the reverse on commit). So in this case it looks to me like the import is _better_ than the original :) It should be relatively straightforward to tweak the diff in cvs2git to such that the '\r' ending is ignored if you decide you that '\n' is correct for text files in your git repo. I tried cloning the test repo and the operation seems to finish successfully but afterwards most of the projects (when imported in Eclipse) don’t compile properly. For example p2.repository doesn’t see some of the exported packages by p2.core though p2.core has correct manifest/project structure and no compilation errors. Is that a known issue or something on my side went wrong? I don't know if this was the state of the p2 repository when I converted it. Do any other p2 committers see these problems? Do you have all your dependencies loaded in your workspace, for instance equinox.common which resides outside the p2 repository? (In reply to comment #13) > I tried cloning the test repo and the operation seems to finish successfully > but afterwards most of the projects (when imported in Eclipse) don’t compile > properly. > For example p2.repository doesn’t see some of the exported packages by p2.core > though p2.core has correct manifest/project structure and no compilation > errors. > > Is that a known issue or something on my side went wrong? I cloned and imported, what you may have run into is two projects have the name: org.eclipse.equinox.p2.repository One of the projects, org.eclipse.equinox.p2.repository.impl isn't part of the p2 psf, and appears to be an unused project referring to old packages that no longer exist (eg org.eclipse.equinox.internal.provisional.p2.core). When we update the psf people shouldn't run into it (though maybe we should just remove it if it has no use) (In reply to comment #15) > One of the projects, org.eclipse.equinox.p2.repository.impl isn't part of the > p2 psf, and appears to be an unused project referring to old packages that no > longer exist (eg org.eclipse.equinox.internal.provisional.p2.core). When we > update the psf people shouldn't run into it (though maybe we should just remove > it if it has no use) What you described is probably the reason for my compilation issues - I imported just a couple of projects instead of all and everything compiles now. Thank you for the hint. p2 has now been fully migrated to git. |