From 1ddeb74cb0186cd27c3d909f02e726f979c4254e Mon Sep 17 00:00:00 2001
From: Dani Megert
Date: Thu, 4 Apr 2013 16:20:28 +0200
Subject: Fixed bug 161737: [quick diff] Show Annotations in QuickDiff ruler is
 wrong when server revision newer than local

---
 .../team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java      | 6 +++---
 1 file 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) {
-- 
cgit v1.2.3