709e95b4a0
- 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)
Andrei Dziahel2025-11-06 16:34:39 +00:00
2e4fbf4e81
Accepting request 1313234 from devel:tools:scm
Ana Guerrero2025-10-24 15:23:17 +00:00
e8496afb7a
Accepting request 1278334 from devel:tools:scm
Ana Guerrero2025-05-20 07:38:19 +00:00
0a55a6a59d
- 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.
Martin Pluskal2025-05-19 07:48:24 +00:00
2449da9a48
Accepting request 1249606 from devel:tools:scm
Ana Guerrero2025-03-03 15:43:32 +00:00
81d0920610
- 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.
Martin Pluskal2025-03-03 07:22:47 +00:00
8c69159baa
Accepting request 1244770 from devel:tools:scm
Ana Guerrero2025-02-10 16:31:22 +00:00
d8817684bb
- Update to version 0.5.1: Bugfix release * The --compact option works again, without needing to supply "--compact=true".
Dirk Mueller2025-02-10 13:49:19 +00:00
5b10cce359
- 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.
Martin Pluskal2024-12-08 20:51:26 +00:00
4cc6169cd4
Accepting request 1224818 from devel:tools:scm
Ana Guerrero2024-12-08 10:36:57 +00:00
Ana Guerrero
Andrei Dziahel
Dominique Leuenberger
Takashi Iwai
Martin Pluskal
Dirk Mueller