-
Notifications
You must be signed in to change notification settings - Fork 792
draft: add bump command to advance bookmarks to latest descandants #7629
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
base: main
Are you sure you want to change the base?
Conversation
1f52eca to
6287424
Compare
|
See https://jj-vcs.github.io/jj/latest/contributing/ (things I've noticed after a quick look: squash the commits, update the commit description's subject line, move much of the PR description into the commit description) |
|
And thanks for the PR, btw! I didn't mean to sound ungrateful. |
|
you're completely right sorry, I meant to keep the PR for myself while adding finishing touches and squash before opening it on the upstream repo but didn't check the target branch, I'll squash right away |
6287424 to
eadd6aa
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The following commits do not follow our format for subject lines:
- 1e66b45: Merge branch 'jj-vcs:main' into feat/jj-bump-version-management
Commits should have a subject line following the format <topic>: <description>. Please review the commit guidelines for more information.
1e66b45 to
c24afca
Compare
All commits are now correctly formatted. Thank you for your contribution!
|
FWIW from poking around the issue tracker, I think the generally accepted term for this is "tug" rather than "bump"? Longer term |
|
please drop the conventional commit message prefix and replace it with |
|
This is a feature that could be useful as a plain command, but IMO it should reproduce the behavior described in #5568 (reply in thread) |
c24afca to
187ac88
Compare
Thx, I didn't see this discussion. I'm not really convinced about the specificities of the behaviour in the discussion though I should probably talk about it in the discussion though. |
Enables automatic bookmark advancement without manual targeting, streamlining branch workflow with multiple branch
187ac88 to
4f6e660
Compare
Maybe we missed something. Could you share a use case where you would want to push an empty commit? |
The only thing I don't particularly like about
jjis how I need to remember my branches names and type them (at least partially with completion) when I'm putting several changes on a branch (like during a review)This PR adds a
jj bookmark bump(orjj b b) that takes the latest bookmark in the changes tree and bumps it to the latest non-empty commit, removing IMO some of the pain of working with branches on environments where rewriting history is frowned upon by:jj b s <bookmark>or ajj b s <bookmark> -r @-if it was commited before instead of only updating the descriptionWhile staying a conscious effort
I was building this as a standalone script, but decided to integrate it directly to
jjinstead.I'm probably going to use and maybe maintain this fork myself, please tell me if it is a feature you might consider integrating into upstream
jj, and if so, what I could do to improve the code quality and integration with the rest of the codebaseThanks in advance :)
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)