MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-56220 Shelve: don't try to remove active changelist on shelving changes

Browse Source 
(cherry picked from commit 077d48fc5195f329f94c674fec22847bced6f230)
This commit is contained in:
irengrig
2010-07-14 16:17:38 +04:00
parent 14b675c324
commit bd47b73acc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java
+1 -1
View File
@@ -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());
}
}