resync-mode newer: Dropbox collab, local is not SoT
This commit is contained in:
@@ -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
|
Caps: --max-delete 1% AND --max-delete-files 10 AND --max-delete-size 1G
|
||||||
No --force, no --resilient. --max-lock 2h. Workdir mkdir lock.
|
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):
|
Windows (paste in PowerShell):
|
||||||
|
|
||||||
|
|||||||
@@ -179,6 +179,7 @@ func bisyncArgs(cfg Config, extra ...string) []string {
|
|||||||
"--max-lock", "2h",
|
"--max-lock", "2h",
|
||||||
"--recover",
|
"--recover",
|
||||||
"--conflict-resolve", "none",
|
"--conflict-resolve", "none",
|
||||||
|
"--resync-mode", "newer",
|
||||||
}
|
}
|
||||||
return append(args, extra...)
|
return append(args, extra...)
|
||||||
}
|
}
|
||||||
@@ -215,13 +216,13 @@ func runOnce(cfg Config, acceptResync bool) error {
|
|||||||
if !listingsExist(cfg) {
|
if !listingsExist(cfg) {
|
||||||
// First use only: never auto --resync after a failed normal run.
|
// First use only: never auto --resync after a failed normal run.
|
||||||
if !acceptResync {
|
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 {
|
if err := runRclone(cfg, "--dry-run", "--resync"); err != nil {
|
||||||
notify("rclone-bisync dry-run failed", err.Error())
|
notify("rclone-bisync dry-run failed", err.Error())
|
||||||
return err
|
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 {
|
if err := runRclone(cfg, "--resync"); err != nil {
|
||||||
notify("rclone-bisync resync failed", err.Error())
|
notify("rclone-bisync resync failed", err.Error())
|
||||||
return err
|
return err
|
||||||
|
|||||||
Reference in New Issue
Block a user