DESCRIPTION

[stagingView] Show rebase buttons if rebase is in progress

In order to enable showing a conflict warning when there are unresolved
conflicts we need to enhance RepositoryState in JGit to provide
additional states representing rebase with conflicts. This will be done
in another change.

Bug: 414930
Change-Id: I54ebec9cbfb89b994e857cd8a20b2be6a55c65fb
Signed-off-by: Douglas Trujillo xxx@xxx.xxx
Also-by: Willow Cantrell xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2013-09-06 11:36:02.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2013-09-06 11:43:59.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2013-09-06 11:59:34.000000000

Patch Set 3: Code-Review-1

Build Unstable 

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

-------------------------------------
author: Marlie Beasley
date: 2013-09-06 15:01:32.000000000

Patch Set 3: Code-Review-1

The width of the staging view must be very large to get a visible commit button.

-------------------------------------
author: Marlie Beasley
date: 2013-09-06 15:21:39.000000000

Patch Set 3:

(1 comment)

Code looks good.

Line:446, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java -> why is this member protected?

-------------------------------------
author: Douglas Trujillo
date: 2013-09-06 15:58:52.000000000

Patch Set 3:

(1 comment)

Line:446, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java -> Done

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