Bug 359788

Description Lennart S 2011-10-04 02:55:09 EDT

Build Identifier: M20110909-1335

I used a nightly update:
  Eclipse EGit	1.2.0.201109300915	org.eclipse.egit.feature.group	Eclipse EGit
  Eclipse JGit	1.2.0.201109282235	org.eclipse.jgit.feature.group	Eclipse JGit

Could be same as Bug 333091

Reproducible: Always

Steps to Reproduce:
How to reproduce:
C:\views>git init no_merge_cherry_pick
Initialized empty Git repository in C:/views/no_merge_cherry_pick/.git/

C:\views>cd no_merge_cherry_pick

C:\views\no_merge_cherry_pick>echo "first" > file1.txt

C:\views\no_merge_cherry_pick>git add file1.txt

C:\views\no_merge_cherry_pick>git commit -m "first commit"
[master (root-commit) 5293dab] first commit
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 file1.txt

Import project into Eclipse:
Switch to Git repository Perspective
Click on button “Add an existing local Git Repository to this view”
Browse to “C:\views\no_merge_cherry_pick”, and click Finish to add the repository to the repository list
Right click on repository and select “Import projects...”
Select “Import as general project” and press “Next” and than “Finish”.

C:\views\no_merge_cherry_pick>git checkout -b mybranch1
Switched to a new branch 'mybranch1'

C:\views\no_merge_cherry_pick>echo "second" > file1.txt

C:\views\no_merge_cherry_pick>git add file1.txt

C:\views\no_merge_cherry_pick>git commit -m "added second"
[mybranch1 9cb60d6] added second
 1 files changed, 1 insertions(+), 1 deletions(-)

C:\views\no_merge_cherry_pick>git checkout master
Switched to branch 'master'

C:\views\no_merge_cherry_pick>echo "another second" > file1.txt

C:\views\no_merge_cherry_pick>git add file1.txt

C:\views\no_merge_cherry_pick>git commit -m "added another second"
[master 77249ae] added another second
 1 files changed, 1 insertions(+), 1 deletions(-)

C:\views\no_merge_cherry_pick>git merge mybranch1
Auto-merging file1.txt
CONFLICT (content): Merge conflict in file1.txt
Automatic merge failed; fix conflicts and then commit the result.

Go to Eclipse. Make sure project in Eclipse is refreshed (for example right click in Navigator and select “Refresh”

Show the “Git Staging” view. See that the file “file1.txt” has a red conflict icon.

Right click on file1.txt in the Git Staging view, without first left click on it!

Expected:
The menu item “Merge Tool” should be enabled

Actual:
The menu item “Merge Tool” is greyed out.
However if you first left click on file1 (to select it) and then right click on it the “Merge Tool” menu item is enabled.