Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 342843 - [server] REST API for "git merge" should return result of the merge
Summary: [server] REST API for "git merge" should return result of the merge
Status: RESOLVED FIXED
Alias: None
Product: Orion
Classification: ECD
Component: Client (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 0.2   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-14 10:26 EDT by Tomasz Zarna CLA
Modified: 2011-09-01 11:41 EDT (History)
1 user (show)

See Also:

Attachments
mylyn/context/zip (92.10 KB, application/octet-stream)
2011-04-20 06:53 EDT, Tomasz Zarna CLA 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tomasz Zarna CLA 2011-04-14 10:26:42 EDT 
Currently, if the merge operation wasn't interrupted with an exception the response will always be 200 (OK), no matter if the merge resulted in a conflict, went fine or failed. The merge result should be part of the response.
Comment 1 Tomasz Zarna CLA 2011-04-20 06:53:55 EDT 
Created attachment 193682 [details]
mylyn/context/zip
Comment 2 Tomasz Zarna CLA 2011-04-20 06:54:38 EDT 
Fixed with http://git.eclipse.org/c/e4/org.eclipse.orion.server.git/commit/?id=b1769b1c84d5e7e1a32115da176a055a5d8250dc. Look for "Result" in JSON response.