diff options
author | Dani Megert | 2013-04-04 14:20:28 +0000 |
---|---|---|
committer | Dani Megert | 2013-04-04 14:20:28 +0000 |
commit | 1ddeb74cb0186cd27c3d909f02e726f979c4254e (patch) | |
tree | 304ae2ed421076af0ac30f59da19089813fed535 /bundles/org.eclipse.team.cvs.ui/src | |
parent | 79c5562d4c74180311d4b7d7e8f82ffa068e9cb7 (diff) | |
download | eclipse.platform.team-1ddeb74cb0186cd27c3d909f02e726f979c4254e.tar.gz eclipse.platform.team-1ddeb74cb0186cd27c3d909f02e726f979c4254e.tar.xz eclipse.platform.team-1ddeb74cb0186cd27c3d909f02e726f979c4254e.zip |
Fixed bug 161737: [quick diff] Show Annotations in QuickDiff ruler is wrong when server revision newer than localI20130416-0800I20130409-0900I20130409-0800
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java index 61474b5bc..9f1330264 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -243,8 +243,8 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi if(fReference == null) fReference = new Document(); if(computeChange(monitor)) { - ICVSRemoteFile remoteFile = (ICVSRemoteFile)fLastSyncState.getRemote(); - if (fLastSyncState.getRemote() != null && fDocumentProvider instanceof IStorageDocumentProvider) { + ICVSRemoteFile remoteFile= (ICVSRemoteFile)fLastSyncState.getBase(); + if (remoteFile != null && fDocumentProvider instanceof IStorageDocumentProvider) { IStorageDocumentProvider provider= (IStorageDocumentProvider) fDocumentProvider; String encoding= provider.getEncoding(fEditor.getEditorInput()); if (encoding == null) { |