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

Bug 510993

Summary:	Orion stuck loading forever after failed merge
Product:	[ECD] Orion	Reporter:	Michael Rennie <Michael_Rennie>
Component:	Git	Assignee:	Michael Rennie <Michael_Rennie>
Status:	RESOLVED WORKSFORME	QA Contact:
Severity:	major
Priority:	P2	CC:	remy.suen, steve_northover
Version:	13.0
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Michael Rennie

2017-01-24 16:35:53 EST

An email report came in against orionhub, where the user tried to do a merge, that failed, and was then stuck in the "forever loading" state. They managed to get out of the state by deleting the project.

We put a fix in 14.0 that responds to bad workspace / pref state (bug 502292), so we should see if we can reproduce / confirm if it also fixes this problem.

Comment 1 Steve Northover

2017-01-25 16:56:28 EST

Please confirm the fix and close this bug.

Comment 2 Michael Rennie

2017-01-30 20:40:55 EST

I tested on orion.eclipse.org and orionhub.org, trying many failed merges and could not get into the failure state.

On orionhub.org I did managed to get an error in the console with failed merges:

"Failed to load resource: the server responded with a status of 400 (Bad Request)"

Without more information, I'm not sure what we can do here.