diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java index a9bfd234985e..40c34d394590 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java @@ -235,7 +235,9 @@ class SvnChangeProviderContext implements StatusReceiver { myChangelistBuilder.processLocallyDeletedFile(createLocallyDeletedChange(filePath, status)); } else if (SvnVcs.svnStatusIs(status, SVNStatusType.STATUS_IGNORED)) { - myChangelistBuilder.processIgnoredFile(filePath.getVirtualFile()); + if (!myVcs.isWcRoot(filePath)) { + myChangelistBuilder.processIgnoredFile(filePath.getVirtualFile()); + } } else if (status.isCopied()) { // diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java index dfbf6e8aa73b..4120dad1d7ec 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java @@ -942,6 +942,15 @@ public class SvnVcs extends AbstractVcs { } } + public boolean isWcRoot(FilePath filePath) { + boolean isWcRoot = false; + WorkingCopy wcRoot = myRootsToWorkingCopies.getWcRoot(filePath.getVirtualFile()); + if (wcRoot != null) { + isWcRoot = wcRoot.getFile().getAbsolutePath().equals(filePath.getIOFile().getAbsolutePath()); + } + return isWcRoot; + } + private static class JavaSVNDebugLogger extends SVNDebugLogAdapter { private final boolean myLoggingEnabled; private final boolean myLogNative;