Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 387615 - On Checkout Conflicts Dialog "Reset..." and "Commit..." do nothing in Juno
Summary: On Checkout Conflicts Dialog "Reset..." and "Commit..." do nothing in Juno
Status: VERIFIED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 2.1   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-08-20 10:52 EDT by Stefan Lay CLA
Modified: 2012-08-28 06:33 EDT (History)
2 users (show)

See Also:

Attachments
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 Stefan Lay CLA 2012-08-20 10:52:20 EDT 
I try to checkout a branch or commit and get a checkout conflict. A Dialog with title "Checkout Conflicts" opens. Here the buttons "Reset..." and "Commit..." do not work since Juno.

It looks as if the root cause is the same as or similar to that in bug 384545. Here no handler is found at all when the method LegacyHandlerService.executeCommandInContext is called, in bug 384545 another handler is found.

Note that the "Stash" button works.
Comment 1 Stefan Lay CLA 2012-08-21 06:47:45 EDT 
With https://git.eclipse.org/r/#/c/7321/ the problem does not occur anymore because there the "Reset..." and "Commit..." functionality is called directly without using the eclipse commands.
Comment 2 Matthias Sohn CLA 2012-08-27 04:54:16 EDT 
merged as ed119527f1d30405bdf8d891206a49c0f4933f35
Comment 3 Dani Megert CLA 2012-08-28 06:33:39 EDT 
Verified in 2.1.0.201208280725.