DESCRIPTION

Fix logic for detecting whether there are unstaged changes

Didn't account for conflicts. Add a new hasUnstagedChanges() to
IResourceState to have the calculation in (preferrably) one place. (Ok,
StagingEntry must re-implement it.)

Add assertions in the existing tests in DecoratableResourceAdapterTest
for the new operation.

Bug: 486983
Change-Id: Iffc29c16f247199945775d37dc719713d087ac64
Signed-off-by: Alayna Houston xxx@xxx.xxx

COMMENTS

author: Alayna Houston
date: 2016-02-10 22:44:46.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2016-02-10 22:44:52.000000000

Patch Set 3:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/8112/

-------------------------------------
author: Brenden Conley
date: 2016-02-10 23:10:14.000000000

Patch Set 3: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/8112/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2016-02-11 10:52:04.000000000

Patch Set 3:

(1 comment)

Line:105, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/resources/IResourceState.java -> style nit: trailing whitespace

-------------------------------------
author: Douglas Trujillo
date: 2016-02-11 10:52:32.000000000

Patch Set 3:

(1 comment)

Line:105, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/resources/IResourceState.java -> Done

-------------------------------------
author: Gerrit Johnathan Pham
date: 2016-02-11 15:00:08.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

-------------------------------------
