Fetch descendants more correctly.

See context in [this discussion](#3935 (comment)) Fixes #3947
jj-vcs · Aug 25, 2024 · 63d5615 · 63d5615
1 parent f9dc058
commit 63d5615
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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),