MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-94664 Subversion: local changes inside external directory is not shown if command line acceleration is used

Browse Source
This commit is contained in:
irengrig
2012-11-09 20:18:54 +04:00
parent 879ef8fd28
commit c58640ebbf
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java
+1 -1
View File
@@ -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) {
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineStatusClient.java
+6 -3
View File
@@ -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);