From 12899be499945c01576f7da1df638d8d3a0f30f5 Mon Sep 17 00:00:00 2001
From: Laurent Goubet
Date: Thu, 18 Apr 2013 09:16:24 +0200
Subject: Local files should remain editable when synchronizing.

We can't wrap WorkspaceFileRevisions within FileRevisionTypedElements
since those are not editable.

Bug: 403363
Change-Id: I2a18495e349b64128166a39533fda8b02109d4dd
---
 .../internal/synchronize/GitModelSynchronizeParticipant.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'org.eclipse.egit.ui')

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java
index 26d8ea635f..6e87a186b3 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java
@@ -38,6 +38,7 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.egit.core.AdapterUtils;
+import org.eclipse.egit.core.internal.storage.WorkspaceFileRevision;
 import org.eclipse.egit.core.project.GitProjectData;
 import org.eclipse.egit.core.project.RepositoryMapping;
 import org.eclipse.egit.core.synchronize.GitResourceVariantTreeSubscriber;
@@ -238,10 +239,11 @@ public class GitModelSynchronizeParticipant extends ModelSynchronizeParticipant
 				try {
 					final IFileRevision revision = ((GitResourceVariantTreeSubscriber) subscriber)
 							.getSourceFileRevision((IFile) resource);
-					final ITypedElement newSource = new FileRevisionTypedElement(
-							revision,
-							getLocalEncoding(resource));
-					((ResourceDiffCompareInput) input).setLeft(newSource);
+					if (!(revision instanceof WorkspaceFileRevision)) {
+						final ITypedElement newSource = new FileRevisionTypedElement(
+								revision, getLocalEncoding(resource));
+						((ResourceDiffCompareInput) input).setLeft(newSource);
+					}
 				} catch (TeamException e) {
 					// Keep the input from super as-is
 					String error = NLS
-- 
cgit v1.2.3