Fetch descendants more correctly.

See context in [this discussion](#3935 (comment)) Fixes #3947
jj-vcs · Aug 23, 2024 · acc6802 · acc6802
1 parent 3a3d234
commit acc6802
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/cli/src/movement_util.rs b/cli/src/movement_util.rs
@@ -109,16 +109,21 @@ impl Direction {
         args: &MovementArgsInternal,
     ) -> Result<Rc<RevsetExpression>, CommandError> {
         let target_revset = match self {
-            Direction::Next => if args.conflict {
-                start_revset
-                    .children()
-                    .descendants()
-                    .filtered(RevsetFilterPredicate::HasConflict)
-                    .roots()
-            } else {
-                start_revset.descendants_at(args.offset)
+            Direction::Next => {
+                if args.conflict {
+                    start_revset
+                        .children()
+                        .minus(working_revset)
+                        .descendants()
+                        .filtered(RevsetFilterPredicate::HasConflict)
+                        .roots()
+                } else {
+                    start_revset
+                        .children()
+                        .minus(working_revset)
+                        .descendants_at(args.offset)
+                }
             }
-            .minus(working_revset),
 
             Direction::Prev => {
                 if args.conflict {