From a51cdab7734cc52790fa4a1bf2c5b6a128109fb9 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 22 Apr 2009 21:05:01 +0000 Subject: [PATCH] [272708] [import/export] fix various bugs with the synchronization support -we have to choose a base in order to get accurate diffs --- .../filesystem/subscriber/FileSystemSubscriber.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 bbc3e9600cb..954c404569a 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 @@ -178,12 +178,15 @@ public class FileSystemSubscriber extends ThreeWaySubscriber { // what if it's changed locally too? long localDownloadTimeStamp = properties.getDownloadFileTimeStamp(); long localTimeStamp = local.getLocalTimeStamp(); - if (localTimeStamp > localDownloadTimeStamp){ - base = null; // conflict for both - } - else { + //if (localTimeStamp > localDownloadTimeStamp){ + // base = null; // conflict for both + //} + //else { + // leaving the local base, since 1 base is better than none + // if there is no base, then we can't accurately show the diffs + // need to provide something better base = new LocalResourceVariant(local); - } + //} } } }