From d42ca33aa7b2ec41dbd2839943c138cd0b23796e Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Wed, 5 Aug 2015 13:06:12 +0300 Subject: [PATCH] IDEA-66690 Made "Ignore whitespace differences in annotations" setting "false" for PyCharm by default (and "true" for other products) --- .../src/org/jetbrains/idea/svn/SvnConfigurationState.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java index 9419825383ca..0e525eaf16ff 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.util.SystemInfo; +import com.intellij.util.PlatformUtils; import com.intellij.util.xmlb.annotations.*; import org.jetbrains.idea.svn.api.Depth; @@ -75,7 +76,7 @@ public class SvnConfigurationState { public boolean UPDATE_LOCK_ON_DEMAND; public boolean IGNORE_SPACES_IN_MERGE; public boolean CHECK_NESTED_FOR_QUICK_MERGE; - public boolean IGNORE_SPACES_IN_ANNOTATE = true; + public boolean IGNORE_SPACES_IN_ANNOTATE = !PlatformUtils.isPyCharm(); public boolean SHOW_MERGE_SOURCES_IN_ANNOTATE = true; public boolean FORCE_UPDATE; public boolean IGNORE_EXTERNALS;