DESCRIPTION

Fix test error in StagingViewTest.testMergeConflict

Run org.eclipse.egit.ui.test.stagview.StagingViewTest.testMergeConflict
testMergeConflict(org.eclipse.egit.ui.test.stagview.StagingViewTest)
org.eclipse.core.internal.resources.ResourceException: Resource is out
of sync with the file system: '/GeneralProject/folder/test.txt'.
	at org.eclipse.core.internal.localstore.FileSystemResourceManager.write(FileSystemResourceManager.java:1076)
	at org.eclipse.core.internal.resources.File.internalSetContents(File.java:321)
	at org.eclipse.core.internal.resources.File.setContents(File.java:360)
	at org.eclipse.egit.ui.common.LocalRepositoryTestCase.setTestFileContent(LocalRepositoryTestCase.java:561)
	at org.eclipse.egit.ui.test.stagview.StagingViewTest.setContent(StagingViewTest.java:155)
	at org.eclipse.egit.ui.test.stagview.StagingViewTest.commitOneFileChange(StagingViewTest.java:138)
	at org.eclipse.egit.ui.test.stagview.StagingViewTest.testMergeConflict(StagingViewTest.java:113)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	...

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


COMMENTS

author: Douglas Trujillo
date: 2015-02-19 00:36:41.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-02-19 00:54:09.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2015-02-19 01:10:00.000000000

Patch Set 1: Code-Review-1

Build Unstable 

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

-------------------------------------
author: Brenden Conley
date: 2015-02-19 10:24:10.000000000

Patch Set 1: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2015-02-19 10:42:24.000000000

Patch Set 1: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/605/ : temporary update site https://hudson.eclipse.org/egit/job/egit-stable.gerrit/${BUILD_NUMBER}/artifact/org.eclipse.egit.repository/target/repository/

-------------------------------------
author: Jayvion Booth
date: 2015-02-19 11:51:54.000000000

Patch Set 1: Code-Review+2

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-02-19 11:52:23.000000000

Change cannot be merged due to unsatisfiable dependencies.

The following dependency errors were found:

* Depends on patch set 1 of Ibf73d94e, however the current patch set is 2.

Please rebase the change and upload a replacement commit.

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