diff --git a/CHANGELOG.md b/CHANGELOG.md index f43bd58db4..e2f44dce24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ 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 + * A default revset-alias function `trunk()` now exists. If you previously defined your own `trunk()` alias it will continue to overwrite the built-in one. Check [revsets.toml](cli/src/config/revsets.toml) and [revsets.md](docs/revsets.md) @@ -48,6 +56,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed bugs +### Contributors + +Thanks to the people who made this release happen! + +* Austin Seipp (@thoughtpolice) +* Emily Kyle Fox (@emilykfox) +* glencbz (@glencbz) +* Hong Shin (@honglooker) +* Ilya Grigoriev (@ilyagr) +* James Sully (@sullyj3) +* Martin von Zweigbergk (@martinvonz) +* Philip Metzger (@PhilipMetzger) +* Ruben Slabbert (@rslabbert) +* Vamsi Avula (@avamsi) +* Waleed Khan (@arxanas) +* Willian Mori (@wmrmrx)) +* Yuya Nishihara (@yuja) +* Zachary Dremann (@Dr-Emann) + + ## [0.9.0] - 2023-09-06 ### Breaking changes diff --git a/Cargo.lock b/Cargo.lock index b043a87b06..7ada3e6d83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -781,7 +781,7 @@ dependencies = [ [[package]] name = "gen-protos" -version = "0.9.0" +version = "0.10.0" dependencies = [ "prost-build", ] @@ -985,7 +985,7 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jj-cli" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "assert_cmd", @@ -1033,7 +1033,7 @@ dependencies = [ [[package]] name = "jj-lib" -version = "0.9.0" +version = "0.10.0" dependencies = [ "assert_matches", "backoff", @@ -2081,7 +2081,7 @@ dependencies = [ [[package]] name = "testutils" -version = "0.9.0" +version = "0.10.0" dependencies = [ "config", "git2", diff --git a/Cargo.toml b/Cargo.toml index 80518e071b..78e2d7bd8c 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.9.0" +version = "0.10.0" license = "Apache-2.0" rust-version = "1.71" # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix edition = "2021" @@ -94,7 +94,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.9.0" } +jj-lib = { path = "lib", version = "0.10.0" } testutils = { path = "lib/testutils" } [profile.release] diff --git a/cli/tests/test_global_opts.rs b/cli/tests/test_global_opts.rs index b9c71c06e1..fdb885eb7e 100644 --- a/cli/tests/test_global_opts.rs +++ b/cli/tests/test_global_opts.rs @@ -68,8 +68,8 @@ fn test_no_subcommand() { let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--version"]); let sanitized = stdout.replace(|c: char| c.is_ascii_hexdigit(), "?"); assert!( - sanitized == "jj ?.?.?\n" - || sanitized == "jj ?.?.?-????????????????????????????????????????\n", + sanitized == "jj ?.??.?\n" + || sanitized == "jj ?.??.?-????????????????????????????????????????\n", "{sanitized}" );