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

Bug 508584

Summary: Yellow 'ALREADY_UPDATE' status message when merging nothing new to the active branch
Product: [ECD] Orion Reporter: Remy Suen <remy.suen>
Component: GitAssignee: Remy Suen <remy.suen>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: Michael_Rennie
Version: 13.0   
Target Milestone: 14.0   
Hardware: PC   
OS: Windows NT   
See Also: https://git.eclipse.org/r/88245
https://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=69722c699faa7a3fc4f2dc62e55e665a1bb8837f
Whiteboard:

Description Remy Suen CLA 2016-12-02 04:21:34 EST 
orion.eclipse.org

1. Ensure you have no incoming or outgoing changes.
2. Open the 'Git' page.
3. Click the middle 'Merge the content from the branch to your active branch' tool item in the 'Incoming (0)' tree node.
4. After some processing, you will get a yellow 'ALREADY_UPDATE' status message. While human-readable, this is a bit in-your-face.

Trying this in OrionHub gives me a green 'Merging origin/master succeeded' status message.
Comment 1 Remy Suen CLA 2017-01-08 22:13:56 EST 
If you look at the gitCommands.js file, you will see that we are expecting an "ALREADY_UP_TO_DATE" string.

https://github.com/eclipse/orion.client/blob/a97156cb8b1c4e57673308a896c2f37d50c25917/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js#L745

That's a constant defined in JGit.

http://download.eclipse.org/jgit/site/4.6.0.201612231935-r/apidocs/org/eclipse/jgit/api/MergeResult.MergeStatus.html#ALREADY_UP_TO_DATE

The fix is to return the same string in commit.js if we detect the same scenario after a merge.
Comment 2 Eclipse Genie CLA 2017-01-08 22:14:49 EST 
New Gerrit change created: https://git.eclipse.org/r/88245
Comment 4 Michael Rennie CLA 2017-01-09 11:08:40 EST 
Merged, thanks Remy!