Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mergiraf for openSUSE:Factory checked in at 2026-07-17 01:43:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mergiraf (Old) and /work/SRC/openSUSE:Factory/.mergiraf.new.24530 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mergiraf" Fri Jul 17 01:43:40 2026 rev:11 rq:1366114 version:0.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mergiraf/mergiraf.changes 2026-05-08 20:08:56.433166939 +0200 +++ /work/SRC/openSUSE:Factory/.mergiraf.new.24530/mergiraf.changes 2026-07-17 01:44:21.639037645 +0200 @@ -1,0 +2,64 @@ +Wed Jul 15 16:45:25 UTC 2026 - Andrei Dziahel <[email protected]> + +- add jujutsu to BuildRequires (test suite) +- Update to version 0.18.0: + * Features + + Basic bash support (#766) by @djugei + + (starlark) The visibility list argument in BUILD files is also + commutative (#781) by @wesalvaro + + (supported_langs) Add buck2 and starlark related extensions + (#772) by @jakebailey + + Add basic support for Scheme (#749) by @jchrist + + Support Kotlin script (.kts) files (#793) by @davinkevin + + Support for Gleam (#756) by @helloyuki + * Bug Fixes + + Typo in Liberapay URL by @wetneb + + (solve) Downgrade jj being detected from error to a warning + (#790) by @ada4a + * Other + + Add a script to detect outdated dependencies + + Update `itertools` to 0.15 + + Update `etcetera` to 0.11 + + Update `oneshot` to 0.2 + + Update `zip` to 8.0 + + Update `tree-sitter-devicetree` to 0.15 + + Update `tree-sitter-fortran` to 0.6 + + Update `tree-sitter-java-orchard` to 0.5 + + Update `tree-sitter-lua` to 0.5 + + Update `tree-sitter-ocaml` to 0.25 + + Update `tree-sitter-rust-orchard` to 0.16 + + Update `tree-sitter-scala` to 0.26 + + Update `tree-sitter-systemverilog` to 0.3 + + Update `tree-sitter` to 0.26 + * Refactor + + Don't require `Arc` for `line_merge_and_structured_resolution` + (#791) by @ada4a + + (`ParsedMerge::parse`) Minor clean-ups (#792) by @ada4a + * Documentation + + Add a donation option (Liberapay) (#762) by @ada4a + + (readme) Acknowledge Zulip sponsorship of the public Zulip + instance (#783) by @mathstuf + + Document `line_based_merge_parsed` panicking when input sides + contain conflicts (#763) by @ada4a + * Governance + + Add ipsavitsky to the Developers team (#778) by @wetneb + * Testing + + (CMake) Add reformatting example (#776) by @OvidiusCicero + * Miscellaneous Tasks + + Install jj (#768) by @ada4a + + Add a nix image (#777) by @ipsavitsky + + Use 'cargo run' in helpers/run.sh (#784) by @wetneb + + Turn off sandbox inside the nix container (#786) by @ipsavitsky + + Set HOME in the nix runner container (#787) by @ipsavitsky + + Add `cargo-outdated` report to CI results + + Add a workflow to check for outdated deps weekly + + Check for outdated dependencies less frequently (#794) by @wetneb + + Update dependencies by @wetneb + * New Contributors + + @helloyuki made their first contribution in #756 + + @davinkevin made their first contribution in #793 + + @jchrist made their first contribution + + @wesalvaro made their first contribution in #781 + + @djugei made their first contribution in #766 + +------------------------------------------------------------------- Old: ---- mergiraf-0.17.0.obscpio New: ---- mergiraf-0.18.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mergiraf.spec ++++++ --- /var/tmp/diff_new_pack.orQxsz/_old 2026-07-17 01:44:24.603136594 +0200 +++ /var/tmp/diff_new_pack.orQxsz/_new 2026-07-17 01:44:24.615136996 +0200 @@ -18,7 +18,7 @@ Name: mergiraf -Version: 0.17.0 +Version: 0.18.0 Release: 0 Summary: A syntax-aware git merge driver License: GPL-3.0-or-later @@ -29,6 +29,7 @@ Source1: vendor.tar.zst BuildRequires: cargo-packaging BuildRequires: git-core +BuildRequires: jujutsu ExclusiveArch: %{rust_tier1_arches} %description ++++++ _service ++++++ --- /var/tmp/diff_new_pack.orQxsz/_old 2026-07-17 01:44:24.807143405 +0200 +++ /var/tmp/diff_new_pack.orQxsz/_new 2026-07-17 01:44:24.855145007 +0200 @@ -3,7 +3,7 @@ <param name="url">https://codeberg.org/mergiraf/mergiraf.git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="scm">git</param> - <param name="revision">v0.17.0</param> + <param name="revision">v0.18.0</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.orQxsz/_old 2026-07-17 01:44:25.023150616 +0200 +++ /var/tmp/diff_new_pack.orQxsz/_new 2026-07-17 01:44:25.059151818 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://codeberg.org/mergiraf/mergiraf.git</param> - <param name="changesrevision">11b88160fb47376d5b27d524cbed5daebfa0c997</param></service></servicedata> + <param name="changesrevision">e8e13887b85b8cb56b1dc1624c5f94e3d39182b6</param></service></servicedata> (No newline at EOF) ++++++ mergiraf-0.17.0.obscpio -> mergiraf-0.18.0.obscpio ++++++ ++++ 3363 lines of diff (skipped) ++++++ mergiraf.obsinfo ++++++ --- /var/tmp/diff_new_pack.orQxsz/_old 2026-07-17 01:44:26.795209772 +0200 +++ /var/tmp/diff_new_pack.orQxsz/_new 2026-07-17 01:44:26.799209906 +0200 @@ -1,5 +1,5 @@ name: mergiraf -version: 0.17.0 -mtime: 1778158812 -commit: 11b88160fb47376d5b27d524cbed5daebfa0c997 +version: 0.18.0 +mtime: 1784041711 +commit: e8e13887b85b8cb56b1dc1624c5f94e3d39182b6 ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/mergiraf/vendor.tar.zst /work/SRC/openSUSE:Factory/.mergiraf.new.24530/vendor.tar.zst differ: char 7, line 1
