Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 324517 - Merge command has conflicting handlers
Summary: Merge command has conflicting handlers
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 0.9.0   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: 0.9.0-M3   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-09-04 12:49 EDT by Benjamin Muskalla CLA
Modified: 2010-09-30 10:51 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 Benjamin Muskalla CLA 2010-09-04 12:49:07 EDT 
This happens when starting the workbench with current Egit installed.

!ENTRY org.eclipse.ui.workbench 2 0 2010-09-04 18:39:42.642
!MESSAGE A handler conflict occurred.  This may disable some commands.
!SUBENTRY 1 org.eclipse.ui.workbench 2 0 2010-09-04 18:39:42.642
!MESSAGE Conflict for 'org.eclipse.egit.ui.RepositoriesViewMerge':
HandlerActivation(commandId=org.eclipse.egit.ui.RepositoriesViewMerge,
	handler=org.eclipse.egit.ui.internal.actions.MergeAction,
	expression=org.eclipse.core.internal.expressions.IterateExpression@90d64bbe,sourcePriority=1073741824)
HandlerActivation(commandId=org.eclipse.egit.ui.RepositoriesViewMerge,
	handler=org.eclipse.egit.ui.internal.repository.tree.command.MergeCommand,
	expression=org.eclipse.core.internal.expressions.IterateExpression@6571e802,sourcePriority=1073741824)
Comment 1 Mathias Kinzler CLA 2010-09-08 04:46:16 EDT 
Code review at http://egit.eclipse.org/r/#change,1558
Comment 2 Mathias Kinzler CLA 2010-09-30 10:51:26 EDT 
Merged as 729cc9fc0b7c84518b6a1d3e031a1a881c48ef59