From f13fe5ad4154dcd66b612cb4ddc318f1e9168d02bd6ce4d36121893cd0fb8cca Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 8 Jan 2024 22:22:36 +0000 Subject: [PATCH] Accepting request 1137650 from home:ojkastl_buildservice:Branch_devel_tools_scm update to 0.13.0 OBS-URL: https://build.opensuse.org/request/show/1137650 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/jujutsu?expand=0&rev=7 --- _service | 4 ++-- jj-0.12.0.obscpio | 3 --- jj-0.13.0.obscpio | 3 +++ jj.obsinfo | 6 +++--- jujutsu.changes | 19 +++++++++++++++++++ jujutsu.spec | 4 ++-- vendor.tar.zst | 4 ++-- 7 files changed, 31 insertions(+), 12 deletions(-) delete mode 100644 jj-0.12.0.obscpio create mode 100644 jj-0.13.0.obscpio diff --git a/_service b/_service index 91fc203..12f2056 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git @PARENT_TAG@ - v0.12.0 + v0.13.0 disable v(.*) @@ -19,7 +19,7 @@ true jj - + jj diff --git a/jj-0.12.0.obscpio b/jj-0.12.0.obscpio deleted file mode 100644 index 42c6e0d..0000000 --- a/jj-0.12.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c76727e0ccc825d586b6bd6fb9e94228a15666c3ce3aef00ec5d5cb42725282 -size 4578828 diff --git a/jj-0.13.0.obscpio b/jj-0.13.0.obscpio new file mode 100644 index 0000000..2920780 --- /dev/null +++ b/jj-0.13.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12c7f0ee4bbfdfbd7fe94cfda59273d6d9db4203f363393358bc0e4fee8b22ac +size 4654092 diff --git a/jj.obsinfo b/jj.obsinfo index b6e08d9..9be8ecc 100644 --- a/jj.obsinfo +++ b/jj.obsinfo @@ -1,4 +1,4 @@ name: jj -version: 0.12.0 -mtime: 1701819916 -commit: 79483d4552d0d0fa7222fbafd9143be593a1e451 +version: 0.13.0 +mtime: 1704333930 +commit: 5450e6c9bae40b941b05942bdd78a88e1b9093a6 diff --git a/jujutsu.changes b/jujutsu.changes index f9a33c4..c814e0f 100644 --- a/jujutsu.changes +++ b/jujutsu.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sun Jan 7 15:42:43 UTC 2024 - Johannes Kastl + +- update to 0.13.0: + * Breaking changes + - `jj git fetch` no longer imports new remote branches as local + branches. Set `git.auto-local-branch = true` to restore the + old behavior. + * New features + - Information about new and resolved conflicts is now printed + by every command. + - `jj branch` has gained a new `rename` subcommand that allows + changing a branch name atomically. `jj branch help rename` + for details. + * Fixed bugs + - Command aliases can now be loaded from repository config + relative to the current working directory. + [#2414](https://github.com/martinvonz/jj/issues/2414) + ------------------------------------------------------------------- Wed Dec 6 12:15:35 UTC 2023 - Johannes Kastl diff --git a/jujutsu.spec b/jujutsu.spec index 375d6a5..fe0f85d 100644 --- a/jujutsu.spec +++ b/jujutsu.spec @@ -1,7 +1,7 @@ # # spec file for package jujutsu # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define binary_name jj Name: jujutsu -Version: 0.12.0 +Version: 0.13.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 53be63c..bc18e8e 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77db88717d9385b317e0edee15c97186de8bb80e2b52d73e1ed660a11372b7a9 -size 48402097 +oid sha256:02d88e9c3c72b9c82dfa063ff741780f5cd2da05853921420d0f9485cf4aca33 +size 48962378