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

Bug 333880

Summary: RevertCommand/CherryPickCommand fails with error in case of conflicts
Product: [Technology] EGit Reporter: Matthias Sohn <matthias.sohn>
Component: UIAssignee: Jens Baumgart <jens.baumgart>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: caniszczyk, christian.halstrick, jens.baumgart, malaperle, mathias.kinzler, robin.rosenberg, steffen.pingel
Version: 0.10.0   
Target Milestone: 1.1-M1   
Hardware: All   
OS: All   
Whiteboard:

Description Matthias Sohn CLA 2011-01-10 11:01:25 EST 
If merge used by RevertCommand ends up with conflicts, the conflicting files get proper conflict markers but the EGit UI doesn't show that conflicts need to be resolved but instead an error is logged in the Eclipse error log:

Failed to execute item org.eclipse.egit.ui.history.Revert

org.eclipse.core.commands.ExecutionException: The revert failed
at org.eclipse.egit.ui.internal.history.command.RevertHandler.execute(RevertHandler.java:46)
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 Robin Rosenberg CLA 2011-01-11 00:31:42 EST 
The same goes for the CherryPickComman.

f93d2c3338289875a23bef1280829d892ca8b476
Comment 2 Robin Rosenberg CLA 2011-01-11 00:32:45 EST 
f93d2c3338289875a23bef1280829d892ca8b476 is the comit when I believe the error handling was broken.
Comment 3 Jens Baumgart CLA 2011-07-11 05:15:32 EDT 
Fix proposed: http://egit.eclipse.org/r/3861
Comment 4 Chris Aniszczyk CLA 2011-07-12 12:00:19 EDT 
Fixed in master.
Comment 5 Jens Baumgart CLA 2011-07-13 04:25:39 EDT 
*** Bug 351542 has been marked as a duplicate of this bug. ***