svn: Do not check all revisions for "manual select" quick merge by default
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 12 Oct 2016 16:29:54 +0000 (19:29 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 9 Nov 2016 20:53:59 +0000 (23:53 +0300)
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java

index 82d05a1aad4317f365d7cd2e66f93b208f2875d2..41e02388f07c518b6cdce49a89574a4d45b0013f 100644 (file)
@@ -117,7 +117,7 @@ public class ToBeMergedDialog extends DialogWrapper {
     myListsEngine = new BasePageEngine<>(lists, lists.size());
 
     myPanel = new JPanel(new BorderLayout());
-    myWiseSelection = new QuantitySelection<>(myAllListsLoaded);
+    myWiseSelection = new QuantitySelection<>(allStatusesCalculated);
     myAlreadyMerged = newHashSet();
     setOKButtonText("Merge Selected");
     initUI();