DESCRIPTION

Save in merge editor blocks UI

Don't fork in revision.setContent() if we are called from a thread which
locked workspace. In this case our *forked* operation will never
complete because it requires file lock which cannot be acquired from
another thread.

Bug: 456758
Change-Id: I09bbf1a3efe8ec439b6b03c570e0411b78a9ee8e
Signed-off-by: Jayvion Booth xxx@xxx.xxx

COMMENTS

author: Jayvion Booth
date: 2015-01-06 09:57:13.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-01-06 09:57:19.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2015-01-06 10:12:39.000000000

Patch Set 1: Code-Review-1

Build Unstable 

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

-------------------------------------
author: Brenden Conley
date: 2015-01-06 10:13:24.000000000

Patch Set 1: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2015-01-06 10:28:17.000000000

Patch Set 1: Verified+1

Build Successful 

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

-------------------------------------
author: Douglas Trujillo
date: 2015-01-07 09:42:29.000000000

Abandoned

moved to stable-3.6 as https://git.eclipse.org/r/#/c/39101/

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