mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-07 00:05:53 +02:00
Code Issues Wiki Activity

[272708] [import/export] fix various bugs with the synchronization support

Browse source 
-we have to choose a base in order to get accurate diffs
This commit is contained in:
David McKnight 2009-04-22 21:05:01 +00:00
parent e80b62240a
commit a51cdab773
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/synchronize/filesystem/subscriber/FileSystemSubscriber.java
View file

@ -178,12 +178,15 @@ public class FileSystemSubscriber extends ThreeWaySubscriber {
// what if it's changed locally too? // what if it's changed locally too?
long localDownloadTimeStamp = properties.getDownloadFileTimeStamp(); long localDownloadTimeStamp = properties.getDownloadFileTimeStamp();
long localTimeStamp = local.getLocalTimeStamp(); long localTimeStamp = local.getLocalTimeStamp();
if (localTimeStamp > localDownloadTimeStamp){ //if (localTimeStamp > localDownloadTimeStamp){
base = null; // conflict for both // base = null; // conflict for both
} //}
else { //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); base = new LocalResourceVariant(local);
} //}
} }
} }
} }