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

Bug 347551

Summary: Team > Merge Tool reports "Empty Path Not permitted"
Product: [Technology] EGit Reporter: James Blackburn <jamesblackburn+eclipse>
Component: UIAssignee: Remy Suen <remy.suen>
Status: RESOLVED FIXED QA Contact: Remy Suen <remy.suen>
Severity: normal    
Priority: P3 CC: remy.suen
Version: 1.0   
Target Milestone: 1.2-M1   
Hardware: PC   
OS: Linux-GTK   
Whiteboard:
Attachments:
Description Flags
screenshot none

Description James Blackburn CLA 2011-05-28 14:07:10 EDT 
Eclipse EGit (Incubation)    1.0.0.201105261513 org.eclipse.egit.feature.group    Eclipse EGit
 Eclipse JGit (Incubation)    1.0.0.201105251218 org.eclipse.jgit.feature.group    Eclipse JGit

I cherry-picked a commit which didn't apply cleanly and put Eclipse into a conflict state. 

git status shows this:
# On branch bug/314428_console_performance
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
#       modified:   src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java
#       modified:   src/org/eclipse/cdt/internal/ui/buildconsole/BuildOutputStream.java
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java

The egit annotation shows org.eclipse.cdt.ui as a conflicted, however right click > Team > Merge Tool on the project reports "Empty Path Not Permitted".

If I select the conflicted file itself, a compare dialog does come up.

In this case the project (org.eclipse.cdt.ui) is a git repo and contains a .git directory.
Comment 1 James Blackburn CLA 2011-05-28 14:08:33 EDT 
Created attachment 196832 [details]
screenshot
Comment 2 Remy Suen CLA 2011-10-30 22:00:39 EDT 
From looking at the code and the information James has provided, this sounds like a variant of bug 359308.
Comment 3 Remy Suen CLA 2011-10-31 19:58:12 EDT 
I've pushed a change set to Gerrit for this bug. Thank you for reporting it, James.
http://egit.eclipse.org/r/#change,4451
Comment 4 Remy Suen CLA 2011-11-08 07:55:22 EST 
(In reply to comment #3)
> I've pushed a change set to Gerrit for this bug. Thank you for reporting it,
> James.
> http://egit.eclipse.org/r/#change,4451

Dariusz has approved this change and has merged it into master. Thanks again, James.