DESCRIPTION

Unify the dialogs for branch selection and "unmerged" warnings

Change-Id: If6363a7e8351be9f47d2802a1ceef0a5b97765fc
Signed-off-by: Willow Cantrell xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2011-11-29 16:49:50.000000000

Patch Set 1: I would prefer that you didn't submit this

(5 inline comments)

the following scenario seems not to work
- in history view click delete branch on a commit multiple local branches point at
- I didn't find a way to only delete one of the branches shown in the list

Line:32, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CheckoutCommitHandler.java -> unrelated formatting change

Line:43, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CheckoutCommitHandler.java -> unrelated formatting change

Line:52, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/MergeHandler.java -> unrelated formatting change

Line:130, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/MergeHandler.java -> unrelated formatting change

Line:135, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/MergeHandler.java -> unrelated formatting change

-------------------------------------
author: Marlie Beasley
date: 2011-11-29 16:53:03.000000000

Patch Set 1: I would prefer that you didn't submit this

(7 inline comments)

Some minor issues

Line:2, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/BranchSelectionDialog.java -> 2011

Line:13, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/BranchSelectionDialog.java -> Would it make sense to move this class to package org.eclipse.egit.ui.internal.dialogs?

Line:208, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/BranchSelectionDialog.java -> This method could be protected

Line:2, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/UnmergedBranchDialog.java -> 2011

Line:68, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/DeleteBranchCommand.java -> Not required if you use UnmergedBranchDialog<RefNode>

Line:105, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/DeleteBranchDialog.java -> Not required if you use UnmergedBranchDialog<RefNode>

Line:101, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/DeleteBranchOnCommitHandler.java -> Not required if you use UnmergedBranchDialog<RefNode>

-------------------------------------
author: Gerrit Johnathan Pham
date: 2011-11-30 09:39:07.000000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

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