Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 347441

Summary:	Rebase abort without good explanation
Product:	[Technology] EGit	Reporter:	Robin Rosenberg <robin.rosenberg>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	NEW ---	QA Contact:
Severity:	normal
Priority:	P3	CC:	robin
Version:	unspecified
Target Milestone:	---
Hardware:	Macintosh
OS:	Mac OS X
Whiteboard:

Description Robin Rosenberg

2011-05-27 08:43:52 EDT

What steps will reproduce the problem?
1.  Convert a project using M2Eclipse
2.  Rebase onto an updated remote


Shortly after rebase starts, the message "Aborting rebase..." appears
and finally and error dialog with the message "Rebase aborted" possibly appears.
If it doesn't the error log has an INFO entry: "Result status: FAILED" without an
stack trace.

The state of the repository looks fine.

With M2Eclipse installed I got no error message, without it I got only the INFO
log entry.

It seems this problem appears due to a workspace referesh problem that should be reported
to the user and let the user resolve the issue somehow.


-- Error Details --
Date: Fri May 27 14:12:35 CEST 2011
Message: File not found: /Users/me/Cedar/IrisOldFiltered/.settings/org.maven.ide.eclipse.prefs.
Severity: Error
Product: Eclipse SDK 3.6.2.v201102101200 (org.eclipse.sdk.ide)
Plugin: org.eclipse.core.filesystem
Session Data:
eclipse.buildId=M20110210-1200
java.version=1.6.0_25
java.vendor=Apple Inc.
BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=sv_SE
Framework arguments:  -keyring /Users/me/.eclipse_keyring -showlocation
Command-line arguments:  -os macosx -ws cocoa -arch x86_64 -data /Users/me/Cedar -keyring /Users/me/.eclipse_keyring -showlocation


Exception Stack Trace:
java.io.FileNotFoundException: /Users/me/Cedar/IrisOldFiltered/.settings/org.maven.ide.eclipse.prefs (No such file or directory)
at java.io.FileInputStream.open(Native Method)
at java.io.FileInputStream.<init>(FileInputStream.java:120)
at org.eclipse.core.internal.filesystem.local.LocalFile.openInputStream(LocalFile.java:362)
at org.eclipse.core.internal.localstore.FileSystemResourceManager.read(FileSystemResourceManager.java:702)
at org.eclipse.core.internal.resources.File.getContents(File.java:293)
at org.eclipse.core.internal.resources.ProjectPreferences.load(ProjectPreferences.java:508)
at org.eclipse.core.internal.preferences.EclipsePreferences.create(EclipsePreferences.java:307)
at org.eclipse.core.internal.preferences.EclipsePreferences.getChild(EclipsePreferences.java:412)
at org.eclipse.core.internal.preferences.EclipsePreferences.internalNode(EclipsePreferences.java:541)
at org.eclipse.core.internal.preferences.EclipsePreferences.node(EclipsePreferences.java:669)
at org.eclipse.core.internal.resources.ProjectPreferences.deleted(ProjectPreferences.java:120)
at org.eclipse.core.internal.resources.ProjectPreferences.deleted(ProjectPreferences.java:171)
at org.eclipse.core.internal.resources.Resource.deleteResource(Resource.java:852)
at org.eclipse.core.internal.localstore.RefreshLocalVisitor.deleteResource(RefreshLocalVisitor.java:101)
at org.eclipse.core.internal.localstore.RefreshLocalAliasVisitor.deleteResource(RefreshLocalAliasVisitor.java:43)
at org.eclipse.core.internal.localstore.RefreshLocalVisitor.synchronizeExistence(RefreshLocalVisitor.java:189)
at org.eclipse.core.internal.localstore.RefreshLocalVisitor.visit(RefreshLocalVisitor.java:293)
at org.eclipse.core.internal.localstore.UnifiedTree.accept(UnifiedTree.java:108)
at org.eclipse.core.internal.localstore.FileSystemResourceManager.refreshResource(FileSystemResourceManager.java:824)
at org.eclipse.core.internal.localstore.FileSystemResourceManager.refresh(FileSystemResourceManager.java:808)
at org.eclipse.core.internal.resources.Resource.refreshLocal(Resource.java:1663)
at org.eclipse.ui.actions.RefreshAction.refreshResource(RefreshAction.java:296)
at org.eclipse.ui.actions.RefreshAction$3.execute(RefreshAction.java:248)
at org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:106)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1975)
at org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:118)
at org.eclipse.jdt.ui.actions.RefreshAction$WrappedWorkbenchRefreshAction.run(RefreshAction.java:112)
at org.eclipse.jdt.ui.actions.RefreshAction.performRefresh(RefreshAction.java:190)
at org.eclipse.jdt.ui.actions.RefreshAction.access$0(RefreshAction.java:185)
at org.eclipse.jdt.ui.actions.RefreshAction$1.run(RefreshAction.java:179)
at org.eclipse.jdt.internal.core.BatchOperation.executeOperation(BatchOperation.java:39)
at org.eclipse.jdt.internal.core.JavaModelOperation.run(JavaModelOperation.java:728)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1975)
at org.eclipse.jdt.core.JavaCore.run(JavaCore.java:4777)
at org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter.run(WorkbenchRunnableAdapter.java:106)
at org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter$1.run(WorkbenchRunnableAdapter.java:121)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)

Comment 1 Robin Rosenberg

2011-05-27 09:12:49 EDT

Here are the reflogs for HEAD

Rebase (aborted) in Eclipse
3b454b9ccf6fd1c4b4e671c215a7c4659205a657 a193eea89f944a0882b9fdb5f1422591b4ecb80d Robin Rosenberg <robin.rosenberg@dewire.com> 1306500350 +0200	
a193eea89f944a0882b9fdb5f1422591b4ecb80d 3b454b9ccf6fd1c4b4e671c215a7c4659205a657 Robin Rosenberg <robin.rosenberg@dewire.com> 1306500357 +0200	

Same rebase (completed) in C Git.
3b454b9ccf6fd1c4b4e671c215a7c4659205a657 a193eea89f944a0882b9fdb5f1422591b4ecb80d Robin Rosenberg <robin.rosenberg@dewire.com> 1306500421 +0200	checkout: moving from master to a193eea89f944a0882b9fdb5f1422591b4ecb80d^0
a193eea89f944a0882b9fdb5f1422591b4ecb80d 37e9f91683d7d17049b5a535353c31f847e67f13 Robin Rosenberg <robin.rosenberg@dewire.com> 1306500446 +0200	rebase: TEMP: disable MAC license check
37e9f91683d7d17049b5a535353c31f847e67f13 b7a0801d1e194dd1590794aeb74c8602f62b5cd2 Robin Rosenberg <robin.rosenberg@dewire.com> 1306500446 +0200	rebase: Add XML namespace declarations to docbook files
b7a0801d1e194dd1590794aeb74c8602f62b5cd2 84e1e4349fc6ca0324c1b116feb6a2c0587ef972 Robin Rosenberg <robin.rosenberg@dewire.com> 1306500498 +0200	rebase: Convert to a Maven M2Eclipse project
84e1e4349fc6ca0324c1b116feb6a2c0587ef972 4a64313ef5783828936a95a42f3c2426ee17b71c Robin Rosenberg <robin.rosenberg@dewire.com> 1306500498 +0200	rebase: Add dependenvie from Maven

Comment 2 Robin Stocker

2013-03-09 06:49:39 EST

Is this still present? It would be useful to have more detailed steps to reproduce this.

Comment 3 Robin Rosenberg

2013-03-09 09:30:34 EST

(In reply to comment #2)
> Is this still present? It would be useful to have more detailed steps to
> reproduce this.

I think it is timing dependent, hence the guess regarding workspace refresh. This is an old report, but I'm not sure it's been solved. Rebase in general seems not be as stable as one would want it to be, partly due to interaction with workspace refresh and automatic builds. I thinks someone suggested rebuilds should be disabled during refresh, which is probably a good idea.