Fetch descendants more correctly.

See: #3935 (comment)
jj-vcs · Aug 16, 2024 · 2cce150 · 2cce150
1 parent 6ecc2da
commit 2cce150
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/cli/src/movement_util.rs b/cli/src/movement_util.rs
@@ -72,16 +72,21 @@ impl Direction {
         change_offset: u64,
     ) -> Result<Rc<RevsetExpression>, CommandError> {
         let target_revset = match self {
-            Direction::Next => if has_conflict {
-                start_revset
-                    .children()
-                    .descendants()
-                    .filtered(RevsetFilterPredicate::HasConflict)
-                    .roots()
-            } else {
-                start_revset.descendants_at(change_offset)
+            Direction::Next => {
+                if has_conflict {
+                    start_revset
+                        .children()
+                        .minus(working_revset)
+                        .descendants()
+                        .filtered(RevsetFilterPredicate::HasConflict)
+                        .roots()
+                } else {
+                    start_revset
+                        .children()
+                        .minus(working_revset)
+                        .descendants_at(change_offset)
+                }
             }
-            .minus(working_revset),
 
             Direction::Prev => {
                 if has_conflict {