You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tooling.apache.org by "userdefined111 (via GitHub)" <gi...@apache.org> on 2026/02/16 17:16:43 UTC
[PR] Added merge logging to track file changes (tooling-trusted-releases)
userdefined111 opened a new pull request, #652:
URL: https://github.com/apache/tooling-trusted-releases/pull/652
## Pull request summary <!-- markdownlint-disable-line MD041 -->
**Meaningful subject (required):**
<!--
Provide a clear, concise subject line.
Good:
"Fix schema endpoint auth bypass for OpenAPI"
"Refactor report authorization filters"
Bad:
"Fix"
"Updates"
-->
**Description:**
<!-- Explain what this PR changes and why -->
---
## Required acknowledgements
Please replace each `[ ]` with `[x]` to confirm.
PRs missing confirmations may be closed or converted to Draft.
* [ ] I have read and followed **CONTRIBUTING.md**
* [ ] I have read **DEVELOPMENT.md**
* [ ] I have run the required tests and checks locally
* [ ] All required checks are currently passing
* [ ] This branch is **rebased on the current `main` branch**
---
## Draft requirement
If **any** of the following are true:
* Tests or checks are failing
* Work is incomplete
* Rebase on `main` is pending
**This PR MUST be opened or converted to a Draft**:
Convert to a ready PR only after all acknowledgements above can be confirmed.
---
## Rebase confirmation details (optional but encouraged)
<!--
If helpful, note how the rebase was done:
git fetch origin
git rebase origin/main
-->
---
## Additional notes
<!--
Anything reviewers should know:
- Design decisions
- Follow-up work
- Compatibility concerns
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@tooling.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tooling.apache.org
For additional commands, e-mail: dev-help@tooling.apache.org
Re: [PR] Added merge logging to track file changes (tooling-trusted-releases)
Posted by "userdefined111 (via GitHub)" <gi...@apache.org>.
userdefined111 closed pull request #652: Added merge logging to track file changes
URL: https://github.com/apache/tooling-trusted-releases/pull/652
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@tooling.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tooling.apache.org
For additional commands, e-mail: dev-help@tooling.apache.org
Re: [PR] Added merge logging to track file changes (tooling-trusted-releases)
Posted by "userdefined111 (via GitHub)" <gi...@apache.org>.
userdefined111 commented on PR #652:
URL: https://github.com/apache/tooling-trusted-releases/pull/652#issuecomment-3909698392
@
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@tooling.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tooling.apache.org
For additional commands, e-mail: dev-help@tooling.apache.org
Re: [PR] Added merge logging to track file changes (tooling-trusted-releases)
Posted by "userdefined111 (via GitHub)" <gi...@apache.org>.
userdefined111 commented on PR #652:
URL: https://github.com/apache/tooling-trusted-releases/pull/652#issuecomment-3909696541
### Summary
This PR implements operation logging for the merge process. Previously, the `merge()` function performed file operations silently. This change updates `merge.py` to return a detailed log of all actions (add, delete, skip, replace) and updates the storage logic to persist this log to the revision object.
### Changes
* **Modified `atr/shared/merge.py`:**
* Updated `merge()` to return `ops: list[dict[str, str]]` instead of `None`.
* Added logic to append an operation record (e.g., `{"path": "...", "action": "...", "reason": "..."}`) for every file handling case.
* Refactored internal helpers (`_merge_all_present`) to pass the `ops` list down for accurate logging.
* **Modified `atr/storage.py`:**
* Updated the call to `merge.merge()` in `CommitteeParticipant.create_and_manage`.
* Captured the returned `merge_ops` list.
* Assigned the log to `new_revision.merge_log` so it is saved to the database.
### Impact
This change allows us to track exactly how a revision was constructed from its parents. It provides an audit trail for debugging merge conflicts and verifying that file operations (like deletions or replacements) occurred correctly.
### Checklist
- [x] I have read and followed CONTRIBUTING.md
- [x] I have read DEVELOPMENT.md
- [x] I have run the required tests and checks locally
- [x] All required checks are currently passing
- [x] This branch is rebased on the current main branch
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@tooling.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tooling.apache.org
For additional commands, e-mail: dev-help@tooling.apache.org