From 63d5615062bfaecdd4f5587057ff766c7d3d184f Mon Sep 17 00:00:00 2001
From: Essien Ita Essien <34972+essiene@users.noreply.github.com>
Date: Fri, 16 Aug 2024 01:10:44 +0100
Subject: [PATCH] Fetch descendants more correctly.

See context in [this discussion](https://github.com/martinvonz/jj/pull/3935#discussion_r1649520967)

Fixes #3947
---
 cli/src/movement_util.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/src/movement_util.rs b/cli/src/movement_util.rs
index da66fe82bb..3f257cd0e6 100644
--- a/cli/src/movement_util.rs
+++ b/cli/src/movement_util.rs
@@ -124,10 +124,10 @@ impl Direction {
         let target_revset = match (self, args.conflict) {
             (Direction::Next, true) => start_revset
                 .children()
+                .minus(working_revset)
                 .descendants()
                 .filtered(RevsetFilterPredicate::HasConflict)
-                .roots()
-                .minus(working_revset),
+                .roots(),
             (Direction::Next, false) => start_revset
                 .descendants_at(args.offset)
                 .minus(working_revset),