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

Bug 347552

Summary:

Decorator shows package as 'conflicting' even if package doesn't contain any conflicting files

Product:

[Technology] EGit

Reporter:

James Blackburn <jamesblackburn+eclipse>

Component:

Assignee:

Project Inbox <egit.ui-inbox>

Status:

CLOSED DUPLICATE

QA Contact:

Severity:

normal

Priority:

CC:

robin

Version:

1.0

Target Milestone:

---

Hardware:

OS:

Linux-GTK

Whiteboard:

Attachments:

Description	Flags
screenshot	none

Description James Blackburn

2011-05-28 14:14:55 EDT

Created attachment 196833 [details]
screenshot

+++ This bug was initially created as a clone of Bug #347551 +++

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 the package: org.eclipse.cdt.internal.ui as conflicting, presumably because it's a parent directory of a package with a file conflict.  However as both the project explorer and package explorer display the packages as non-nested, perhaps the decorator in these view shouldn't annotate parent packages like this?

Comment 1 Robin Stocker

2013-03-18 19:23:56 EDT

Thanks for reporting this. I marked it as a duplicate of 387175 as the other one is more generic - the problem is also there e.g. for untracked files.

*** This bug has been marked as a duplicate of bug 387175 ***