Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 371617 - Merge command errors show too little user feedback
Summary: Merge command errors show too little user feedback
Status: CLOSED DUPLICATE of bug 357860
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: 0.4   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 0.5   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-02-15 07:26 EST by Malgorzata Janczarska CLA
Modified: 2012-02-15 10:58 EST (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Malgorzata Janczarska CLA 2012-02-15 07:26:39 EST
Some merge errors show very little user feedback. For instance when merge failed because there are uncommitted changes conflicting with the incoming changes we only get "FAILED" with no other details.
In this case there is the feedback from the server with code 200:
{
  "FailingPaths": {"gotom.js": "DIRTY_INDEX"},
  "Result": "FAILED"
}

But client does not understand this information and displays only "FAILED" without even marking is as a failure. We can two ways to solve this:
* the response from server is in the format of ServerStatus with corresponding httpCode - this is well established format that client should hopefully understand
* we will establish a documented format of error feedback from the server and implement handling it on the client side
Comment 1 Szymon Brandys CLA 2012-02-15 07:32:23 EST
I think we can fix that during the general gitCommand.js polish in .5.
Comment 2 John Arthorne CLA 2012-02-15 10:58:19 EST

*** This bug has been marked as a duplicate of bug 357860 ***