Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mergiraf for openSUSE:Factory checked in at 2025-11-07 18:22:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mergiraf (Old) and /work/SRC/openSUSE:Factory/.mergiraf.new.1980 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mergiraf" Fri Nov 7 18:22:07 2025 rev:8 rq:1316069 version:0.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mergiraf/mergiraf.changes 2025-10-24 17:23:52.972543537 +0200 +++ /work/SRC/openSUSE:Factory/.mergiraf.new.1980/mergiraf.changes 2025-11-07 18:23:54.223091143 +0100 @@ -1,0 +2,25 @@ +Thu Nov 06 16:27:36 UTC 2025 - Andrei Dziahel <[email protected]> + +- Update to version 0.16.1: + * Set version to 0.16.1 + * ci: update action to upload releases (#640) +- Update to version 0.16.0: + * Set version to 0.16.0 + * feat: use tree-sitter-c to parse `.c` files (#634) + * ci: generate release artifacts (#635) + * test: allow passing contents to `create_file{s,}_for_{merge,solve}` (#632) + * chore: update dependencies (#628) + * fix(Rust): restrict commutativity of `derive` attributes (#626) + * fix: stack overflow when forcing line-based merges (#623) + * fix(merge): don't panic on non-UTF-8 content (#620) + * fix(merge): Don't fail if the revisions contain stray conflict markers (#615) + * feat(rust): Add `derive` attribute as commutative parent (#614) + * fix: preserve CRLF newlines in `solve` and `merge` commands (#608) + * fix(toml): Invalid signature for keys (#607) + * chore: Better error types for TreeBuilder (#563) + * perf: reduce the number of calls to git-check-attr (#602) + * chore(lang_profile): rm leftover function (#604) + * feat(Git): support reading language from git attributes (#599) + * docs: Further improvements to the tutorial to add a language (#597) + +------------------------------------------------------------------- Old: ---- mergiraf-0.15.0.obscpio New: ---- mergiraf-0.16.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mergiraf.spec ++++++ --- /var/tmp/diff_new_pack.arVqgp/_old 2025-11-07 18:23:56.315179013 +0100 +++ /var/tmp/diff_new_pack.arVqgp/_new 2025-11-07 18:23:56.319179181 +0100 @@ -18,7 +18,7 @@ Name: mergiraf -Version: 0.15.0 +Version: 0.16.1 Release: 0 Summary: A syntax-aware git merge driver License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.arVqgp/_old 2025-11-07 18:23:56.375181533 +0100 +++ /var/tmp/diff_new_pack.arVqgp/_new 2025-11-07 18:23:56.383181870 +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.15.0</param> + <param name="revision">v0.16.1</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.arVqgp/_old 2025-11-07 18:23:56.419183382 +0100 +++ /var/tmp/diff_new_pack.arVqgp/_new 2025-11-07 18:23:56.431183886 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://codeberg.org/mergiraf/mergiraf.git</param> - <param name="changesrevision">6e69355155f34a1afda505e6f237be45c784f245</param></service></servicedata> + <param name="changesrevision">0522ff6dc5d74fbf9302bb48e617948cda9d899a</param></service></servicedata> (No newline at EOF) ++++++ mergiraf-0.15.0.obscpio -> mergiraf-0.16.1.obscpio ++++++ ++++ 4391 lines of diff (skipped) ++++++ mergiraf.obsinfo ++++++ --- /var/tmp/diff_new_pack.arVqgp/_old 2025-11-07 18:23:57.763239834 +0100 +++ /var/tmp/diff_new_pack.arVqgp/_new 2025-11-07 18:23:57.787240842 +0100 @@ -1,5 +1,5 @@ name: mergiraf -version: 0.15.0 -mtime: 1758133667 -commit: 6e69355155f34a1afda505e6f237be45c784f245 +version: 0.16.1 +mtime: 1762431763 +commit: 0522ff6dc5d74fbf9302bb48e617948cda9d899a ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/mergiraf/vendor.tar.zst /work/SRC/openSUSE:Factory/.mergiraf.new.1980/vendor.tar.zst differ: char 7, line 1
