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: Douglas Trujillo
date: 2015-01-07 09:41:59.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-01-07 09:42:05.000000000

Patch Set 1:

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

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

Patch Set 1: Code-Review+2 Verified+1

-------------------------------------
author: Douglas Trujillo
date: 2015-01-07 09:47:12.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Brenden Conley
date: 2015-01-07 10:22:16.000000000

Patch Set 1:

Build Failed 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/514/ : ABORTED

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