From f6203a2e276df514ea97396ac18150cfdeaf5c9c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 30 Dec 2024 18:30:45 -0600
Subject: [PATCH] release: 0.25.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.lock   | 10 +++++-----
 Cargo.toml   |  6 +++---
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6498ec0c82..77c9ad9a64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/Cargo.lock b/Cargo.lock
index 06757c0bf6..afb7c5a702 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
diff --git a/Cargo.toml b/Cargo.toml
index aa2f787194..4c258f4b7c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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]