Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 332661 - Cherry pick: error handling in case of conflicts
Summary: Cherry pick: error handling in case of conflicts
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 0.10.0   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-12-15 12:12 EST by Jens Baumgart CLA
Modified: 2011-06-28 07:58 EDT (History)
1 user (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 Jens Baumgart CLA 2010-12-15 12:12:31 EST 
Perform a cherry pick that aborts due to conflicts.

An error is logged but no message is shown to the user.
I think no error should be logged but a message should be shown.

org.eclipse.core.commands.ExecutionException: The cherry-pick failed
at org.eclipse.egit.ui.internal.history.command.CherryPickHandler.execute(CherryPickHandler.java:41)
at org.eclipse.ui.internal.handlers.HandlerProxy.execute(HandlerProxy.java:293)
at org.eclipse.core.commands.Command.executeWithChecks(Command.java:476)
at org.eclipse.core.commands.ParameterizedCommand.executeWithChecks(ParameterizedCommand.java:508)
at org.eclipse.ui.internal.handlers.HandlerService.executeCommand(HandlerService.java:169)
Comment 1 Stefan Lay CLA 2011-06-28 07:58:12 EDT 
Fixed with d9dcc70255dacea97d1681c4b785c63b5b17ddde