Skip to content

Commit

Permalink
release: 0.25.0
Browse files Browse the repository at this point in the history
Signed-off-by: Austin Seipp <[email protected]>
  • Loading branch information
thoughtpolice committed Dec 31, 2024
1 parent dbd0174 commit 0ff21aa
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 8 deletions.
48 changes: 48 additions & 0 deletions CHANGELOG.md
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.25.0] - 2024-12-31

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

Expand Down Expand Up @@ -103,6 +124,33 @@ 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!

* 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
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit 0ff21aa

Please sign in to comment.