From 08e9b0598fad3edbeb6eeef29c41b4d4e6d09b53 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 27 Jan 2010 16:58:56 +0300 Subject: [PATCH] SVN: refresh nested copies upon "detect nested copies" is selected; default=true --- plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java | 3 +++ plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java index 2850926f6d..81d62d7b46 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java @@ -178,6 +178,9 @@ public class SvnConfigurable implements Configurable { configuration.setConfigurationDirectory(myConfigurationDirectoryText.getText()); configuration.setUseDefaultConfiguation(myUseDefaultCheckBox.isSelected()); configuration.setIsUseDefaultProxy(myUseCommonProxy.isSelected()); + if ((! configuration.DETECT_NESTED_COPIES) && (configuration.DETECT_NESTED_COPIES != myDetectNestedWorkingCopiesCheckBox.isSelected())) { + SvnVcs.getInstance(myProject).invokeRefreshSvnRoots(true); + } configuration.DETECT_NESTED_COPIES = myDetectNestedWorkingCopiesCheckBox.isSelected(); configuration.UPDATE_LOCK_ON_DEMAND = myLockOnDemand.isSelected(); configuration.setIgnoreSpacesInAnnotate(myIgnoreWhitespaceDifferenciesInCheckBox.isSelected()); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java index 272cd962f9..6d4b81273d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java @@ -83,7 +83,7 @@ public class SvnConfiguration implements ProjectComponent, JDOMExternalizable { public boolean MERGE_DIFF_USE_ANCESTRY = true; public boolean UPDATE_LOCK_ON_DEMAND = false; public boolean IGNORE_SPACES_IN_MERGE = false; - public boolean DETECT_NESTED_COPIES = false; + public boolean DETECT_NESTED_COPIES = true; public boolean IGNORE_SPACES_IN_ANNOTATE = true; public boolean SHOW_MERGE_SOURCES_IN_ANNOTATE = true; -- 2.11.4.GIT