From d3dd5cd1c66ad23bf29196779ec62a64dc22cfff Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sun, 8 Feb 2015 22:46:56 +0300 Subject: [PATCH] [vcs-log][linear-bek] do not go to the first child when collapsing merge fragment --- .../intellij/vcs/log/graph/linearBek/LinearBekController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java index fd9d127d395c..bc85542076d3 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/linearBek/LinearBekController.java @@ -186,8 +186,8 @@ public class LinearBekController extends CascadeLinearGraphController { if (fragment == null) continue; toCollapse.add(i); - toCollapse.addAll(fragment.getAllNodes()); - toProcess.addAll(fragment.getAllNodes()); + toCollapse.addAll(fragment.getTailsAndBody()); + toProcess.addAll(fragment.getTailsAndBody()); mergesCount++; if (mergesCount > 10) break;