| Summary: | [CBI] Respond to changes from bug 395281 | ||||||
|---|---|---|---|---|---|---|---|
| Product: | [Eclipse Project] Platform | Reporter: | Paul Webster <pwebster> | ||||
| Component: | Releng | Assignee: | Platform-Releng-Inbox <platform-releng-inbox> | ||||
| Status: | RESOLVED FIXED | QA Contact: | |||||
| Severity: | critical | ||||||
| Priority: | P3 | CC: | david_williams, john.arthorne, thanh.ha | ||||
| Version: | 4.2.1 | ||||||
| Target Milestone: | 4.3 M5 | ||||||
| Hardware: | PC | ||||||
| OS: | Linux | ||||||
| Whiteboard: | |||||||
| Attachments: |
|
||||||
|
Description
Paul Webster
From the patch, this is for docs only? Or was that meant as an example? And, from the patch for master (4.3), the repository points back to 4.2 repo? (In reply to comment #1) > From the patch, this is for docs only? Or was that meant as an example? A quick find/grep only showed those poms had eclipserun, so I'm hoping that's all of them. > And, from the patch for master (4.3), the repository points back to 4.2 repo? For now I just set it to (what I presume is) 4.2.1 (this is the equivalent of specifying a basebuilder). Eventually we might set it to the last milestone of our 4.3 stream, but that wouldn't be necessary for now. PW I've committed and pushed these changes to master. http://git.eclipse.org/c/platform/eclipse.platform.common.git/commit/?id=e2b7afd2f7fbc40c33ef606fdcf9576a216fb1ff The patch didn't really apply, in Eclipse IDE, but I just added the the repositories sections "by hand". I'm assuming, unless I hear otherwise the 38 and 42 streams will also point to the 42 repository. 38 commit http://git.eclipse.org/c/platform/eclipse.platform.common.git/commit/?h=R3_8_maintenance&id=9a9e29a68139eb1cbd791539311651b20e14fdfc 42 commit http://git.eclipse.org/c/platform/eclipse.platform.common.git/commit/?id=9a9e29a68139eb1cbd791539311651b20e14fdfc&h=R4_2_maintenance Work may not be done here ... or, I did it wrong? Using the "generic build instructions", I get this error: Failed to execute goal org.eclipse.tycho.extras:tycho-eclipserun-plugin:0.17.0-SNAPSHOT:eclipse-run (default) on project org.eclipse.platform.doc.isv: The parameters 'repositories' for goal org.eclipse.tycho.extras:tycho-eclipserun-plugin:0.17.0-SNAPSHOT:eclipse-run are missing or invalid Does this mean a commit of common repository submodule must be made to the aggregator? If so ... mind Thanh (or Paul) ... mind spelling that out for me? Yes, the aggregator would have to be updated to point to the commit that you just did. ex: both the aggregator and e.p.common point to master, and has the doc commit. Then in the aggregator: git add eclipse.platform.common git commit git push origin HEAD That will make this commit generally available. PW Thanks Paul. Git 101 question of the day: is git push origin HEAD equivalent to git push origin : ? I've been using the latter, lately, from CLI, and seems they give slightly different messages in response, such as ... HEAD --> R4_2_maintenance ... vs. ... R4_2_maintenance --> R4_2_maintenance so ... just thought I'd ask. (In reply to comment #7) > Thanks Paul. > > Git 101 question of the day: > > is > > git push origin HEAD > > equivalent to > > git push origin : > > ? I think so. I know I switched from git push to git push origin HEAD because the first form tried to push up any remote branches (and then had most of them fail because they weren't up to date). Your form must focus on the branch (as opposed to HEAD). PW |