diff --git a/CHANGELOG.md b/CHANGELOG.md index 9adb5f105c..912b612b2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Breaking changes +### New features + +### Fixed bugs + + +## [0.10.0] - 2023-10-04 + +### Breaking changes + * Conflicts are now stored in a different way. Commits written by a new `jj` binary will not be read correctly by older `jj` binaries. The new model solves some performance problems with the old model. For example, `jj log` @@ -89,6 +98,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * `jj new --insert-before` and `--insert-after` now respect immutable revisions ([#2468](https://github.com/martinvonz/jj/pull/2468)). +### Contributors + +Thanks to the people who made this release happen! + +* Antoine Cezar (@AntoineCezar) +* Austin Seipp (@thoughtpolice) +* Benjamin Saunders (@Ralith) +* Gabriel Scherer (@gasche) +* Ilya Grigoriev (@ilyagr) +* Infra (@1011X) +* Isabella Basso (@isinyaaa) +* Martin von Zweigbergk (@martinvonz) +* Tal Pressman (@talpr) +* Waleed Khan (@arxanas) +* Yuya Nishihara (@yuja) + + ## [0.10.0] - 2023-10-04 ### Breaking changes diff --git a/Cargo.lock b/Cargo.lock index e61eca752b..bb5eb0c6a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -781,7 +781,7 @@ dependencies = [ [[package]] name = "gen-protos" -version = "0.10.0" +version = "0.11.0" dependencies = [ "prost-build", ] @@ -985,7 +985,7 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jj-cli" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "assert_cmd", @@ -1034,7 +1034,7 @@ dependencies = [ [[package]] name = "jj-lib" -version = "0.10.0" +version = "0.11.0" dependencies = [ "assert_matches", "async-trait", @@ -2100,7 +2100,7 @@ dependencies = [ [[package]] name = "testutils" -version = "0.10.0" +version = "0.11.0" dependencies = [ "async-trait", "config", diff --git a/Cargo.toml b/Cargo.toml index 85124f1b20..6b53ac5ae4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "2" members = ["cli", "lib", "lib/testutils", "lib/gen-protos"] [workspace.package] -version = "0.10.0" +version = "0.11.0" license = "Apache-2.0" rust-version = "1.71" # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix edition = "2021" @@ -96,7 +96,7 @@ 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.10.0" } +jj-lib = { path = "lib", version = "0.11.0" } testutils = { path = "lib/testutils" } [profile.release]