Community
Participate
Working Groups
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.
Created attachment 196832 [details] screenshot
From looking at the code and the information James has provided, this sounds like a variant of bug 359308.
I've pushed a change set to Gerrit for this bug. Thank you for reporting it, James. http://egit.eclipse.org/r/#change,4451
(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.
