diff --git a/_service b/_service index 4c9433f..91fc203 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ git .git @PARENT_TAG@ - v0.11.0 - false + v0.12.0 + disable v(.*) diff --git a/cargo_config b/cargo_config deleted file mode 100644 index 6fb4ff4..0000000 --- a/cargo_config +++ /dev/null @@ -1,5 +0,0 @@ -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" \ No newline at end of file diff --git a/jj-0.11.0.obscpio b/jj-0.11.0.obscpio deleted file mode 100644 index 1f7472e..0000000 --- a/jj-0.11.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c065d0475c9a0bef79af115d9ba689df80c78e2195bcdebff0fc3f23fddf737c -size 4383756 diff --git a/jj-0.12.0.obscpio b/jj-0.12.0.obscpio new file mode 100644 index 0000000..42c6e0d --- /dev/null +++ b/jj-0.12.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c76727e0ccc825d586b6bd6fb9e94228a15666c3ce3aef00ec5d5cb42725282 +size 4578828 diff --git a/jj.obsinfo b/jj.obsinfo index 00cf400..b6e08d9 100644 --- a/jj.obsinfo +++ b/jj.obsinfo @@ -1,4 +1,4 @@ name: jj -version: 0.11.0 -mtime: 1698862124 -commit: f00f7527ddce21886fe93e11324c5227f15eeaca +version: 0.12.0 +mtime: 1701819916 +commit: 79483d4552d0d0fa7222fbafd9143be593a1e451 diff --git a/jujutsu.changes b/jujutsu.changes index f47c125..f9a33c4 100644 --- a/jujutsu.changes +++ b/jujutsu.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Wed Dec 6 12:15:35 UTC 2023 - Johannes Kastl + +- update to 0.12.0: + * Breaking changes + - The remote_branches() revset no longer includes branches + exported to the Git repository (so called Git-tracking + branches.) + - jj branch set no longer creates a new branch. Use jj branch + create instead. + - jj init --git in an existing Git repository now errors and + exits rather than creating a second Git store. + * New features + - jj workspace add can now take multiple --revision arguments, + which will create a new workspace with its working-copy + commit on top of all the parents, as if you had run + jj new r1 r2 r3 .... + - You can now set git.abandon-unreachable-commits = false to + disable the usual behavior where commits that became + unreachable in the Git repo are abandoned (#2504). + - jj new gained a --no-edit option to prevent editing the newly + created commit. For example, jj new a b --no-edit -m Merge + creates a merge commit without affecting the working copy. + - jj rebase now takes the flag --skip-empty, which doesn't copy + over commits that would become empty after a rebase. + - There is a new jj util gc command for cleaning up the + repository storage. For now, it simply runs git gc on the + backing Git repo (when using the Git backend). + * Fixed bugs + - Fixed another file conflict resolution issue where jj status + would disagree with the actual file content. #2654 + ------------------------------------------------------------------- Wed Nov 01 19:12:45 UTC 2023 - kastl@b1-systems.de diff --git a/jujutsu.spec b/jujutsu.spec index 8fbfae0..375d6a5 100644 --- a/jujutsu.spec +++ b/jujutsu.spec @@ -1,7 +1,7 @@ # # spec file for package jujutsu # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,13 @@ %define binary_name jj Name: jujutsu -Version: 0.11.0 +Version: 0.12.0 Release: 0 -Summary: Git-compatible DVCS that is both simple and powerful +Summary: Git-compatible DVCS that is both simple and powerful License: MIT URL: https://github.com/martinvonz/jj Source0: jj-%{version}.tar.gz Source1: vendor.tar.zst -Source2: cargo_config BuildRequires: cargo >= 1.70 BuildRequires: cargo-packaging BuildRequires: openssl-devel @@ -46,7 +45,6 @@ Jujutsu is an experimental version control system. While Git compatibility is st %autosetup -p 1 -a 1 -n jj-%{version} mkdir -p .cargo rm -vf .cargo/config.toml -cp %{SOURCE2} .cargo/config %build %{cargo_build} diff --git a/vendor.tar.zst b/vendor.tar.zst index 9a6cd5a..53be63c 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9541f42f61a51a728f56c6b44005201042eed70155cf0c05a7c0373dde162bd -size 35156555 +oid sha256:77db88717d9385b317e0edee15c97186de8bb80e2b52d73e1ed660a11372b7a9 +size 48402097