"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
bisync: fix --conflict-loser pathname with --conflict-resolve newer
nielash35752d007950
diff --git a/cmd/bisync/resolve.go b/cmd/bisync/resolve.goindex 0263201e2..fd2423c13 100644--- a/cmd/bisync/resolve.go+++ b/cmd/bisync/resolve.go@@ -165,6 +165,16 @@ func (b *bisyncRun) resolve(ctxMove context.Context, path1, path2, file, alias s},}+ if b.opt.ConflictLoser == ConflictLoserPathname {+ switch winningPath {+ case 1: // keep path1, rename path2+ r.path1.newName = r.path1.oldName+ case 2: // keep path2, rename path1+ r.path2.newName = r.path2.oldName+ }+ // case 0 keeps default+ }+// handle auto-numbering// note that we still queue copies for both files, whether or not we renamed// we also set these for ConflictLoserDelete in case there is no winner.diff --git a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.copy2to1.que b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.copy2to1.queindex 9ed593ba3..886874627 100644--- a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.copy2to1.que+++ b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.copy2to1.que@@ -1 +1 @@-"file2.txt"+"file1.txt.path2"diff --git a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lstindex 57872a027..d7d83c7e5 100644--- a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst+++ b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst@@ -1,6 +1,6 @@# bisync listing v1 from test- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"-- 33 - - 2006-03-04T00:00:00.000000000+0000 "file1.txt"+- 33 - - 2004-07-25T00:00:00.000000000+0000 "file1.txt"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path1"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path2"- 33 - - 2002-08-26T00:00:00.000000000+0000 "file1.txt.apple1"@@ -8,3 +8,5 @@- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.cloud1"- 33 - - 2001-08-26T00:00:00.000000000+0000 "file1.txt.dinosaur1"- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.local1"+- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt.path2"+- 33 - - 2006-03-04T00:00:00.000000000+0000 "file2.txt"diff --git a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst-newindex 454d9344c..07b7abe00 100644--- a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst-new+++ b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst-new@@ -1,6 +1,6 @@# bisync listing v1 from test- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"-- 33 - - 2006-03-04T00:00:00.000000000+0000 "file1.txt"+- 33 - - 2004-07-25T00:00:00.000000000+0000 "file1.txt"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path1"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path2"- 33 - - 2002-08-26T00:00:00.000000000+0000 "file1.txt.apple1"@@ -8,4 +8,4 @@- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.cloud1"- 33 - - 2001-08-26T00:00:00.000000000+0000 "file1.txt.dinosaur1"- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.local1"-- 33 - - 2005-01-02T00:00:00.000000000+0000 "file2.txt"+- 33 - - 2006-03-04T00:00:00.000000000+0000 "file2.txt"diff --git a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst-oldindex 2779be7ab..57872a027 100644--- a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst-old+++ b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path1.lst-old@@ -1,5 +1,6 @@# bisync listing v1 from test- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"+- 33 - - 2006-03-04T00:00:00.000000000+0000 "file1.txt"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path1"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path2"- 33 - - 2002-08-26T00:00:00.000000000+0000 "file1.txt.apple1"@@ -7,4 +8,3 @@- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.cloud1"- 33 - - 2001-08-26T00:00:00.000000000+0000 "file1.txt.dinosaur1"- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.local1"-- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"diff --git a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lstindex 57872a027..d7d83c7e5 100644--- a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst+++ b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst@@ -1,6 +1,6 @@# bisync listing v1 from test- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"-- 33 - - 2006-03-04T00:00:00.000000000+0000 "file1.txt"+- 33 - - 2004-07-25T00:00:00.000000000+0000 "file1.txt"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path1"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path2"- 33 - - 2002-08-26T00:00:00.000000000+0000 "file1.txt.apple1"@@ -8,3 +8,5 @@- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.cloud1"- 33 - - 2001-08-26T00:00:00.000000000+0000 "file1.txt.dinosaur1"- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.local1"+- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt.path2"+- 33 - - 2006-03-04T00:00:00.000000000+0000 "file2.txt"diff --git a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst-newindex 8b02b6d6a..6c7698203 100644--- a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst-new+++ b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst-new@@ -1,6 +1,6 @@# bisync listing v1 from test- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"-- 33 - - 2005-01-02T00:00:00.000000000+0000 "file1.txt"+- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path1"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path2"- 33 - - 2002-08-26T00:00:00.000000000+0000 "file1.txt.apple1"diff --git a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst-oldindex 2779be7ab..57872a027 100644--- a/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst-old+++ b/cmd/bisync/testdata/test_resolve/golden/_testdir_path1.._testdir_path2.path2.lst-old@@ -1,5 +1,6 @@# bisync listing v1 from test- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"+- 33 - - 2006-03-04T00:00:00.000000000+0000 "file1.txt"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path1"- 33 - - 2004-07-23T00:00:00.000000000+0000 "file1.txt..path2"- 33 - - 2002-08-26T00:00:00.000000000+0000 "file1.txt.apple1"@@ -7,4 +8,3 @@- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.cloud1"- 33 - - 2001-08-26T00:00:00.000000000+0000 "file1.txt.dinosaur1"- 33 - - 2003-07-23T00:00:00.000000000+0000 "file1.txt.local1"-- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"diff --git a/cmd/bisync/testdata/test_resolve/golden/test.log b/cmd/bisync/testdata/test_resolve/golden/test.logindex 27281e261..fb4d03c0c 100644--- a/cmd/bisync/testdata/test_resolve/golden/test.log+++ b/cmd/bisync/testdata/test_resolve/golden/test.log@@ -305,3 +305,56 @@ INFO : - [36mPath1[0m [35mDo queued copies to[0m - [36mPINFO : Updating listingsINFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"INFO : [32mBisync successful[0m++[36m(48) :[0m [34mtest --conflict-resolve newer --conflict-loser pathname --conflict-suffix path[0m+[36m(49) :[0m [34mtouch-glob 2004-07-23 {datadir/} file1R.txt[0m+[36m(50) :[0m [34mcopy-as {datadir/}file1R.txt {path2/} file1.txt[0m+[36m(51) :[0m [34mtouch-glob 2004-07-25 {datadir/} file1L.txt[0m+[36m(52) :[0m [34mcopy-as {datadir/}file1L.txt {path1/} file1.txt[0m++[36m(53) :[0m [34mtest bisync run with --conflict-resolve=newer --conflict-loser=pathname --conflict-suffix=path[0m++[36m(54) :[0m [34mbisync conflict-resolve=newer conflict-loser=pathname conflict-suffix=path[0m+INFO : [2mSetting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.[0m+INFO : Bisyncing with Comparison Settings:+{+"Modtime": true,+"Size": true,+"Checksum": false,+"NoSlowHash": false,+"SlowHashSyncOnly": false,+"DownloadHash": false+}+INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"+INFO : Building Path1 and Path2 listings+INFO : Path1 checking for diffs+INFO : - [36mPath1[0m [35m[33mFile changed: [35mtime (older)[0m[0m[0m - [36mfile1.txt[0m+INFO : - [36mPath1[0m [35m[32mFile is new[0m[0m - [36mfile2.txt[0m+INFO : Path1: 2 changes: [32m 1 new[0m, [33m 1 modified[0m, [31m 0 deleted[0m+INFO : ([33mModified[0m: [36m 0 newer[0m, [34m 1 older[0m)+INFO : Path2 checking for diffs+INFO : - [34mPath2[0m [35m[33mFile changed: [35mtime (older)[0m[0m[0m - [36mfile1.txt[0m+INFO : - [34mPath2[0m [35m[32mFile is new[0m[0m - [36mfile2.txt[0m+INFO : Path2: 2 changes: [32m 1 new[0m, [33m 1 modified[0m, [31m 0 deleted[0m+INFO : ([33mModified[0m: [36m 0 newer[0m, [34m 1 older[0m)+INFO : Applying changes+INFO : Checking potential conflicts...+ERROR : file1.txt: {hashtype} differ+NOTICE: {path2String}: 1 differences found+NOTICE: {path2String}: 1 errors while checking+NOTICE: {path2String}: 1 matching files+INFO : Finished checking the potential conflicts. 1 differences found+NOTICE: - [34mWARNING[0m [35mNew or changed in both paths[0m - [36mfile1.txt[0m+INFO : file1.txt: Path1 is newer. Path1: 2004-07-25 00:00:00 +0000 UTC, Path2: 2004-07-23 00:00:00 +0000 UTC, Difference: 48h0m0s+INFO : file1.txt: [32mThe winner is: Path1[0m+NOTICE: - [36mPath1[0m [35mNot renaming Path1 copy, as it was determined the winner[0m - [36m{path1/}file1.txt[0m+NOTICE: - [36mPath1[0m [35m[32mQueue copy to[0m Path2[0m - [36m{path2/}file1.txt[0m+NOTICE: - [34mPath2[0m [35mRenaming Path2 copy[0m - [36m{path2/}file1.txt.path2[0m+NOTICE: - [34mPath2[0m [35m[32mQueue copy to[0m Path1[0m - [36m{path1/}file1.txt.path2[0m+NOTICE: - [34mWARNING[0m [35mNew or changed in both paths[0m - [36mfile2.txt[0m+INFO : Files are equal! Skipping: file2.txt+INFO : - [34mPath2[0m [35mDo queued copies to[0m - [36mPath1[0m+INFO : - [36mPath1[0m [35mDo queued copies to[0m - [36mPath2[0m+INFO : Updating listings+INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"+INFO : [32mBisync successful[0mdiff --git a/cmd/bisync/testdata/test_resolve/scenario.txt b/cmd/bisync/testdata/test_resolve/scenario.txtindex 1e72757f7..f8197806e 100644--- a/cmd/bisync/testdata/test_resolve/scenario.txt+++ b/cmd/bisync/testdata/test_resolve/scenario.txt@@ -64,4 +64,14 @@ copy-as {datadir/}file1L.txt {path1/} file1.txtcopy-as {datadir/}file1L.txt {path2/} file2.txttest bisync run with --conflict-resolve=newer --conflict-loser=delete-bisync conflict-resolve=newer conflict-loser=delete\ No newline at end of file+bisync conflict-resolve=newer conflict-loser=delete++test --conflict-resolve newer --conflict-loser pathname --conflict-suffix path+touch-glob 2004-07-23 {datadir/} file1R.txt+copy-as {datadir/}file1R.txt {path2/} file1.txt+touch-glob 2004-07-25 {datadir/} file1L.txt+copy-as {datadir/}file1L.txt {path1/} file1.txt++test bisync run with --conflict-resolve=newer --conflict-loser=pathname --conflict-suffix=path+# result should be -- "file1.txt", "file1.txt.path2"+bisync conflict-resolve=newer conflict-loser=pathname conflict-suffix=path\ No newline at end of filediff --git a/docs/content/bisync.md b/docs/content/bisync.mdindex 98f7a9100..c2e3a0012 100644--- a/docs/content/bisync.md+++ b/docs/content/bisync.md@@ -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.