Skip to content

release: 0.28.0 #6220

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.

Sign up for GitHub

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

Merged
arxanas merged 2 commits into from
Apr 3, 2025
Merged

release: 0.28.0 #6220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093675d
docs: update contributor command
arxanas Apr 2, 2025
f8366e4
release: 0.28.0
arxanas Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,27 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### Breaking changes

### Deprecations

### New features

### Fixed bugs

## [0.28.0] - 2025-04-02

### Release highlights

* jj's configuration can now be split into multiple files more easily.

* `jj resolve` now accepts built-in tools `:ours` and `:theirs`.

* In colocated repos, newly-created files will now appear in `git diff`.

* A long-standing bug relating to empty files in the built-in diff editor was
fixed. [#3702](https://github.com/jj-vcs/jj/issues/3702)

### Breaking changes

* The minimum supported Rust version (MSRV) is now 1.84.0.

* The `git.push-branch-prefix` config has been removed in favor of
Expand Down Expand Up @@ -124,6 +145,43 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* `jj fix` could previously create new conflicts when a descendant of a fixed
revision was already correctly formatted.

### Contributors

Thanks to the people who made this release happen!

* Aleksey Kuznetsov (@zummenix)
* Anton Älgmyr (@algmyr)
* Austin Seipp (@thoughtpolice)
* Baltasar Dinis (@bsdinis)
* Benjamin Tan (@bnjmnt4n)
* Brandon Hall (@tenkabuto)
* Caleb White (@calebdw)
* Daniel Luz (@mernen)
* David Rieber (@drieber)
* demize (@demize)
* Emily (@emilazy)
* Evan Mesterhazy (@emesterhazy)
* Fedor Sheremetyev (@sheremetyev)
* George Christou (@gechr)
* Ilya Grigoriev (@ilyagr)
* Jakob Hellermann (@jakobhellermann)
* Jo Liss (@joliss)
* Joachim Desroches (@jedesroches)
* Johannes Altmanninger (@krobelus)
* Jonathan Gilchrist (@jgilchrist)
* Kenyon Ralph (@kenyon)
* Lucas Garron (@lgarron)
* Martin von Zweigbergk (@martinvonz)
* Nick Pupko (@npupko)
* Philip Metzger (@PhilipMetzger)
* Raphael Borun Das Gupta (@das-g)
* Remo Senekowitsch (@senekor)
* Robin Stocker (@robinst)
* Scott Taylor (@scott2000)
* Siva Mahadevan (@svmhdvn)
* Vincent Ging Ho Yim (@cenviity)
* Yuya Nishihara (@yuja)

## [0.27.0] - 2025-03-05

### Release highlights
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "3"
members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]

[workspace.package]
version = "0.27.0"
version = "0.28.0"
license = "Apache-2.0"
rust-version = "1.84" # NOTE: remember to update CI, contributing.md, changelog.md, and install-and-setup.md
edition = "2021"
Expand Down Expand Up @@ -127,8 +127,8 @@ winreg = "0.52"
# put all inter-workspace libraries, i.e. those that use 'path = ...' here in
# their own (alphabetically sorted) block

jj-lib = { path = "lib", version = "0.27.0", default-features = false }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.27.0" }
jj-lib = { path = "lib", version = "0.28.0", default-features = false }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.28.0" }
testutils = { path = "lib/testutils", default-features = false }

[workspace.lints.clippy]
Expand Down
4 changes: 2 additions & 2 deletions docs/releasing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Producing the list of contributors is a bit annoying. The current suggestion is
to run something like this:

```shell
root=v0.25.0
root=$(jj log --no-graph -r 'heads(tags())' -T 'commit_id')
for i in $(seq 5); do
gh api "/repos/jj-vcs/jj/compare/$root...main?per_page=100;page=$i"
done | jq -r '.commits[] | "* " + .commit.author.name + " (@" + .author.login + ")"' | sort -fu
done | jq -r '.commits[] | select(.author.login | endswith("[bot]") | not) | "* " + .commit.author.name + " (@" + .author.login + ")"' | sort -fu
```

https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#compare-two-commits
Expand Down