mirror of
https://github.com/rclone/rclone.git
synced 2024-12-02 13:25:51 +01:00
5ca61ab705
Improved detection of false positive change conflicts (identical files are now left alone instead of renamed) https://forum.rclone.org/t/bisync-bugs-and-feature-requests/37636#:~:text=1.%20Identical%20files%20should%20be%20left%20alone%2C%20even%20if%20new/newer/changed%20on%20both%20sides
53 lines
2.4 KiB
Plaintext
53 lines
2.4 KiB
Plaintext
(01) : test equal
|
|
|
|
|
|
(02) : test initial bisync
|
|
(03) : bisync resync
|
|
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
|
|
INFO : Copying unique Path2 files to Path1
|
|
INFO : Resynching Path1 to Path2
|
|
INFO : Resync updating listings
|
|
INFO : Bisync successful
|
|
|
|
(04) : test changed on both paths and NOT identical - file1 (file1R, file1L)
|
|
(05) : touch-glob 2001-01-02 {datadir/} file1R.txt
|
|
(06) : copy-as {datadir/}file1R.txt {path2/} file1.txt
|
|
(07) : touch-glob 2001-03-04 {datadir/} file1L.txt
|
|
(08) : copy-as {datadir/}file1L.txt {path1/} file1.txt
|
|
|
|
(09) : test changed on both paths and identical - file2
|
|
(10) : touch-glob 2001-01-02 {datadir/} file2.txt
|
|
(11) : copy-as {datadir/}file2.txt {path1/} file2.txt
|
|
(12) : copy-as {datadir/}file2.txt {path2/} file2.txt
|
|
|
|
(13) : test bisync run
|
|
(14) : bisync
|
|
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
|
|
INFO : Path1 checking for diffs
|
|
INFO : - Path1 File is newer - file1.txt
|
|
INFO : - Path1 File is newer - file2.txt
|
|
INFO : Path1: 2 changes: 0 new, 2 newer, 0 older, 0 deleted
|
|
INFO : Path2 checking for diffs
|
|
INFO : - Path2 File is newer - file1.txt
|
|
INFO : - Path2 File is newer - file2.txt
|
|
INFO : Path2: 2 changes: 0 new, 2 newer, 0 older, 0 deleted
|
|
INFO : Applying changes
|
|
INFO : Checking potential conflicts...
|
|
ERROR : file1.txt: md5 differ
|
|
NOTICE: Local file system at {path2}: 1 differences found
|
|
NOTICE: Local file system at {path2}: 1 errors while checking
|
|
NOTICE: Local file system at {path2}: 1 matching files
|
|
INFO : Finished checking the potential conflicts. 1 differences found
|
|
NOTICE: - WARNING New or changed in both paths - file1.txt
|
|
NOTICE: - Path1 Renaming Path1 copy - {path1/}file1.txt..path1
|
|
NOTICE: - Path1 Queue copy to Path2 - {path2/}file1.txt..path1
|
|
NOTICE: - Path2 Renaming Path2 copy - {path2/}file1.txt..path2
|
|
NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.txt..path2
|
|
NOTICE: - WARNING New or changed in both paths - file2.txt
|
|
INFO : Files are equal! Skipping: file2.txt
|
|
INFO : - Path2 Do queued copies to - Path1
|
|
INFO : - Path1 Do queued copies to - Path2
|
|
INFO : Updating listings
|
|
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
|
|
INFO : Bisync successful
|