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-02-10 17:31:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mergiraf (Old) and /work/SRC/openSUSE:Factory/.mergiraf.new.19470 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mergiraf" Mon Feb 10 17:31:22 2025 rev:3 rq:1244770 version:0.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mergiraf/mergiraf.changes 2024-12-09 21:13:07.644871480 +0100 +++ /work/SRC/openSUSE:Factory/.mergiraf.new.19470/mergiraf.changes 2025-02-10 18:15:11.470190889 +0100 @@ -1,0 +2,43 @@ +Sat Feb 8 10:43:50 UTC 2025 - Martin Hauke <[email protected]> + +- Update to version 0.5.1: + Bugfix release + * The --compact option works again, without needing to supply + "--compact=true". + +------------------------------------------------------------------- +Thu Feb 6 18:51:37 UTC 2025 - Martin Hauke <[email protected]> + +- Update to version 0.5.0: + New languages + * PHP + * Solidity + * TSX + * Lua + * Kotlin + * Devicetree + * Ruby + Improvements + * The histogram diff algorithm is used for line-based merges. + * The mgf_dev parse command correctly displays nodes that have + a signature and are commutative at the same time. + * Don't add a newline at the end of merged / to-be-merged files. + * Also parse correctly conflicts with non-newline-terminated + sides. + * The --keep-output option was added to the mergiraf solve to + control the creation of .orig files. + * The conflict size marker size can be controlled with option -l + * The commutativity of various syntactic elements was restricted + to avoid bad merges. + * A --timeout option is available in mergiraf merge, to fall + back on line-based merging if structured merging takes too + long. + * A panic when failing to commutatively merge a root node was + fixed. + Compatibility + * Support for the MERGIRAF_DISABLE environment variable was + removed, use mergiraf=0 instead. + Performance + * Many improvements reducing memory allocations. + +------------------------------------------------------------------- Old: ---- mergiraf-0.4.0.obscpio New: ---- mergiraf-0.5.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mergiraf.spec ++++++ --- /var/tmp/diff_new_pack.4ikgTO/_old 2025-02-10 18:15:12.338226788 +0100 +++ /var/tmp/diff_new_pack.4ikgTO/_new 2025-02-10 18:15:12.342226953 +0100 @@ -1,6 +1,7 @@ # # spec file for package mergiraf # +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2024, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -17,7 +18,7 @@ Name: mergiraf -Version: 0.4.0 +Version: 0.5.1 Release: 0 Summary: A syntax-aware git merge driver License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.4ikgTO/_old 2025-02-10 18:15:12.374228277 +0100 +++ /var/tmp/diff_new_pack.4ikgTO/_new 2025-02-10 18:15:12.378228442 +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.4.0</param> + <param name="revision">v0.5.1</param> <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.4ikgTO/_old 2025-02-10 18:15:12.398229269 +0100 +++ /var/tmp/diff_new_pack.4ikgTO/_new 2025-02-10 18:15:12.402229435 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://codeberg.org/mergiraf/mergiraf.git</param> - <param name="changesrevision">08cefbaa8bda56aa901d939f80a517d03e0fbb7f</param></service></servicedata> + <param name="changesrevision">720c974f29e704118f4799cf190b2ec936bf0e5a</param></service></servicedata> (No newline at EOF) ++++++ mergiraf-0.4.0.obscpio -> mergiraf-0.5.1.obscpio ++++++ ++++ 11088 lines of diff (skipped) ++++++ mergiraf.obsinfo ++++++ --- /var/tmp/diff_new_pack.4ikgTO/_old 2025-02-10 18:15:12.802245978 +0100 +++ /var/tmp/diff_new_pack.4ikgTO/_new 2025-02-10 18:15:12.806246144 +0100 @@ -1,5 +1,5 @@ name: mergiraf -version: 0.4.0 -mtime: 1733645952 -commit: 08cefbaa8bda56aa901d939f80a517d03e0fbb7f +version: 0.5.1 +mtime: 1739010809 +commit: 720c974f29e704118f4799cf190b2ec936bf0e5a ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/mergiraf/vendor.tar.zst /work/SRC/openSUSE:Factory/.mergiraf.new.19470/vendor.tar.zst differ: char 7, line 1
