From bd47b73acc31897115988dc556175f2b5fb88fcd Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 14 Jul 2010 16:17:38 +0400
Subject: [PATCH] IDEA-56220 Shelve: don't try to remove active changelist on
 shelving changes (cherry picked from commit
 077d48fc5195f329f94c674fec22847bced6f230)

---
 .../openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java
index ca3296b03063..012a8e9d4dee 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java
@@ -90,7 +90,7 @@ public class ShelveChangesCommitExecutor implements CommitExecutor {
         ChangeList changeList = ChangesUtil.getChangeListIfOnlyOne(myProject, changesArray);
         if (changeList instanceof LocalChangeList) {
           LocalChangeList localChangeList = (LocalChangeList) changeList;
-          if (localChangeList.getChanges().size() == changes.size() && !localChangeList.isReadOnly()) {
+          if (localChangeList.getChanges().size() == changes.size() && !localChangeList.isReadOnly() && (! localChangeList.isDefault())) {
             ChangeListManager.getInstance(myProject).removeChangeList(localChangeList.getName());
           }
         }