From 5c156006ae6b034175b73b9ca28b56916edf2b26 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 27 Feb 2018 15:14:15 +0300
Subject: [PATCH] IDEA-187108 vcs: do not include initially excluded files in
 commit dialog

Fix case when non-active changelist is selected by default.
We reset inclusion states in `setSelectedCahngeList`,
so inclusion state should be initialized after changelist.

follow-up: 533a5d9c2cc266b76d66373ee3c334f4e608051c
---
 .../openapi/vcs/changes/ui/CommitChangeListDialog.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index 99468f4f30f5..627882731b03 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -310,10 +310,11 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
       MultipleLocalChangeListsBrowser browser = new MultipleLocalChangeListsBrowser(project, true, true, myShowVcsCommit);
       myBrowser = browser;
 
-      browser.getViewer().setIncludedChanges(included);
       if (initialSelection != null) browser.setSelectedChangeList(initialSelection);
       myCommitMessageArea.setChangeList(browser.getSelectedChangeList());
 
+      browser.getViewer().setIncludedChanges(included);
+
       DiffCommitMessageEditor commitMessageEditor = new DiffCommitMessageEditor(myProject, myCommitMessageArea);
       browser.setBottomDiffComponent(commitMessageEditor);