You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by xu...@apache.org on 2026/10/26 20:25:07 UTC
(opendal-yinyang) branch xuanwo/managed-sync-resolution updated: fix: drop the unused subtree resolution record parameter
This is an automated email from the ASF dual-hosted git repository.
Xuanwo pushed a commit to branch xuanwo/managed-sync-resolution
in repository https://gitbox.apache.org/repos/asf/opendal-yinyang.git
The following commit(s) were added to refs/heads/xuanwo/managed-sync-resolution by this push:
new 81897bf fix: drop the unused subtree resolution record parameter
81897bf is described below
commit 81897bf76465b6b094325e5ff9eb6a031da0c8a0
Author: Xuanwo <gi...@xuanwo.io>
AuthorDate: Tue Oct 27 04:25:00 2026 +0800
fix: drop the unused subtree resolution record parameter
Co-authored-by: Chojan Shang <ps...@apache.org>
---
src/replica/directory/resolution.rs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/replica/directory/resolution.rs b/src/replica/directory/resolution.rs
index f880962..5b1f9b4 100644
--- a/src/replica/directory/resolution.rs
+++ b/src/replica/directory/resolution.rs
@@ -116,7 +116,7 @@ impl DirectorySync {
};
let revision = snapshot.revision();
if node.is_directory() {
- self.materialize_remote_subtree(record, &path, &snapshot, revision)
+ self.materialize_remote_subtree(&path, &snapshot, revision)
.await
} else {
self.materialize_remote_file(record, &path, &snapshot, revision, node)
@@ -886,7 +886,6 @@ impl DirectorySync {
/// recorded remote tree.
async fn materialize_remote_subtree(
&mut self,
- record: &ConflictRecord,
path: &str,
snapshot: &Snapshot,
revision: Revision,