mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

release: 0.28.0

Browse source
This commit is contained in:
Waleed Khan 2025-04-02 16:31:21 -07:00
parent 5a63fd9628
commit 3a98c4e849
3 changed files with 66 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

58
CHANGELOG.md
View file

@ -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
@ -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

10
Cargo.lock generated
View file

@ -1021,7 +1021,7 @@ dependencies = [
[[package]]
name = "gen-protos"
version = "0.27.0"
version = "0.28.0"
dependencies = [
"prost-build",
]
@ -2270,7 +2270,7 @@ dependencies = [
[[package]]
name = "jj-cli"
version = "0.27.0"
version = "0.28.0"
dependencies = [
"assert_cmd",
"assert_matches",
@ -2329,7 +2329,7 @@ dependencies = [
[[package]]
name = "jj-lib"
version = "0.27.0"
version = "0.28.0"
dependencies = [
"assert_matches",
"async-trait",
@ -2388,7 +2388,7 @@ dependencies = [
[[package]]
name = "jj-lib-proc-macros"
version = "0.27.0"
version = "0.28.0"
dependencies = [
"proc-macro2",
"quote",
@ -3919,7 +3919,7 @@ dependencies = [
[[package]]
name = "testutils"
version = "0.27.0"
version = "0.28.0"
dependencies = [
"async-trait",
"bstr",

6
Cargo.toml
View file

@ -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"
@ -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]