Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java
index f55f877fc965..11838314acbd 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileUrlMappingImpl.java
@@ -33,10 +33,10 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.MessageBus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.idea.svn.info.Info;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
-import org.tmatesoft.svn.core.wc.SVNInfo;
 
 import java.io.File;
 import java.util.List;
@@ -388,7 +388,7 @@ public class SvnFileUrlMappingImpl implements SvnFileUrlMapping, PersistentState
       if (copyRoot == null || vcsRoot == null) continue;
 
       final SvnVcs vcs = SvnVcs.getInstance(myProject);
-      final SVNInfo svnInfo = vcs.getInfo(copyRoot);
+      final Info svnInfo = vcs.getInfo(copyRoot);
       if ((svnInfo == null) || (svnInfo.getRepositoryRootURL() == null)) continue;
 
       Node node = new Node(copyRoot, svnInfo.getURL(), svnInfo.getRepositoryRootURL());