DESCRIPTION

Fetch from Gerrit: checkout branch after resolving checkout conflicts

Ensure that new change branch is checked out after using Reset, Commit,
Stash or OK to cleanup uncommitted changes.

Bug: 507494
Change-Id: I8e085cad3c79a866cd8d1770854b24e8bad5d9b7
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2017-02-23 00:16:37.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2017-02-23 00:16:43.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2017-02-23 00:39:27.000000000

Patch Set 2: Verified+1

Build Successful 

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

-------------------------------------
author: Alayna Houston
date: 2017-02-23 07:08:05.000000000

Patch Set 2:

(3 comments)

Line:814, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> Monitor handling is not OK. Re-using the same monitor three times--should convert to SubMonitor here and pass children.

Line:830, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> Unclear what monitor to pass here. This one will already be fully consumed. But if we convert to SubMonitor and pass children, we'll terminate in the normal "no conflict" case at less than 100%.

Line:860, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> :-(

-------------------------------------
author: Douglas Trujillo
date: 2017-02-23 14:03:30.000000000

Patch Set 2:

(3 comments)

Line:814, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> Done

Line:830, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> Done

Line:860, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> not nice, at least it works

didn't yet wrap my head around finding an asynchronous solution

-------------------------------------
author: Gerrit Johnathan Pham
date: 2017-02-28 19:37:10.000000000

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

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