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

jj 0.12.0 #156540

Merged
merged 2 commits into from
Dec 6, 2023
Merged

jj 0.12.0 #156540

merged 2 commits into from
Dec 6, 2023

Conversation

p-linnane
Copy link
Member

Created by brew bump


Created with brew bump-formula-pr.

release notes
### Breaking changes
  • The remote_branches() revset no longer includes branches exported to the Git
    repository (so called Git-tracking branches.)

  • jj branch set no longer creates a new branch. Use jj branch create
    instead.

  • jj init --git in an existing Git repository now errors and exits rather than
    creating a second Git store.

New features

  • jj workspace add can now take multiple --revision arguments, which will
    create a new workspace with its working-copy commit on top of all the parents,
    as if you had run jj new r1 r2 r3 ....

  • You can now set git.abandon-unreachable-commits = false to disable the
    usual behavior where commits that became unreachable in the Git repo are
    abandoned (#2504).

  • jj new gained a --no-edit option to prevent editing the newly created
    commit. For example, jj new a b --no-edit -m Merge creates a merge commit
    without affecting the working copy.

  • jj rebase now takes the flag --skip-empty, which doesn't copy over commits
    that would become empty after a rebase.

  • There is a new jj util gc command for cleaning up the repository storage.
    For now, it simply runs git gc on the backing Git repo (when using the Git
    backend).

Fixed bugs

  • Fixed another file conflict resolution issue where jj status would disagree
    with the actual file content.
    #2654

Contributors

Thanks to the people who made this release happen!

  • Antoine Cezar (@AntoineCezar)
  • Anton Bulakh (@necauqua)
  • Austin Seipp (@thoughtpolice)
  • Benjamin Saunders (@Ralith)
  • Carlos Precioso (@cprecioso)
  • Chris Krycho (@chriskrycho)
  • Ilya Grigoriev (@ilyagr)
  • Jason R. Coombs (@jaraco)
  • Jesse Somerville (@jessesomerville)
  • Łukasz Kurowski (@crackcomm)
  • Martin von Zweigbergk (@martinvonz)
  • mlcui (@mlcui-google)
  • Philip Metzger (@PhilipMetzger)
  • Waleed Khan (@arxanas)
  • Yuya Nishihara (@yuja)

@github-actions github-actions bot added rust Rust use is a significant feature of the PR or issue bump-formula-pr PR was created using `brew bump-formula-pr` labels Dec 6, 2023
Copy link
Contributor

github-actions bot commented Dec 6, 2023

🤖 An automated task has requested bottles to be published to this PR.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Dec 6, 2023
@BrewTestBot BrewTestBot enabled auto-merge December 6, 2023 04:58
@BrewTestBot BrewTestBot added this pull request to the merge queue Dec 6, 2023
Merged via the queue into Homebrew:master with commit b79c0be Dec 6, 2023
12 checks passed
@p-linnane p-linnane deleted the bump-jj-0.12.0 branch December 6, 2023 07:49
@github-actions github-actions bot added the outdated PR was locked due to age label Jan 5, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bump-formula-pr PR was created using `brew bump-formula-pr` CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. outdated PR was locked due to age rust Rust use is a significant feature of the PR or issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants