| Summary: | Release fails when non-git map entries encountered | ||
|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | John Arthorne <john.arthorne> |
| Component: | UI | Assignee: | Project Inbox <egit.ui-inbox> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | remy.suen |
| Version: | 0.12 | ||
| Target Milestone: | 0.12 | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| Whiteboard: | |||
|
Description
John Arthorne
Attempting to push a fix to gerrit, but I get an error "[remote rejected] no common ancestry". Not sure what this means because I pulled immediately prior to creating the fix. Here is the error stack: java.lang.IllegalArgumentException: at org.eclipse.core.runtime.Assert.isLegal(Assert.java:63) at org.eclipse.core.runtime.Assert.isLegal(Assert.java:47) at org.eclipse.core.runtime.Status.setPlugin(Status.java:237) at org.eclipse.core.runtime.Status.<init>(Status.java:129) at org.eclipse.egit.internal.relengtools.MapContentDocument.updateTag(MapContentDocument.java:60) at org.eclipse.egit.internal.relengtools.MapFileCompareEditorInput.constructDocuments(MapFileCompareEditorInput.java:173) at org.eclipse.egit.internal.relengtools.MapFileCompareEditorInput.updateInput(MapFileCompareEditorInput.java:84) at org.eclipse.egit.internal.relengtools.MapFileComparePage.setVisible(MapFileComparePage.java:47) I have pushed a fix to gerrit: http://egit.eclipse.org/r/#change,3920 All the other changes appear to be formatting and automatic code cleanup settings that were already configured for that project. I didn't explicitly do any other cleanup or formatting of the code. I just made the one line change. Actually that isn't the right fix. It fixes the error handling but not the underlying problem. Another patch coming... Try this one: http://egit.eclipse.org/r/#change,3921 My fix was released. See: http://egit.eclipse.org/r/#change,3937 |