From 326977aa8e79cddb0c3aace4fd0099f0a5238ff3 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Mon, 17 Dec 2018 21:37:25 +0300 Subject: [PATCH] svn: Fix ignored files tracking 4263251c36ef3f4a39b2f52a7a7d4baf4cff5de8 follow-up --- .../src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java index d4af1e31d7f0..971f1da598cb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java @@ -120,7 +120,7 @@ public class SvnRecursiveStatusWalker { private void handleStatusException(@NotNull MyItem item, @NotNull SvnBindException e) throws SvnBindException { if (e.contains(ErrorCode.WC_NOT_WORKING_COPY) || e.contains(ErrorCode.WC_NOT_FILE) || e.contains(ErrorCode.WC_PATH_NOT_FOUND)) { final VirtualFile virtualFile = item.getPath().getVirtualFile(); - if (virtualFile != null && !isIgnoredByVcs(virtualFile)) { + if (virtualFile != null && !isIgnoredByVcs(virtualFile) && !myChangeListManager.isVcsIgnoredFile(virtualFile)) { // self is unversioned myReceiver.processUnversioned(virtualFile);