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-01-27 16:11:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mergiraf (Old) and /work/SRC/openSUSE:Factory/.mergiraf.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mergiraf" Tue Jan 27 16:11:39 2026 rev:9 rq:1329330 version:0.16.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mergiraf/mergiraf.changes 2025-11-07 18:23:54.223091143 +0100 +++ /work/SRC/openSUSE:Factory/.mergiraf.new.1928/mergiraf.changes 2026-01-27 16:12:25.642334122 +0100 @@ -1,0 +2,34 @@ +Mon Jan 26 14:20:39 UTC 2026 - Andrei Dziahel <[email protected]> + +- Update to version 0.16.3: + * Set version to 0.16.3 + * chore: update Cargo.lock after downgrating ts-systemverilog + * chore: downgrade tree-sitter-systemverilog to 0.2.1 + * Set version to 0.16.2 + * test(lang_profile): clean-up (#684) + * refactor(mgf_dev): introduce a helper for parsing (#683) + * fix(solve): return non-zero exit code if conflicts remain after solve command (#670) + * chore: update some docs (#672) + * fix(TOML): treat quoted_key as atomic, fixing their merging (#668) + * fix(`DisplaySettings`): use `#[cfg(debug_assertions)]` to properly handle conditional field (#666) + * test: use range literals (#667) + * chore: allow to build .deb package with simply "cargo deb" (#664) + * fix(flake): add rust-analyzer to the devshell (#665) + * perf(`TreeBuilder::build_tree`): only filter out modified children once (#661) + * fix(book): remove obsoleted property multilingual (#663) + * feat(merge): fallback to `git merge-file` when one of the input files contains conflict markers (#643) + * perf: store conflict regexes inside `DisplaySettings` (#659) + * chore: introduce ParsingError type (#657) + * doc: improve contributing instructions (#644) + * fix(ci): reinstate the caching based on the Rust version (#656) + * refactor: adjust `merge_result.contents` directly (#655) + * doc: add note about signature definitions (#651) + * docs: simple link fix (#654) + * refactor(newline): perform the newline-style imitation in two steps (#650) + * fix: add snapshots folder to source filtering to fix the check stage of the nix build (#649) + * test(supported_langs): check that commutative parents' children all have signatures defined (#507) + * log: enclose paths in quotes when printing (#642) + * fix: language detection for filenames without extensions (#641) + * ci: add links to Apple Dockerfiles (#636) + +------------------------------------------------------------------- Old: ---- mergiraf-0.16.1.obscpio New: ---- mergiraf-0.16.3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mergiraf.spec ++++++ --- /var/tmp/diff_new_pack.WZX0wA/_old 2026-01-27 16:12:30.662543644 +0100 +++ /var/tmp/diff_new_pack.WZX0wA/_new 2026-01-27 16:12:30.662543644 +0100 @@ -1,7 +1,7 @@ # # spec file for package mergiraf # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # Copyright (c) 2024-2025, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: mergiraf -Version: 0.16.1 +Version: 0.16.3 Release: 0 Summary: A syntax-aware git merge driver License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.WZX0wA/_old 2026-01-27 16:12:30.698545147 +0100 +++ /var/tmp/diff_new_pack.WZX0wA/_new 2026-01-27 16:12:30.702545313 +0100 @@ -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.16.1</param> + <param name="revision">v0.16.3</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.WZX0wA/_old 2026-01-27 16:12:30.722546148 +0100 +++ /var/tmp/diff_new_pack.WZX0wA/_new 2026-01-27 16:12:30.726546315 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://codeberg.org/mergiraf/mergiraf.git</param> - <param name="changesrevision">0522ff6dc5d74fbf9302bb48e617948cda9d899a</param></service></servicedata> + <param name="changesrevision">3f27f0a065b8d74c572218814dce89a91bc9ee9b</param></service></servicedata> (No newline at EOF) ++++++ mergiraf-0.16.1.obscpio -> mergiraf-0.16.3.obscpio ++++++ ++++ 2672 lines of diff (skipped) ++++++ mergiraf.obsinfo ++++++ --- /var/tmp/diff_new_pack.WZX0wA/_old 2026-01-27 16:12:31.630584046 +0100 +++ /var/tmp/diff_new_pack.WZX0wA/_new 2026-01-27 16:12:31.642584547 +0100 @@ -1,5 +1,5 @@ name: mergiraf -version: 0.16.1 -mtime: 1762431763 -commit: 0522ff6dc5d74fbf9302bb48e617948cda9d899a +version: 0.16.3 +mtime: 1769421794 +commit: 3f27f0a065b8d74c572218814dce89a91bc9ee9b ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/mergiraf/vendor.tar.zst /work/SRC/openSUSE:Factory/.mergiraf.new.1928/vendor.tar.zst differ: char 7, line 1
