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 21:41:54.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2016-02-10 21:42:00.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2016-02-10 21:48:00.000000000

Patch Set 2: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/8107/ : FAILURE

-------------------------------------
author: Brenden Conley
date: 2016-02-10 22:13:20.000000000

Patch Set 2: -Verified

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

-------------------------------------
author: Brenden Conley
date: 2016-02-10 22:41:06.000000000

Patch Set 2: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/8110/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2016-02-10 22:41:55.000000000

Patch Set 2: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2016-02-10 22:42:09.000000000

Patch Set 2: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/8111/ : ABORTED

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

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

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