diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/update/MergeRootInfo.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/update/MergeRootInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MergeRootInfo.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MergeRootInfo.java index 872ee8f81573..6bc2af02415c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MergeRootInfo.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MergeRootInfo.java @@ -16,9 +16,9 @@ package org.jetbrains.idea.svn.update; import org.jetbrains.idea.svn.SvnVcs; +import org.jetbrains.idea.svn.info.Info; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; -import org.tmatesoft.svn.core.wc.SVNInfo; import org.tmatesoft.svn.core.wc.SVNRevision; import java.io.File; @@ -33,7 +33,7 @@ public class MergeRootInfo { myRevision1 = SVNRevision.HEAD; myRevision2 = SVNRevision.HEAD; - SVNInfo info = vcs.getInfo(file); + Info info = vcs.getInfo(file); myUrl1 = info != null && info.getURL() != null ? info.getURL().toString() : ""; myUrl2 = myUrl1; } |