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.25.0

Browse source 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2024-12-30 18:30:45 -06:00
parent ecbee49bf4
commit 041c4fecb7
3 changed files with 57 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

49
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.25.0] - 2025-01-01
### Release highlights
It's the holidays, and this release was overall pretty quiet, without many major
changes. Two select improvements:
* Improvements to configuration management, including support for [conditional
variables](docs/config.md#conditional-variables) in config files.
* Large files in the working copy will no longer cause commands to fail; instead
the large files will remain intact but untracked in the working copy.
### Breaking changes
* Configuration variables are no longer "stringly" typed. For example, `true` is
not converted to a string `"true"`, and vice versa.
@ -103,6 +124,34 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* `jj resolve` no longer removes the executable bit on resolved files when using
an external merge tool.
### Contributors
Thanks to the people who made this release happen!
* Alex Stefanov (@umnikos)
* Anton Älgmyr (@algmyr)
* Austin Seipp (@thoughtpolice)
* Benjamin Tan (@bnjmnt4n)
* Bryce Berger (@bryceberger)
* Daniel Ploch (@torquestomp)
* David Crespo (@david-crespo)
* George Tsiamasiotis (@gtsiam)
* Jochen Kupperschmidt (@homeworkprod)
* Keane Nguyen (@keanemind)
* Martin von Zweigbergk (@martinvonz)
* Matt Kulukundis (@fowles)
* Milo Moisson (@mrnossiom)
* petricavalry (@petricavalry)
* Philip Metzger (@PhilipMetzger)
* Remo Senekowitsch (@senekor)
* Scott Taylor (@scott2000)
* Shane Sveller (@shanesveller)
* Stephen Jennings (@jennings)
* Tim Janik (@tim-janik)
* Vamsi Avula (@avamsi)
* Waleed Khan (@arxanas)
* Yuya Nishihara (@yuja)
## [0.24.0] - 2024-12-04
### Release highlights

10
Cargo.lock generated
View file

@ -879,7 +879,7 @@ dependencies = [
[[package]]
name = "gen-protos"
version = "0.24.0"
version = "0.25.0"
dependencies = [
"prost-build",
]
@ -1943,7 +1943,7 @@ dependencies = [
[[package]]
name = "jj-cli"
version = "0.24.0"
version = "0.25.0"
dependencies = [
"anyhow",
"assert_cmd",
@ -2001,7 +2001,7 @@ dependencies = [
[[package]]
name = "jj-lib"
version = "0.24.0"
version = "0.25.0"
dependencies = [
"assert_matches",
"async-trait",
@ -2062,7 +2062,7 @@ dependencies = [
[[package]]
name = "jj-lib-proc-macros"
version = "0.24.0"
version = "0.25.0"
dependencies = [
"proc-macro2",
"quote",
@ -3269,7 +3269,7 @@ dependencies = [
[[package]]
name = "testutils"
version = "0.24.0"
version = "0.25.0"
dependencies = [
"async-trait",
"futures 0.3.31",

6
Cargo.toml
View file

@ -5,7 +5,7 @@ resolver = "2"
members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
[workspace.package]
version = "0.24.0"
version = "0.25.0"
license = "Apache-2.0"
rust-version = "1.76" # NOTE: remember to update CI, contributing.md, changelog.md, install-and-setup.md, and flake.nix
edition = "2021"
@ -128,8 +128,8 @@ zstd = "0.12.4"
# put all inter-workspace libraries, i.e. those that use 'path = ...' here in
# their own (alphabetically sorted) block
jj-lib = { path = "lib", version = "0.24.0" }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.24.0" }
jj-lib = { path = "lib", version = "0.25.0" }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.25.0" }
testutils = { path = "lib/testutils" }
[workspace.lints.clippy]