Merge branch 'svn_18_3'

diff --cc platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
index 5fe19963cf93e1b4fd38e4b7a28faaf15a450700,e0e48715d1d8d8d3b12fac4e5768589715b08a09..191acf387b869b5c4a946a18906f3c95fd66269c
--- 1/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
--- 2/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
@@@ -345,12 -348,13 +348,12 @@@ public class RepositoryBrowserDialog ex
        if (node == null) {
          return;
        }
-       boolean isDirectory = node.getUserObject() instanceof SVNURL ||
-                             (node.getSVNDirEntry() != null && node.getSVNDirEntry().getKind() == SVNNodeKind.DIR);
+       boolean isDirectory =
+         node.getUserObject() instanceof SVNURL || (node.getSVNDirEntry() != null && node.getSVNDirEntry().isDirectory());
        String url = node.getURL().toDecodedString();
 -      final SvnRepositoryLocation repositoryLocation = new SvnRepositoryLocation(node.getURL().toString());
  
        AbstractVcsHelper.getInstance(myProject)
 -        .showFileHistory(myVCS.getVcsHistoryProvider(), VcsUtil.getFilePathOnNonLocal(url, isDirectory), myVCS, repositoryLocation);
 +        .showFileHistory(myVCS.getVcsHistoryProvider(), VcsUtil.getFilePathOnNonLocal(url, isDirectory), myVCS, url);
        node.reload(false);
      }
    }

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java
Simple merge

diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java
index 762f4449b897e4dfe174afab5051991f04295146,a03b6e88d1c401f89a9cfe5adff61935e2c7355c..b655cdca170cb928a7b86f65e150720019ea361e
--- 1/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java
--- 2/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java
@@@ -50,14 -50,12 +50,13 @@@ import com.intellij.util.continuation.C
  import com.intellij.util.continuation.ContinuationContext;
  import com.intellij.util.continuation.TaskDescriptor;
  import com.intellij.util.continuation.Where;
 +import org.jetbrains.annotations.NotNull;
  import org.jetbrains.idea.svn.*;
+ import org.jetbrains.idea.svn.api.Depth;
+ import org.jetbrains.idea.svn.conflict.TreeConflictDescription;
  import org.jetbrains.idea.svn.history.SvnChangeList;
  import org.jetbrains.idea.svn.history.SvnRepositoryLocation;
- import org.tmatesoft.svn.core.SVNDepth;
- import org.tmatesoft.svn.core.SVNNodeKind;
  import org.tmatesoft.svn.core.wc.SVNRevision;
- import org.tmatesoft.svn.core.wc.SVNTreeConflictDescription;
  
  import java.io.File;
  import java.io.IOException;