DESCRIPTION

[historyView] Prevent nested merge and cherry-pick

When a merge, cherry-pick or rebase is already in progress the commands
merge and cherry-pick need to be disabled since we can't nest these
operations.

Change-Id: I358e9ef787de93c92ce12d3c9a320ec5dc928e66
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2013-08-30 13:15:23.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2013-08-30 13:15:28.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/151/

-------------------------------------
author: Brenden Conley
date: 2013-08-30 13:16:55.000000000

Patch Set 2: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/151/ : FAILURE

-------------------------------------
author: Brenden Conley
date: 2013-08-30 17:47:22.000000000

Patch Set 2: -Verified

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/154/

-------------------------------------
author: Brenden Conley
date: 2013-08-30 18:00:04.000000000

Patch Set 2: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/154/ : UNSTABLE

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