Repository navigation
feat: detect and expose Syncthing conflict files - #171
DenizAltunkapan merged 4 commits into
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Agent review
Suggestion: approve. I did not find any high-confidence correctness, security, regression, or missing-test issues in this diff.
Generated by Pull Request Review for #171 · copilot · auto · 15 AIC · ⌖ 0.496 AIC · ⊞ 7.1K
DenizAltunkapan
left a comment
DenizAltunkapan
left a comment
There was a problem hiding this comment.
I would hold this until the branch is updated onto current main. The PR checks passed on the old base, but a clean merge with current main fails to compile because FolderService no longer owns resolvePathWithinRoot after PR 167. Please replace the new calls with the FileUtils helper and rerun Backend CI on the updated branch.
There was a problem hiding this comment.
Agent review
Two issues. The symlink one is merge-blocking because it can make a folder listing fail. The regex one is a correctness gap. Details are in the inline comments.
Generated by Pull Request Review for #171 · copilot · auto · 16 AIC · ⌖ 0.501 AIC · ⊞ 7.1K
There was a problem hiding this comment.
Agent review
Suggestion: approve. I did not find any high-confidence correctness, security, regression, or missing-test issues in this diff.
Generated by Pull Request Review for #171 · copilot · auto · 16.4 AIC · ⌖ 0.496 AIC · ⊞ 7.1K
Superseded by updated review from same workflow.
|
Updated the branch and addressed the requested changes, including the multi-dot conflict filename case and symlink-safe original path handling. All checks are passing now. |
DenizAltunkapan
left a comment
DenizAltunkapan
left a comment
There was a problem hiding this comment.
@IhorHaidukov Thanks!
2 participants
Closes #161
What changed
conflictandoriginalPathmetadataoriginalPathnull when the likely original file does not existTesting
FolderServiceTest: 78 tests, 0 failures, 0 errorsspotless:check: passedFileServiceTest.editLockKey_resolvesSymlinkedFoldersToTheSameKey