| Index | index by Group | index by Distribution | index by Vendor | index by creation date | index by Name | Mirrors | Help | Search |
| Name: mergiraf | Distribution: openSUSE Tumbleweed |
| Version: 0.8.1 | Vendor: openSUSE |
| Release: 1.1 | Build date: Sat May 17 18:26:30 2025 |
| Group: Development/Tools/Version Control | Build host: reproducible |
| Size: 94258599 | Source RPM: mergiraf-0.8.1-1.1.src.rpm |
| Packager: https://bugs.opensuse.org | |
| Url: https://mergiraf.org/ | |
| Summary: A syntax-aware git merge driver | |
Mergiraf can solve a wide range of Git merge conflicts. That's because it's aware of the trees in your files! Thanks to its understanding of your language, it can often reconcile the needs of both sides.
GPL-3.0-or-later
* Sat May 17 2025 Martin Hauke <mardnh@gmx.de>
- Update to version 0.8.1
* Maintenance release to update out of a yanked dependency.
- Update to version 0.8.0
General improvements
* feat: Specify different separators for each children group of
a commutative parent.
* fix: Avoid displaying spurious conflicts.
* fix: Check that the merged text is syntactically valid and
consistent with the merged tree.
* fix: Handling of duplicate signatures in base revision.
* fix: Don't match nodes of different types.
* fix: Writing changeset to debug dir.
Language-specific improvements
* C/C++: Restrict commutativity of initializer_list.
* C/C++: even more C++ file extensions.
* C#: Restrict commutativity.
* YAML: Fix handling of quoted strings.
- Update to version 0.7.0
New languages
* Java Properties (.properties).
UX improvements
* file formats can be selected manually using the new
- -language option.
* zdiff3-style conflicts are detected and warned against, as
Mergiraf doesn't support solving those.
* using mergiraf solve together with jj gives a helpful error
message.
* the --keep option of mergiraf solve was renamed to --stdout.
Bug fixes
* Incorrect resolution of delete-delete conflict.
* Spurious indentation changes on untouched nodes.
* Missing file extensions for C++.
* Unidentified conflict between --keep-backup and --stdout.
* The --debug option was advertised in commands where it doesn't
have any effect.
* Java: Missing commutativity for 'throws' declarations.
* Java: Missing commutativity in interfaces.
* Python: Missing commutativity for "import from" statements.
Performance
* Many optimizations.
* Sun Mar 02 2025 Martin Hauke <mardnh@gmx.de>
- Update to version 0.6.0:
New language
* SystemVerilog (*.sv, *.svh).
* Nix (*.nix).
New features
* feat(LangProfile::detect_from_filename): handle extension
comparison more correctly.
* feat(MergedTree::line_based_local_fallback_for_revnode): handle
the case of isomorphic left and right sides.
* feat(line_based_merge_with_duplicate_signature_detection): if
the line-merge has conflicts, reconstruct and check each
revision.
* feat: Add command to compare files by tree isomorphism.
Fixes
* fix(cli): add . to extensions in languages output.
* fix(cli): add actual docs to --conflict-marker-size option.
* fix(MergedTree/count_conflicts): respect conflict marker size.
* fix(highlight_duplicate_signatures): don't remove separators
if no conflict was built.
* fix(TreeBuilder): resolve not-really-conflicts (left and right
agree).
Performance improvements
* perf: use rustc-hash in more places.
* Sat Feb 08 2025 Martin Hauke <mardnh@gmx.de>
- Update to version 0.5.1:
Bugfix release
* The --compact option works again, without needing to supply
"--compact=true".
* Thu Feb 06 2025 Martin Hauke <mardnh@gmx.de>
- 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.
* Sun Dec 08 2024 Martin Hauke <mardnh@gmx.de>
- Update to version 0.4.0:
New languages
* Python
* TOML
* Scala
* Typescript
Performance
* Many performance improvements.
Bug fixes
* The solve command preserves revision names in conflicts.
* Don't swallow trailing whitespace of merged nodes.
* Make helpers runnable from any directory.
New features
* Replace MERGIRAF_DISABLE=1 by mergiraf=0
* Support for restricting commutativity.
* Wed Nov 13 2024 mardnh@gmx.de
- Update to version 0.3.1:
* Updated tree-sitter-xml to 0.7.0
* Tue Nov 12 2024 Martin Hauke <mardnh@gmx.de>
- Update to version 0.3.0
* New language: Dart (*.dart).
* .cc files are correctly detected as C++.
* Documentation improvements.
* Fixes to the integration test suite when GPG signing is enabled
* Sun Nov 10 2024 Martin Hauke <mardnh@gmx.de>
- Initial package, version 0.2.0
/usr/bin/mergiraf /usr/bin/mgf_dev /usr/share/doc/packages/mergiraf /usr/share/doc/packages/mergiraf/README.md /usr/share/licenses/mergiraf /usr/share/licenses/mergiraf/LICENSE.txt
Generated by rpm2html 1.8.1
Fabrice Bellet, Fri May 23 23:35:10 2025