diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java index c5afd3424c4a..07f4bcf2c256 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java @@ -67,7 +67,7 @@ public class SvnRecursiveStatusWalker { if (path.isDirectory()) { myHandler.setCurrentItem(item); try { - item.getClient(ioFile).doStatus(ioFile, SVNRevision.WORKING, item.getDepth(), false, false, true, false, myHandler, null); + item.getClient(ioFile).doStatus(ioFile, SVNRevision.WORKING, item.getDepth(), false, false, true, true, myHandler, null); myHandler.checkIfCopyRootWasReported(); } catch (SVNException e) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java index 891c18c861d8..e4aa6b3f2da1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java @@ -35,7 +35,9 @@ import org.xml.sax.SAXException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; import java.util.Collection; /** @@ -112,9 +114,10 @@ public class SvnCommandLineStatusClient implements SvnStatusClientI { if (includeIgnored) { command.addParameters("--no-ignore"); } - if (! collectParentExternals) { + // no way in interface to ignore externals + /*if (! collectParentExternals) { command.addParameters("--ignore-externals"); - } + }*/ //--changelist (--cl) ARG changelistsToCommand(changeLists, command);