From 8e2ceb4803509d6d88a2014711df64b0cf6d12fe Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Wed, 22 Apr 2009 17:37:03 +0000
Subject: [PATCH] [272708] [import/export] fix various bugs with the
 synchronization support -detect conflict

---
 .../filesystem/subscriber/FileSystemSubscriber.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/synchronize/filesystem/subscriber/FileSystemSubscriber.java b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/synchronize/filesystem/subscriber/FileSystemSubscriber.java
index 5f275ac7ff8..bbc3e9600cb 100644
--- a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/synchronize/filesystem/subscriber/FileSystemSubscriber.java
+++ b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/synchronize/filesystem/subscriber/FileSystemSubscriber.java
@@ -175,7 +175,15 @@ public class FileSystemSubscriber extends ThreeWaySubscriber {
 					long storedModificationTime = properties.getRemoteFileTimeStamp();
 				
 					if (remoteModificationTime > storedModificationTime){
-						base = new LocalResourceVariant(local);
+						// what if it's changed locally too?
+						long localDownloadTimeStamp = properties.getDownloadFileTimeStamp();
+						long localTimeStamp = local.getLocalTimeStamp();
+						if (localTimeStamp > localDownloadTimeStamp){
+							base = null; // conflict for both
+						}
+						else {
+							base = new LocalResourceVariant(local);
+						}
 					}		
 				}
 			}