1 files changed, 7 insertions, 7 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java
index 62638291b485..701bb2575001 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java
@@ -22,10 +22,10 @@ import com.intellij.util.containers.MultiMap;
 import org.jetbrains.idea.svn.SvnVcs;
 import org.jetbrains.idea.svn.history.SvnChangeList;
 import org.jetbrains.idea.svn.info.Info;
+import org.jetbrains.idea.svn.properties.PropertyValue;
 import org.tmatesoft.svn.core.*;
 import org.tmatesoft.svn.core.internal.util.SVNMergeInfoUtil;
 import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
-import org.tmatesoft.svn.core.wc.SVNPropertyData;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 import org.tmatesoft.svn.core.wc2.SvnTarget;
 
@@ -205,7 +205,7 @@ public class BranchInfo {
       return SvnMergeInfoCache.MergeCheckResult.getInstance(mergeInfo.contains(revisionAsked));
     }
 
-    final SVNPropertyData mergeinfoProperty;
+    final PropertyValue mergeinfoProperty;
     SvnTarget target = SvnTarget.fromURL(branchUrl);
 
     try {
@@ -235,7 +235,7 @@ public class BranchInfo {
       return goUpInRepo(revisionAsked, targetRevision, newBranchUrl, newTrunkUrl);
     }
     // process
-    return processMergeinfoProperty(keyString, revisionAsked, mergeinfoProperty.getValue(), trunkUrl, false);
+    return processMergeinfoProperty(keyString, revisionAsked, mergeinfoProperty, trunkUrl, false);
   }
 
   private Info getInfo(final File pathFile) {
@@ -277,7 +277,7 @@ public class BranchInfo {
       return SvnMergeInfoCache.MergeCheckResult.getInstance(merged);
     }
 
-    final SVNPropertyData mergeinfoProperty;
+    final PropertyValue mergeinfoProperty;
     try {
       if (actualRevision == targetRevisionCorrected) {
         // look in WC
@@ -302,11 +302,11 @@ public class BranchInfo {
       return goUp(revisionAsked, targetRevisionCorrected, branchRootPath, path, trunkUrl);
     }
     // process
-    return processMergeinfoProperty(keyString, revisionAsked, mergeinfoProperty.getValue(), trunkUrl, self);
+    return processMergeinfoProperty(keyString, revisionAsked, mergeinfoProperty, trunkUrl, self);
   }
 
   private SvnMergeInfoCache.MergeCheckResult processMergeinfoProperty(final String pathWithRevisionNumber, final long revisionAsked,
-                                                                      final SVNPropertyValue value, final String trunkRelativeUrl,
+                                                                      final PropertyValue value, final String trunkRelativeUrl,
                                                                       final boolean self) {
     final String valueAsString = value.toString().trim();
 
@@ -318,7 +318,7 @@ public class BranchInfo {
 
     final Map<String, SVNMergeRangeList> map;
     try {
-      map = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(replaceSeparators(value.getString())), null);
+      map = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(replaceSeparators(value.toString())), null);
     }
     catch (SVNException e) {
       LOG.info(e);