Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 346751 - [server] Got into a broken state while self-hosting
Summary: [server] Got into a broken state while self-hosting
Status: RESOLVED WONTFIX
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: 0.2   Edit
Hardware: PC Mac OS X
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-20 14:04 EDT by Boris Bokowski CLA
Modified: 2015-05-05 14:46 EDT (History)
1 user (show)

See Also:

Attachments
zip file (3.81 MB, application/zip)
2011-05-20 14:05 EDT, Boris Bokowski 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 Boris Bokowski CLA 2011-05-20 14:04:08 EDT 
I made a commit on orion.eclipse.org and pushed it. Then a bit later I made another change, committed it, and tried to push it. That failed because I wasn't up to date so I fetched the latest and clicked on Merge. This didn't work, and in the console I got an error saying that a POST request returned a 500 response. Looking at that response using the Web Inspector (why wouldn't it print all the information to the console??) gave me this: "{"HttpCode":500,"DetailedMessage":"Multiple merge bases for:\n ee53c1c64c9442f54071239e478785bcab1f…"

I downloaded the complete directory including the .git folder as a zip and will be attaching it here.
Comment 1 Boris Bokowski CLA 2011-05-20 14:05:34 EDT 
Created attachment 196241 [details]
zip file

Attachment is too large for Bugzilla and I had to check the "Big File" checkbox. Get it while you still can! :-)
Comment 2 John Arthorne CLA 2015-05-05 14:46:58 EDT 
Closing as part of a mass clean up of inactive bugs. Please reopen if this problem still occurs or is relevant to you. For more details see:

https://dev.eclipse.org/mhonarc/lists/orion-dev/msg03444.html