f-denkena/rclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bisync: fix --conflict-loser pathname with --conflict-resolve newer

Browse Source 
Before this change, --conflict-loser pathname assumed --conflict-resolve none,
following the legacy behavior prior to v1.66. This produced unexpected behavior
when used with a different --conflict-resolve option.

This change fixes the issue by ensuring that --conflict-loser pathname looks for
the correct name on the side not being renamed, when only one side should be
renamed.

https://forum.rclone.org/t/bisync-does-not-copy-the-winner-file-to-the-loser-site/53768
This commit is contained in:
nielash
2026-05-11 18:34:02 -04:00
parent acda43a74f
commit 35752d0079
11 changed files with 91 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/content/bisync.md
+5
View File
@@ -1899,6 +1899,11 @@ about *Unison* and synchronization in general.
## Changelog
### `v1.74.2`
- Fixed an issue causing `--conflict-loser pathname` to produce unexpected
behavior if using a non-default `--conflict-resolve` value.
### `v1.74`
- Added several missing `rc` parameters.