diff options
| author | Michael Valenta | 2003-10-17 19:01:05 +0000 |
|---|---|---|
| committer | Michael Valenta | 2003-10-17 19:01:05 +0000 |
| commit | 6f835d75af0cd19ba5a8cf46db28932d2d59cc68 (patch) | |
| tree | 4884696bc8f5885cfa6b53383f14ecbda06de6bc | |
| parent | 13c741d6ec38d2d938dbafa8e482c86a5bb73dfa (diff) | |
| download | eclipse.platform.team-6f835d75af0cd19ba5a8cf46db28932d2d59cc68.tar.gz eclipse.platform.team-6f835d75af0cd19ba5a8cf46db28932d2d59cc68.tar.xz eclipse.platform.team-6f835d75af0cd19ba5a8cf46db28932d2d59cc68.zip | |
41883: [Live Sync View] After crash, some outgoing additions don't appear
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java index dbe768ddc..61e425ac7 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java @@ -127,7 +127,7 @@ public class CVSProviderPlugin extends Plugin { private static final String NATURE_ID = ID + ".cvsnature"; //$NON-NLS-1$ // File used to idicate if the workbench was shut down properly or not - private static final String CRASH_INDICATION_FILE = ".crash"; //$NON-NLS-1$ + private static final String CRASH_INDICATION_FILE = ".running"; //$NON-NLS-1$ private boolean crash; public synchronized CVSWorkspaceSubscriber getCVSWorkspaceSubscriber() { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java index e515d4e9c..96672c101 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java @@ -249,7 +249,7 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; // a delta. if(di == null) { byte [] diBytes = ResourcesPlugin.getWorkspace().getSynchronizer().getSyncInfo(FOLDER_DIRTY_STATE_KEY, container); - if(diBytes != null) { + if(diBytes != null && !CVSProviderPlugin.getPlugin().crashOnLastRun()) { di = new String(diBytes); if(di.equals(NOT_DIRTY_INDICATOR)) { di = NOT_DIRTY_INDICATOR; |