How to squash multiple commits

[zzhaolei]

@    wkttuymr [email protected] 2 seconds ago 93bfd74c
├─┐  merge test into dev
│ ○  mrmuvtmv [email protected] 12 minutes ago test 5a9e53dc
│ │  c
○ │  vskpwnql [email protected] 25 seconds ago git_head() 148e8734
│ │  e
○ │  kpkywzps [email protected] 11 minutes ago 84f3b53c
├─┘  d
○  ounmvlxl [email protected] 15 minutes ago main 2c8434b1
│  b
○  rwqzrovn [email protected] 15 minutes ago 0c685252
│  a
◆  zzzzzzzz root() 00000000

I want to squash wkttuymr and vskpwnql into kpkywzps.

I tried it, but it's not correct

❯ jj squash --from 'w|v|k' --into k
Error: Source and destination cannot be the same
❯ jj squash --from w,v,k --into k
Error: Failed to parse revset: Syntax error
Caused by:  --> 1:2
  |
1 | w,v,k
  |  ^---
  |
  = expected <EOI>, `@`, `:`, `-`, `+`, `::`, `..`, `|`, `&`, or `~`
Hint: See https://jj-vcs.github.io/jj/latest/revsets/ or use `jj help -k revsets` for revsets syntax and how to quote symbols.
❯ jj squash --from "w & v & k" --into k
Nothing changed.

jj squash --from k..w --into k, this worked, but the test branch merge was deleted

[jennings]

Don't include k in the --from.

[zzhaolei]

jj squash --from 'w|v' --into k, this worked, but @ is still at the merge node, i can go back via jj edit kpkywzps , but it's not convenient

❯ jj squash --from 'w|v' --into k
Working copy now at: ktnuuoyo 1b912549 (empty) (no description set)
Parent commit      : kpkywzps cd9992e3 (conflict) d
Parent commit      : mrmuvtmv 5a9e53dc test | c
New conflicts appeared in these commits:
  kpkywzps cd9992e3 (conflict) d
Hint: To resolve the conflicts, start by updating to it:
  jj new kpkywzps
Then use `jj resolve`, or edit the conflict markers in the file directly.
Once the conflicts are resolved, you may want to inspect the result with `jj diff`.
Then run `jj squash` to move the resolution into the conflicted commit.
❯ jj ll
@    ktnuuoyo [email protected] 2 seconds ago 1b912549
├─┐  (empty) (no description set)
│ ○  mrmuvtmv [email protected] 15 hours ago test 5a9e53dc
│ │  c
× │  kpkywzps [email protected] 8 seconds ago git_head() cd9992e3 conflict
├─┘  d
○  ounmvlxl [email protected] 15 hours ago main 2c8434b1
│  b
○  rwqzrovn [email protected] 15 hours ago 0c685252
│  a
◆  zzzzzzzz root() 00000000

[zzhaolei]

In this use case, it would be nice to support ranged revisions, e.g. git rebase -i head~3, which would be handy

[jennings]

The merge commit w became empty and was abandoned. Then, because it was the working copy, jj created a new change with the same parents to replace it (that's kt).

If you change your working copy before the squash, kt wouldn't be created.

Also, since kt is empty, has no description, and has no descendants, it will be automatically abandoned anyway if you change the working copy to another commit. So you don't need to manually abandon it.

jj doesn't know that you want to edit k immediately after the squash, that seems like it's pretty dependent on your particular workflow. If this is something you do often, you can make an alias to help you. jj util exec exists specifically so you can make an alias that runs an arbitrary shell script.

[steveklabnik]

❯ jj squash --from 'w|v|k' --into k

This is #5301