Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 347581 - RC2 GIT/Subversive Command conflict
Summary: RC2 GIT/Subversive Command conflict
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows Vista
: P3 normal (vote)
Target Milestone: 1.3   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-29 13:24 EDT by Ed Willink CLA
Modified: 2012-04-26 02:49 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 Ed Willink CLA 2011-05-29 13:24:11 EDT 
On RC2 I get

!MESSAGE A conflict occurred for ALT+CTRL+I:
Binding(ALT+CTRL+I,
	ParameterizedCommand(Command(org.eclipse.egit.ui.team.Ignore,Ignore,
		,
		Category(org.eclipse.egit.ui.commandCategory,Git,null,true),
		org.eclipse.egit.ui.internal.actions.IgnoreActionHandler,
		,,true),null),
	org.eclipse.ui.defaultAcceleratorConfiguration,
	org.eclipse.ui.contexts.window,,,system)
Binding(ALT+CTRL+I,
	ParameterizedCommand(Command(org.eclipse.team.svn.ui.command.AddToSVNIgnoreCommand,Add to svn:ignore...,
		,
		Category(org.eclipse.team.svn.ui.command.category,SVN,null,true),
		,
		,,true),null),
	org.eclipse.ui.defaultAcceleratorConfiguration,
	org.eclipse.ui.contexts.window,,,system)
!SUBENTRY 1 org.eclipse.jface 2 0 2011-05-29 18:13:06.277
!MESSAGE A conflict occurred for ALT+CTRL+C:
Binding(ALT+CTRL+C,
	ParameterizedCommand(Command(org.eclipse.egit.ui.team.Commit,Commit,
		,
		Category(org.eclipse.egit.ui.commandCategory,Git,null,true),
		,
		,,true),null),
	org.eclipse.ui.defaultAcceleratorConfiguration,
	org.eclipse.ui.contexts.window,,,system)
Binding(ALT+CTRL+C,
	ParameterizedCommand(Command(org.eclipse.team.svn.ui.command.CommitCommand,Commit...,
		,
		Category(org.eclipse.team.svn.ui.command.category,SVN,null,true),
		,
		,,true),null),
	org.eclipse.ui.defaultAcceleratorConfiguration,
	org.eclipse.ui.contexts.window,,,system)

Presumably nertither GIT niot Subcversive has scoped the command definitions to the active team provider.
Comment 1 Matthias Sohn CLA 2012-04-19 03:10:14 EDT 
this is not a JGit problem and also it shouldn't occur any longer in current 2.0.0-SNAPSHOT as these keybindings have been removed
Comment 2 Ed Willink CLA 2012-04-19 03:25:09 EDT 
Reads like FIXED not WORKSFORME; a code change causes a reproducible problem to be cured.
Comment 3 Matthias Sohn CLA 2012-04-26 02:49:39 EDT 
that's right Ed, fixed from WORKSFORME to FIXED