- 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) (forwarded request 1316068 from develop7)
OBS-URL: https://build.opensuse.org/request/show/1316069
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mergiraf?expand=0&rev=8
* 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)
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mergiraf?expand=0&rev=15
* 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.
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mergiraf?expand=0&rev=9
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.
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mergiraf?expand=0&rev=7
Bugfix release
* The --compact option works again, without needing to supply
"--compact=true".
- 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
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/mergiraf?expand=0&rev=5
2025-02-10 13:49:19 +00:00
8 changed files with 430 additions and 13 deletions
oid sha256:b5e92c70355771d7075175c232fb0bfe009c0d0bc8d489e80f35e9ed06b318c0
size 18512231
oid sha256:d9de33d93be31f42f345b24f92288c24f317fc471c7412295b60f74b38922a19
size 24644176
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
