From 402bca0f0f00b362d48d8c0ef0dc4cbc2f5332f8dade85693fbbc39e4142b877 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Thu, 8 Feb 2024 12:25:27 +0000 Subject: [PATCH] Accepting request 1145164 from home:ojkastl_buildservice:Branch_devel_tools_scm update to 0.14.0 OBS-URL: https://build.opensuse.org/request/show/1145164 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/jujutsu?expand=0&rev=9 --- _service | 2 +- jj-0.13.0.obscpio | 3 -- jj-0.14.0.obscpio | 3 ++ jj.obsinfo | 6 ++-- jujutsu.changes | 76 +++++++++++++++++++++++++++++++++++++++++++++++ jujutsu.spec | 2 +- vendor.tar.zst | 4 +-- 7 files changed, 86 insertions(+), 10 deletions(-) delete mode 100644 jj-0.13.0.obscpio create mode 100644 jj-0.14.0.obscpio diff --git a/_service b/_service index 12f2056..4cc4639 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git @PARENT_TAG@ - v0.13.0 + v0.14.0 disable v(.*) diff --git a/jj-0.13.0.obscpio b/jj-0.13.0.obscpio deleted file mode 100644 index 2920780..0000000 --- a/jj-0.13.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12c7f0ee4bbfdfbd7fe94cfda59273d6d9db4203f363393358bc0e4fee8b22ac -size 4654092 diff --git a/jj-0.14.0.obscpio b/jj-0.14.0.obscpio new file mode 100644 index 0000000..630b9f8 --- /dev/null +++ b/jj-0.14.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb5e5efe384c25c4293b6ea3686592103d0d0759fad19faf97ead7bfdaadc633 +size 4886028 diff --git a/jj.obsinfo b/jj.obsinfo index 9be8ecc..1e4f552 100644 --- a/jj.obsinfo +++ b/jj.obsinfo @@ -1,4 +1,4 @@ name: jj -version: 0.13.0 -mtime: 1704333930 -commit: 5450e6c9bae40b941b05942bdd78a88e1b9093a6 +version: 0.14.0 +mtime: 1707349384 +commit: 8e4d1af98eccf1ed8a79a7ddf9500467aa7684f5 diff --git a/jujutsu.changes b/jujutsu.changes index c814e0f..54e89d1 100644 --- a/jujutsu.changes +++ b/jujutsu.changes @@ -1,3 +1,79 @@ +------------------------------------------------------------------- +Thu Feb 8 06:50:56 UTC 2024 - Johannes Kastl + +- update to 0.14.0: + * Deprecations + - jj checkout and jj merge are both deprecated; use jj new + instead to replace both of these commands in all instances. + Rationale: jj checkout and jj merge both implement identical + functionality, which is a subset of jj new. checkout creates + a new working copy commit on top of a single specified + revision, i.e. with one parent. merge creates a new working + copy commit on top of at least two specified revisions, i.e. + with two or more parents. + The only difference between these commands and jj new, which + also creates a new working copy commit, is that new can + create a working copy commit on top of any arbitrary number + of revisions, so it can handle both the previous cases at + once. The only actual difference between these three commands + is the command syntax and their name. These names were chosen + to be familiar to users of other version control systems, but + we instead encourage all users to adopt jj new instead; it is + more general and easier to remember than both of these. + jj checkout and jj merge will no longer be shown as part of + jj help, but will still function for now, emitting a warning + about their deprecation. + Deadline: jj checkout and jj merge will be deleted and are + expected become a hard error later in 2024. + - jj init --git and jj init --git-repo are now deprecated and + will be removed in the near future. Use jj git init instead. + * Breaking changes + - (Minor) Diff summaries (e.g. jj diff -s) now use D for + "Deleted" instead of R for "Removed". @joyously pointed out + that R could also mean "Renamed". + - jj util completion now takes the shell as a positional + argument, not a flag. the previous behavior is deprecated, + but supported for now. it will be removed in the future. + * New features + - jj util completion now supports powershell and elvish. + - Official binaries for macOS running on Apple Silicon + (aarch64-apple-darwin) are now available, alongside the + existing macOS x86 binaries. + - New jj op abandon command is added to clean up the operation + history. Git refs and commit objects can be further compacted + by jj util gc. + - jj util gc now removes unreachable operation, view, and Git + objects. + - jj branch rename will now warn if the renamed branch has a + remote branch, since those will have to be manually renamed + outside of jj. + - jj git push gained a --tracked option, to push all the + tracked branches. + - There's now a virtual root operation, similar to the virtual + root commit. It appears at the end of jj op log. + - jj config list gained a --include-overridden option to allow + printing overridden config values. + - jj config list now accepts --user or --repo option to specify + config origin. + - New jj config path command to print the config file path + without launching an editor. + - jj tag list command prints imported git tags. + - jj next and jj prev now prompt in the event of the + next/previous commit being ambiguous, instead of failing + outright. + - jj resolve now displays the file being resolved. + - jj workspace root was aliased to jj root, for ease of + discoverability + - jj diff no longer shows the contents of binary files. + - jj git now has an init command that initializes a git backed + repo. + - New template function surround(prefix, suffix, content) is + added. + * Fixed bugs + - Fixed snapshots of symlinks in gitignore-d directory. #2878 + - Fixed data loss in dirty working copy when checked-out branch + is rebased or abandoned by Git. #2876 + ------------------------------------------------------------------- Sun Jan 7 15:42:43 UTC 2024 - Johannes Kastl diff --git a/jujutsu.spec b/jujutsu.spec index fe0f85d..e9633d8 100644 --- a/jujutsu.spec +++ b/jujutsu.spec @@ -19,7 +19,7 @@ %define binary_name jj Name: jujutsu -Version: 0.13.0 +Version: 0.14.0 Release: 0 Summary: Git-compatible DVCS that is both simple and powerful License: MIT diff --git a/vendor.tar.zst b/vendor.tar.zst index bc18e8e..f00a276 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02d88e9c3c72b9c82dfa063ff741780f5cd2da05853921420d0f9485cf4aca33 -size 48962378 +oid sha256:d3560afac89a0b55830dc6c827569d2de41d6561c6fbb9c262b2756b9a1d3cd1 +size 37069767