diff --git a/README.md b/README.md index a967d13..959b8ff 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Session: datastorage-dropbox (same listing/lock names on both OSes) Caps: --max-delete 1% AND --max-delete-files 10 AND --max-delete-size 1G No --force, no --resilient. --max-lock 2h. Workdir mkdir lock. +Neither side is SoT: --resync-mode newer, --conflict-resolve none. +Collaborator deletes of >10 files still abort (fail-closed). Windows (paste in PowerShell): diff --git a/cmd/rclone-bisyncd/main.go b/cmd/rclone-bisyncd/main.go index c7ee046..5f1c5d6 100644 --- a/cmd/rclone-bisyncd/main.go +++ b/cmd/rclone-bisyncd/main.go @@ -179,6 +179,7 @@ func bisyncArgs(cfg Config, extra ...string) []string { "--max-lock", "2h", "--recover", "--conflict-resolve", "none", + "--resync-mode", "newer", } return append(args, extra...) } @@ -215,13 +216,13 @@ func runOnce(cfg Config, acceptResync bool) error { if !listingsExist(cfg) { // First use only: never auto --resync after a failed normal run. if !acceptResync { - notify("rclone-bisync", "No listings — dry-run --resync") + notify("rclone-bisync", "No listings — dry-run --resync --resync-mode newer") if err := runRclone(cfg, "--dry-run", "--resync"); err != nil { notify("rclone-bisync dry-run failed", err.Error()) return err } } - notify("rclone-bisync", "Live --resync (first listings)") + notify("rclone-bisync", "Live --resync --resync-mode newer (first listings)") if err := runRclone(cfg, "--resync"); err != nil { notify("rclone-bisync resync failed", err.Error()) return err