Skip to content

Remove deprecated backout command from documentation table #6290

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

alper
Copy link

@alper alper commented Apr 8, 2025

I just ran into this trying to figure out the equivalent to git revert. Turns out that backout is deprecated and revert does not have the same defaults.

@alper alper requested a review from a team as a code owner April 8, 2025 13:08
Copy link

google-cla bot commented Apr 8, 2025

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@thoughtpolice
Copy link
Member

Note that backout was only deprecated three weeks ago. We're probably going to leave it around for at least 3-5 releases before it at this rate, so this PR will be in limbo until then (but you can also close it & refile, leave it, whatever...)

@emilazy
Copy link
Contributor

emilazy commented Apr 8, 2025

It only replaces it in the docs. (Though I think people probably want -B @ more than -d @.)

@thoughtpolice
Copy link
Member

Ah, that's what I get for drawing conclusions from only reading the PR title. :)

@alper alper changed the title Remove deprecated backout command Remove deprecated backout command from documentation table Apr 9, 2025
@alper
Copy link
Author

alper commented Apr 9, 2025

Thanks! Sorry for the confusion but I live by this table right now and it being up to date is going to help me at least.

@emilazy Didn't know what the best default would be but I changed it to your suggestion.

@PhilipMetzger
Copy link
Contributor

PhilipMetzger commented Apr 9, 2025

It only replaces it in the docs. (Though I think people probably want -B @ more than -d @.)

Isn't -B @equivalent to -d @- though? Also prefix the commit message with docs: per our commit style here, https://github.com/jj-vcs/jj/blob/main/docs/contributing.md#commit-guidelines, also squash down your two commits back to one.

@emilazy
Copy link
Contributor

emilazy commented Apr 9, 2025

-B @ rebases @ on top of the revert.

Change default location for revert as suggested by @emilazy
@alper
Copy link
Author

alper commented Apr 12, 2025

Fixed up the description and squashed the commits.

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

Successfully merging this pull request may close these issues.

4 participants