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-26 14:48:29.000000000

Uploaded patch set 5: Patch Set 4 was rebased.

-------------------------------------
author: Brenden Conley
date: 2017-02-26 15:20:18.000000000

Patch Set 5:

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

-------------------------------------
author: Brenden Conley
date: 2017-02-26 15:43:06.000000000

Patch Set 5: Verified+1

Build Successful 

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

-------------------------------------
author: Alayna Houston
date: 2017-02-27 06:20:31.000000000

Patch Set 5: Code-Review+1

(2 comments)

This time, really only comments on monitor handling. Works well and no exceptions logged.

Line:798, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> How about

  doCheckout ? 2 : 10

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

-------------------------------------
author: Alayna Houston
date: 2017-02-27 06:34:05.000000000

Patch Set 5:

(1 comment)

Line:652, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> I think this can be removed now since we use BranchOperationUI now, which performs this check anyway.

-------------------------------------
author: Douglas Trujillo
date: 2017-02-28 14:38:04.000000000

Patch Set 5:

(3 comments)

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

Line:798, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> I guess you mean 10 : 2

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

-------------------------------------
author: Alayna Houston
date: 2017-02-28 15:07:36.000000000

Patch Set 5:

(1 comment)

Line:798, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java -> Of course :-)

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

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

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