Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Possible confusing or incorrect documentation in jj unsquash. #3432

Open
askreet opened this issue Apr 3, 2024 · 3 comments
Open

Possible confusing or incorrect documentation in jj unsquash. #3432

askreet opened this issue Apr 3, 2024 · 3 comments
Labels
documentation Improvements or additions to documentation

Comments

@askreet
Copy link

askreet commented Apr 3, 2024

Description

This may well be me failing to understand the wording here, but I just used jj unsquash -i for the first time. Super useful, but I think the documentation is incorrect, or the use of the difftool is inverted. I'm using the builtin tool.

The docs read:

Move changes from a revision's parent into the revision

-i, --interactive
Interactively choose which parts to unsquash

If we're defining the act of unsquashing as the moving of diff hunks from the current revisions parent into the current revision, then the things I select ("interactively choose") in the TUI should be the things that move, but the inverse is true. At least when I used this just now, the things I selected remained in the parent revision, while the rest was "unsquashed". (jj undo makes this type of experimentation easy 😄)

Specifications

  • Platform: OS X Ventura
  • Version: 0.13.0
@PhilipMetzger PhilipMetzger added the documentation Improvements or additions to documentation label Apr 3, 2024
@joyously
Copy link

joyously commented Apr 3, 2024

not latest release?

@askreet
Copy link
Author

askreet commented Apr 3, 2024

Thanks for the callout, @joyously. I just updated to v0.15.1. It seems like the documentation is roughly the same, as is the behavior.

@arxanas
Copy link
Contributor

arxanas commented Jun 1, 2024

I also opened arxanas/scm-record#50 to track related issues.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

No branches or pull requests

4 participants