From f1ad757bb9d03478d65c998bf6d4f5bb2587201abcdc65af0afee9303d84fdee Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 1 Nov 2023 20:01:44 +0000 Subject: [PATCH] Accepting request 1121697 from home:ojkastl_buildservice:Branch_devel_tools_scm update to 0.11.0 OBS-URL: https://build.opensuse.org/request/show/1121697 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/jujutsu?expand=0&rev=2 --- _service | 4 +-- _servicedata | 2 +- jj-0.10.0.obscpio | 3 --- jj-0.11.0.obscpio | 3 +++ jj.obsinfo | 6 ++--- jujutsu.changes | 66 +++++++++++++++++++++++++++++++++++++++++++++++ jujutsu.spec | 2 +- vendor.tar.zst | 4 +-- 8 files changed, 78 insertions(+), 12 deletions(-) delete mode 100644 jj-0.10.0.obscpio create mode 100644 jj-0.11.0.obscpio diff --git a/_service b/_service index 38b28b0..4c9433f 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ git .git @PARENT_TAG@ - v0.10.0 - enable + v0.11.0 + false v(.*) diff --git a/_servicedata b/_servicedata index 54640d8..575a728 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/martinvonz/jj - ce933507df6eb51286cb7c7e3f1aaa53e581a3ef \ No newline at end of file + f00f7527ddce21886fe93e11324c5227f15eeaca \ No newline at end of file diff --git a/jj-0.10.0.obscpio b/jj-0.10.0.obscpio deleted file mode 100644 index 8721abf..0000000 --- a/jj-0.10.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27df117dae5c1b8cd103dee0480f312d4fd8ac590c12b9c69970eb03fdf692f3 -size 4163084 diff --git a/jj-0.11.0.obscpio b/jj-0.11.0.obscpio new file mode 100644 index 0000000..1f7472e --- /dev/null +++ b/jj-0.11.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c065d0475c9a0bef79af115d9ba689df80c78e2195bcdebff0fc3f23fddf737c +size 4383756 diff --git a/jj.obsinfo b/jj.obsinfo index a02a943..00cf400 100644 --- a/jj.obsinfo +++ b/jj.obsinfo @@ -1,4 +1,4 @@ name: jj -version: 0.10.0 -mtime: 1696463145 -commit: ce933507df6eb51286cb7c7e3f1aaa53e581a3ef +version: 0.11.0 +mtime: 1698862124 +commit: f00f7527ddce21886fe93e11324c5227f15eeaca diff --git a/jujutsu.changes b/jujutsu.changes index 975a038..f47c125 100644 --- a/jujutsu.changes +++ b/jujutsu.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Wed Nov 01 19:12:45 UTC 2023 - kastl@b1-systems.de + +- Update to version 0.11.0: + * Breaking changes + - Conflicts are now stored in a different way. Commits written + by a new jj binary will not be read correctly by older jj + binaries. The new model solves some performance problems with + the old model. For example, jj log should be noticeably + faster on large repos. You may need to create a new clone to + see the full speedup. + - The remote_branches() revset now includes branches exported + to the Git repository (so called Git-tracking branches.) Use + remote_branches(remote=exact:"origin") to query branches of + certain remote. + - Status messages are now printed to stderr. + - jj config set now interprets the value as TOML also if it's a + valid TOML array or table. For example, jj config set --user + 'aliases.n' '["new"]' + - Remote branches now have tracking or non-tracking flags. The + git.auto-local-branch setting is applied only to newly + fetched remote branches. Existing remote branches are + migrated as follows: + - If local branch exists, the corresponding remote branches + are considered tracking branches. + - Otherwise, the remote branches are non-tracking branches. + - If the deduced tracking flags are wrong, use jj branch + track/untrack commands to fix them up. + - See automatic local branch creation for details. + - Non-tracking remote branches aren't listed by default. Use jj + branch list --all to show all local and remote branches. + - It's not allowed to push branches if non-tracking remote + branches of the same name exist. + - Pushing deleted/moved branches no longer abandons the local + commits referenced by the remote branches. + - jj git fetch --branch now requires glob: prefix to expand * + in branch name. + * New features + - jj's stable release can now be installed with cargo binstall + jj-cli. + - jj workspace add now takes a --revision argument. + - jj workspace forget can now forget multiple workspaces at + once. + - branches()/remote_branches()/author()/committer()/description() + revsets now support glob matching. + - jj branch delete/forget/list, and jj git push --branch now + support string pattern syntax. The --glob option is + deprecated in favor of glob: pattern. + - The branches/tags/git_refs/git_head template keywords now + return a list of RefNames. They were previously pre-formatted + strings. + - The new template keywords local_branches/remote_branches are + added to show only local/remote branches. + - jj workspace add now preserves all parents of the old + working-copy commit instead of just the first one. + - jj rebase -r gained the ability to rebase a revision A onto a + descendant of A. + * Fixed bugs + - Updating the working copy to a commit where a file that's + currently ignored in the working copy no longer leads to a + crash (#976). + - Conflicts in executable files can now be resolved just like + conflicts in non-executable files (#1279). + - jj new --insert-before and --insert-after now respect + immutable revisions (#2468). + ------------------------------------------------------------------- Mon Oct 9 15:49:09 UTC 2023 - Johannes Kastl diff --git a/jujutsu.spec b/jujutsu.spec index 44a280f..8fbfae0 100644 --- a/jujutsu.spec +++ b/jujutsu.spec @@ -19,7 +19,7 @@ %define binary_name jj Name: jujutsu -Version: 0.10.0 +Version: 0.11.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 1a2efba..9a6cd5a 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f24981da4e4108e0dd713482a425ea206e1a7809be146014b7e1bf89944f94e1 -size 43333746 +oid sha256:e9541f42f61a51a728f56c6b44005201042eed70155cf0c05a7c0373dde162bd +size 35156555