From d29cb021cd0c95879801dd86ab5848098e281e13 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 22 Oct 2012 15:19:59 +0200 Subject: [PATCH] prune empty directories when switching to just created tag or branch --- .../actions/update/UpdateByBranchUpdateSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateByBranchUpdateSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateByBranchUpdateSettings.java index 8e101840e9a6..2b1ea130d67b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateByBranchUpdateSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateByBranchUpdateSettings.java @@ -32,7 +32,7 @@ public class UpdateByBranchUpdateSettings implements UpdateSettings{ } public boolean getPruneEmptyDirectories() { - return false; + return true; } public String getBranch1ToMergeWith() {