diff --git a/_service b/_service
index 5824b45..711b92b 100644
--- a/_service
+++ b/_service
@@ -4,14 +4,10 @@
git
.git
@PARENT_TAG@
- v0.21.0
- disable
+ v0.22.0
v(.*)
-
-
-
- *.tar
- gz
+ disable
+ jujutsu
@@ -19,4 +15,9 @@
true
jj
+
+
+ *.tar
+ gz
+
diff --git a/jj-0.21.0.obscpio b/jj-0.21.0.obscpio
deleted file mode 100644
index e1496b5..0000000
--- a/jj-0.21.0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a8a78e26e9d4eeef85188dbe0c633346b8b6ffe52557c4338373d54b2806b73
-size 6437389
diff --git a/jj.obsinfo b/jj.obsinfo
deleted file mode 100644
index 3f8c986..0000000
--- a/jj.obsinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-name: jj
-version: 0.21.0
-mtime: 1725469873
-commit: d002a5ad35e624a731e96e85f490f28febc7797e
diff --git a/jujutsu-0.22.0.obscpio b/jujutsu-0.22.0.obscpio
new file mode 100644
index 0000000..edcf1b7
--- /dev/null
+++ b/jujutsu-0.22.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddfbcdd0dc1005aaf6226a26a3ed6f42beff4a7868e844b21ca478a304f9b68f
+size 7652877
diff --git a/jujutsu.changes b/jujutsu.changes
index 2f4c988..f7b78e5 100644
--- a/jujutsu.changes
+++ b/jujutsu.changes
@@ -1,3 +1,88 @@
+-------------------------------------------------------------------
+Thu Oct 3 12:13:57 UTC 2024 - Johannes Kastl
+
+- update to 0.22.0:
+ * Breaking changes
+ - Fixing #4239 means the ordering of some messages have
+ changed.
+ - Invalid ui.graph.style configuration is now an error.
+ - The builtin template branch_list has been renamed to
+ bookmark_list as part of the jj branch deprecation.
+ * Deprecations
+ - jj branch has been deprecated in favor of jj bookmark.
+ - Rationale: Jujutsu's branches don't behave like Git branches,
+ which a confused many newcomers, as they expected a similar
+ behavior given the name. We've renamed them to "bookmarks"
+ to match the actual behavior, as we think that describes them
+ better, and they also behave similar to Mercurial's
+ bookmarks.
+ - jj obslog is now called jj evolution-log/jj evolog. jj obslog
+ remains as an alias.
+ - jj unsquash has been deprecated in favor of jj squash and jj
+ diffedit --restore-descendants.
+ - Rationale: jj squash can be used in interactive mode to pull
+ changes from one commit to another, including from a parent
+ commit to a child commit. For fine-grained dependent diffs,
+ such as when the parent and the child commits must
+ successively modify the same location in a file, jj diffedit
+ --restore-descendants can be used to set the parent commit to
+ the desired content without altering the content of the child
+ commit.
+ - The git.push-branch-prefix config has been deprecated in
+ favor of git.push-bookmark-prefix.
+ - conflict() and file() revsets have been renamed to
+ conflicts() and files() respectively. The old names are still
+ around and will be removed in a future release.
+ * New features
+ - The new config option snapshot.auto-track lets you
+ automatically track only the specified paths (all paths by
+ default). Use the new jj file track command to manually
+ tracks path that were not automatically tracked. There is no
+ way to list untracked files yet. Use git status in a
+ colocated workspace as a workaround. #323
+ - jj fix now allows fixing unchanged files with the
+ --include-unchanged-files flag. This can be used to more
+ easily introduce automatic formatting changes in a new commit
+ separate from other changes.
+ - jj workspace add now accepts a --sparse-patterns=
+ option, which allows control of the sparse patterns for a
+ newly created workspace: copy (inherit from parent; default),
+ full (full working copy), or empty (the empty working copy).
+ - New command jj workspace rename that can rename the current
+ workspace.
+ - jj op log gained an option to include operation diffs.
+ - jj git clone now accepts a --remote option,
+ which allows to set a name for the remote instead of using
+ the default origin.
+ - jj op undo now reports information on the operation that has
+ been undone.
+ - jj squash: the -k flag can be used as a shorthand for
+ --keep-emptied.
+ - CommitId / ChangeId template types now support .normal_hex().
+ - jj commit and jj describe now accept --author option allowing
+ to quickly change author of given commit.
+ - jj diffedit, jj abandon, and jj restore now accept a
+ --restore-descendants flag. When used, descendants of the
+ edited or deleted commits will keep their original content.
+ - jj git fetch -b will now warn if the
+ branch(es) can not be found in any of the
+ specified/configured remotes.
+ - jj split now lets the user select all changes in interactive
+ mode. This may be used to keeping all changes into the first
+ commit while keeping the current commit description for the
+ second commit (the newly created empty one).
+ - Author and committer names are now yellow by default.
+ * Fixed bugs
+ - Update working copy before reporting changes. This prevents
+ errors during reporting from leaving the working copy in a
+ stale state.
+ - Fixed panic when parsing invalid conflict markers of a
+ particular form. (#2611)
+ - Editing a hidden commit now makes it visible.
+ - The present() revset now suppresses missing working copy
+ error. For example, present(@) evaluates to none() if the
+ current workspace has no working-copy commit.
+
-------------------------------------------------------------------
Tue Sep 10 04:57:58 UTC 2024 - Johannes Kastl
diff --git a/jujutsu.obsinfo b/jujutsu.obsinfo
new file mode 100644
index 0000000..19efebd
--- /dev/null
+++ b/jujutsu.obsinfo
@@ -0,0 +1,4 @@
+name: jujutsu
+version: 0.22.0
+mtime: 1727889920
+commit: 67c2ae0a9e3e445f034a456b299e3f37c4dc4b93
diff --git a/jujutsu.spec b/jujutsu.spec
index 5da9827..0d25fe1 100644
--- a/jujutsu.spec
+++ b/jujutsu.spec
@@ -19,12 +19,12 @@
%define binary_name jj
Name: jujutsu
-Version: 0.21.0
+Version: 0.22.0
Release: 0
Summary: Git-compatible DVCS that is both simple and powerful
License: MIT
URL: https://github.com/martinvonz/jj
-Source0: jj-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
Source1: vendor.tar.zst
BuildRequires: cargo >= 1.76
BuildRequires: cargo-packaging
@@ -60,14 +60,14 @@ be work-in-progress features, suboptimal UX, and workflow gaps that make it
unusable for your particular use.
%prep
-%autosetup -p 1 -a 1 -n jj-%{version}
+%autosetup -p 1 -a 1
%build
%{cargo_build}
%install
install -D -d -m 0755 %{buildroot}%{_bindir}
-install -m 0755 %{_builddir}/%{binary_name}-%{version}/target/release/%{binary_name} %{buildroot}%{_bindir}/%{binary_name}
+install -m 0755 %{_builddir}/%{name}-%{version}/target/release/%{binary_name} %{buildroot}%{_bindir}/%{binary_name}
%check
rm -rf tests/contest/
diff --git a/vendor.tar.zst b/vendor.tar.zst
index 631892e..272fb99 100644
--- a/vendor.tar.zst
+++ b/vendor.tar.zst
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5b685c569b979d0bb94afdce8d1edd5e2c7d2c67bf4f551ddf9141b2ab88c435
-size 39938745
+oid sha256:a7cda8f0abc00e59e92d5d661d46e69333f92c39e733afcc3fe149036dc5eb65
+size 39986467