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

Bug 332661

Summary: Cherry pick: error handling in case of conflicts
Product: [Technology] EGit Reporter: Jens Baumgart <jens.baumgart>
Component: UIAssignee: Project Inbox <egit.ui-inbox>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: stefan.lay
Version: 0.10.0   
Target Milestone: ---   
Hardware: PC   
OS: Windows 7   
Whiteboard:

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