Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

bisync: account for differences in backend features on integration tests - see #5679

nielash57624629d6b4
diff --git a/cmd/bisync/bisync_test.go b/cmd/bisync/bisync_test.go
index d0ce2e225..42130ca26 100644
--- a/cmd/bisync/bisync_test.go
+++ b/cmd/bisync/bisync_test.go
@@ -21,6 +21,7 @@ import (
"strings"
"testing"
"time"
+ "unicode/utf8"
"github.com/rclone/rclone/cmd/bisync"
"github.com/rclone/rclone/cmd/bisync/bilib"
@@ -29,11 +30,13 @@ import (
"github.com/rclone/rclone/fs/cache"
"github.com/rclone/rclone/fs/filter"
"github.com/rclone/rclone/fs/fspath"
+ "github.com/rclone/rclone/fs/hash"
"github.com/rclone/rclone/fs/object"
"github.com/rclone/rclone/fs/operations"
"github.com/rclone/rclone/fs/sync"
"github.com/rclone/rclone/fstest"
"github.com/rclone/rclone/lib/atexit"
+ "github.com/rclone/rclone/lib/encoder"
"github.com/rclone/rclone/lib/random"
"github.com/rclone/rclone/lib/terminal"
"golang.org/x/text/unicode/norm"
@@ -73,6 +76,10 @@ var logReplacements = []string{
`^NOTICE: too_many_(requests|write_operations)/\.*: Too many requests or write operations.*$`, dropMe,
`^NOTICE: Dropbox root .*?: Forced to upload files to set modification times on this backend.$`, dropMe,
`^INFO : .*?: src and dst identical but can't set mod time without deleting and re-uploading$`, dropMe,
+ // ignore crypt info messages
+ `^INFO : .*?: Crypt detected! Using cryptcheck instead of check. \(Use --size-only or --ignore-checksum to disable\)$`, dropMe,
+ // ignore drive info messages
+ `^NOTICE:.*?Files of unknown size \(such as Google Docs\) do not sync reliably with --checksum or --size-only\. Consider using modtime instead \(the default\) or --drive-skip-gdocs.*?$`, dropMe,
}
// Some dry-run messages differ depending on the particular remote.
@@ -110,7 +117,7 @@ var logHoppers = []string{
// Some log lines can contain Windows path separator that must be
// converted to "/" in every matching token to match golden logs.
var logLinesWithSlash = []string{
- `.*\(\d\d\) :.*(touch-glob|touch-copy|copy-file|copy-as|copy-dir|delete-file) `,
+ `.*\(\d\d\) :.*(fix-names|touch-glob|touch-copy|copy-file|copy-as|copy-dir|delete-file) `,
`INFO : - .*Path[12].* +.*Queue copy to Path[12].*`,
`INFO : Synching Path1 .*? with Path2 `,
`INFO : Validating listings for `,
@@ -476,17 +483,19 @@ func (b *bisyncTest) runTestStep(ctx context.Context, line string) (err error) {
}
testFunc := func() {
- testname := "volatile"
- path := "path1"
- src := filepath.Join(b.tempDir, testname, path, "file7.txt")
- dstBase1 := filepath.Join(b.tempDir, testname, "path1", "file")
- dstBase2 := filepath.Join(b.tempDir, testname, "path2", "file")
+ src := filepath.Join(b.dataDir, "file7.txt")
for i := 0; i < 50; i++ {
- dst := dstBase2 + fmt.Sprint(i) + ".txt"
- _ = bilib.CopyFile(src, dst)
- dst = dstBase1 + fmt.Sprint(100-i) + ".txt"
- _ = bilib.CopyFile(src, dst)
+ dst := "file" + fmt.Sprint(i) + ".txt"
+ err := b.copyFile(ctx, src, b.path2, dst)
+ if err != nil {
+ fs.Errorf(src, "error copying file: %v", err)
+ }
+ dst = "file" + fmt.Sprint(100-i) + ".txt"
+ err = b.copyFile(ctx, src, b.path1, dst)
+ if err != nil {
+ fs.Errorf(dst, "error copying file: %v", err)
+ }
}
}
@@ -506,7 +515,12 @@ func (b *bisyncTest) runTestStep(ctx context.Context, line string) (err error) {
if fsrc, err = fs.NewFs(ctx, args[1]); err != nil {
return err
}
- return purgeChildren(ctx, fsrc, "")
+ err = purgeChildren(ctx, fsrc, "")
+ if err != nil {
+ return err
+ }
+ flushCache(fsrc)
+ return
case "delete-file":
b.checkArgs(args, 1, 1)
dir, file := filepath.Split(args[1])
@@ -576,7 +590,10 @@ func (b *bisyncTest) runTestStep(ctx context.Context, line string) (err error) {
return err
case "list-dirs":
b.checkArgs(args, 1, 1)
- return b.listSubdirs(ctx, args[1])
+ return b.listSubdirs(ctx, args[1], true)
+ case "list-files":
+ b.checkArgs(args, 1, 1)
+ return b.listSubdirs(ctx, args[1], false)
case "bisync":
ci.NoUnicodeNormalization = false
ci.IgnoreCaseSync = false
@@ -585,6 +602,119 @@ func (b *bisyncTest) runTestStep(ctx context.Context, line string) (err error) {
case "test-func":
b.TestFn = testFunc
return
+ case "fix-names":
+ // in case the local os converted any filenames
+ ci.NoUnicodeNormalization = true
+ ci.FixCase = true
+ ci.IgnoreTimes = true
+ reset := func() {
+ ci.NoUnicodeNormalization = false
+ ci.FixCase = false
+ ci.IgnoreTimes = false
+ }
+ defer reset()
+ b.checkArgs(args, 1, 1)
+ var ok bool
+ var remoteName string
+ var remotePath string
+ remoteName, remotePath, err = fspath.SplitFs(args[1])
+ if err != nil {
+ return err
+ }
+ if remoteName == "" {
+ remoteName = "/"
+ }
+
+ fsrc, err = fs.NewFs(ctx, remoteName)
+ if err != nil {
+ return err
+ }
+
+ // DEBUG
+ fs.Debugf(remotePath, "is NFC: %v", norm.NFC.IsNormalString(remotePath))
+ fs.Debugf(remotePath, "is NFD: %v", norm.NFD.IsNormalString(remotePath))
+ fs.Debugf(remotePath, "is valid UTF8: %v", utf8.ValidString(remotePath))
+
+ // check if it's a dir, try moving it
+ var leaf string
+ _, leaf, err = fspath.Split(remotePath)
+ if err == nil && leaf == "" {
+ remotePath = args[1]
+ fs.Debugf(remotePath, "attempting to fix directory")
+
+ fixDirname := func(old, new string) {
+ if new != old {
+ oldName, err := fs.NewFs(ctx, old)
+ if err != nil {
+ fs.Logf(old, "error getting Fs: %v", err)
+ }
+ fs.Debugf(nil, "Attempting to move %s to %s", oldName.Root(), new)
+ // Create random name to temporarily move dir to
+ tmpDirName := strings.TrimSuffix(new, slash) + "-rclone-move-" + random.String(8)
+ var tmpDirFs fs.Fs
+ tmpDirFs, _ = fs.NewFs(ctx, tmpDirName)
+ err = sync.MoveDir(ctx, tmpDirFs, oldName, true, true)
+ if err != nil {
+ fs.Debugf(oldName, "error attempting to move folder: %v", err)
+ }
+ // now move the temp dir to real name
+ fsrc, _ = fs.NewFs(ctx, new)
+ err = sync.MoveDir(ctx, fsrc, tmpDirFs, true, true)
+ if err != nil {
+ fs.Debugf(tmpDirFs, "error attempting to move folder to %s: %v", fsrc.Root(), err)
+ }
+ } else {
+ fs.Debugf(nil, "old and new are equal. Skipping. %s (%s) %s (%s)", old, stringToHash(old), new, stringToHash(new))
+ }
+ }
+
+ if norm.NFC.String(remotePath) != remotePath && norm.NFD.String(remotePath) != remotePath {
+ fs.Debugf(remotePath, "This is neither fully NFD or NFC -- can't fix reliably!")
+ }
+ fixDirname(norm.NFC.String(remotePath), remotePath)
+ fixDirname(norm.NFD.String(remotePath), remotePath)
+ return
+ }
+
+ // if it's a file
+ fs.Debugf(remotePath, "attempting to fix file -- filename hash: %s", stringToHash(leaf))
+ fixFilename := func(old, new string) {
+ ok, err := fs.FileExists(ctx, fsrc, old)
+ if err != nil {
+ fs.Debugf(remotePath, "error checking if file exists: %v", err)
+ }
+ fs.Debugf(old, "file exists: %v %s", ok, stringToHash(old))
+ fs.Debugf(nil, "FILE old: %s new: %s equal: %v", old, new, old == new)
+ fs.Debugf(nil, "HASH old: %s new: %s equal: %v", stringToHash(old), stringToHash(new), stringToHash(old) == stringToHash(new))
+ if ok && new != old {
+ fs.Debugf(new, "attempting to rename %s to %s", old, new)
+ err = operations.MoveFile(ctx, fsrc, fsrc, new, old)
+ if err != nil {
+ fs.Errorf(new, "error trying to rename %s to %s - %v", old, new, err)
+ }
+ }
+ }
+
+ // look for NFC version
+ fixFilename(norm.NFC.String(remotePath), remotePath)
+ // if it's in a subdir we just moved, the file and directory might have different encodings. Check for that.
+ mixed := strings.TrimSuffix(norm.NFD.String(remotePath), norm.NFD.String(leaf)) + norm.NFC.String(leaf)
+ fixFilename(mixed, remotePath)
+ // Try NFD
+ fixFilename(norm.NFD.String(remotePath), remotePath)
+ // Try mixed in reverse
+ mixed = strings.TrimSuffix(norm.NFC.String(remotePath), norm.NFC.String(leaf)) + norm.NFD.String(leaf)
+ fixFilename(mixed, remotePath)
+ // check if it's right now, error if not
+ ok, err = fs.FileExists(ctx, fsrc, remotePath)
+ if !ok || err != nil {
+ fs.Logf(remotePath, "Can't find expected file %s (was it renamed by the os?) %v", args[1], err)
+ return
+ } else {
+ // include hash of filename to make unicode form differences easier to see in logs
+ fs.Debugf(remotePath, "verified file exists at correct path. filename hash: %s", stringToHash(leaf))
+ }
+ return
default:
return fmt.Errorf("unknown command: %q", args[0])
}
@@ -626,6 +756,13 @@ func (b *bisyncTest) checkArgs(args []string, min, max int) {
}
}
+func flushCache(f fs.Fs) {
+ dirCacheFlush := f.Features().DirCacheFlush
+ if dirCacheFlush == nil {
+ fs.Errorf(nil, "%v: can't flush dir cache", f)
+ }
+}
+
func (b *bisyncTest) runBisync(ctx context.Context, args []string) (err error) {
opt := &bisync.Options{
Workdir: b.workDir,
@@ -639,6 +776,10 @@ func (b *bisyncTest) runBisync(ctx context.Context, args []string) (err error) {
octx, ci := fs.AddConfig(ctx)
fs1, fs2 := b.fs1, b.fs2
+ // flush cache
+ flushCache(fs1)
+ flushCache(fs2)
+
addSubdir := func(path, subdir string) fs.Fs {
remote := path + subdir
f, err := fs.NewFs(ctx, remote)
@@ -747,7 +888,7 @@ func (b *bisyncTest) copyFile(ctx context.Context, src, dst, asName string) (err
var fsrc, fdst fs.Fs
var srcPath, srcFile, dstPath, dstFile string
- switch fsrc, err = cache.Get(ctx, src); err {
+ switch fsrc, err = fs.NewFs(ctx, src); err {
case fs.ErrorIsFile:
// ok
case nil:
@@ -770,7 +911,7 @@ func (b *bisyncTest) copyFile(ctx context.Context, src, dst, asName string) (err
if dstFile != "" {
dstPath = dst // force directory
}
- if fdst, err = cache.Get(ctx, dstPath); err != nil {
+ if fdst, err = fs.NewFs(ctx, dstPath); err != nil {
return err
}
@@ -787,23 +928,27 @@ func (b *bisyncTest) copyFile(ctx context.Context, src, dst, asName string) (err
return operations.CopyFile(fctx, fdst, fsrc, dstFile, srcFile)
}
-// listSubdirs is equivalent to `rclone lsf -R --dirs-only`
-func (b *bisyncTest) listSubdirs(ctx context.Context, remote string) error {
+// listSubdirs is equivalent to `rclone lsf -R [--dirs-only]`
+func (b *bisyncTest) listSubdirs(ctx context.Context, remote string, DirsOnly bool) error {
f, err := fs.NewFs(ctx, remote)
if err != nil {
return err
}
+
+ // flush cache
+ flushCache(f)
+
opt := operations.ListJSONOpt{
NoModTime: true,
NoMimeType: true,
- DirsOnly: true,
+ DirsOnly: DirsOnly,
Recurse: true,
}
fmt := operations.ListFormat{}
fmt.SetDirSlash(true)
fmt.AddPath()
printItem := func(item *operations.ListJSONItem) error {
- b.logPrintf("%s", fmt.Format(item))
+ b.logPrintf("%s - filename hash: %s", fmt.Format(item), stringToHash(item.Name))
return nil
}
return operations.ListJSON(ctx, f, "", &opt, printItem)
@@ -1058,9 +1203,12 @@ func (b *bisyncTest) mangleResult(dir, file string, golden bool) string {
case "queue":
lines := strings.Split(text, eol)
sort.Strings(lines)
+ for i, line := range lines {
+ lines[i] = normalizeEncoding(line)
+ }
return joinLines(lines)
case "listing":
- return mangleListing(text, golden)
+ return b.mangleListing(text, golden, file)
case "log":
// fall thru
default:
@@ -1068,7 +1216,16 @@ func (b *bisyncTest) mangleResult(dir, file string, golden bool) string {
}
// Adapt log lines to the golden way.
- lines := strings.Split(string(buf), eol)
+ // First replace filenames with whitespace
+ // some backends (such as crypt) log them on multiple lines due to encoding differences, while others (local) do not
+ wsrep := []string{
+ "subdir with" + eol + "white space.txt/file2 with" + eol + "white space.txt",
+ "subdir with white space.txt/file2 with white space.txt",
+ }
+ whitespaceJoiner := strings.NewReplacer(wsrep...)
+ s := whitespaceJoiner.Replace(string(buf))
+
+ lines := strings.Split(s, eol)
pathReplacer := b.newReplacer(true)
rep := logReplacements
@@ -1152,7 +1309,7 @@ func (b *bisyncTest) mangleResult(dir, file string, golden bool) string {
}
// mangleListing sorts listing lines before comparing.
-func mangleListing(text string, golden bool) string {
+func (b *bisyncTest) mangleListing(text string, golden bool, file string) string {
lines := strings.Split(text, eol)
hasHeader := len(lines) > 0 && strings.HasPrefix(lines[0], bisync.ListingHeader)
@@ -1176,12 +1333,43 @@ func mangleListing(text string, golden bool) string {
return getFile(lines[i]) < getFile(lines[j])
})
- // Store hash as golden but ignore when comparing.
+ // parse whether this is Path1 or Path2 (so we can apply per-Fs precision/hash settings)
+ isPath1 := strings.Contains(file, ".path1.lst")
+ f := b.fs2
+ if isPath1 {
+ f = b.fs1
+ }
+
+ // account for differences in backend features when comparing
if !golden {
for i, s := range lines {
+ // Store hash as golden but ignore when comparing (only if no md5 support).
match := regex.FindStringSubmatch(strings.TrimSpace(s))
- if match != nil && match[2] != "-" {
- lines[i] = match[1] + "-" + match[3] + match[4]
+ if match != nil && match[2] != "-" && (!b.fs1.Hashes().Contains(hash.MD5) || !b.fs2.Hashes().Contains(hash.MD5)) { // if hash is not empty and either side lacks md5
+ lines[i] = match[1] + "-" + match[3] + match[4] // replace it with "-" for comparison purposes (see #5679)
+ }
+ // account for modtime precision
+ var lineRegex = regexp.MustCompile(`^(\S) +(-?\d+) (\S+) (\S+) (\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{9}[+-]\d{4}) (".+")$`)
+ const timeFormat = "2006-01-02T15:04:05.000000000-0700"
+ const lineFormat = "%s %8d %s %s %s %q\n"
+ var TZ = time.UTC
+ fields := lineRegex.FindStringSubmatch(strings.TrimSuffix(lines[i], "\n"))
+ if fields != nil {
+ sizeVal, sizeErr := strconv.ParseInt(fields[2], 10, 64)
+ if sizeErr == nil {
+ // account for filename encoding differences by normalizing to OS encoding
+ fields[6] = normalizeEncoding(fields[6])
+ timeStr := fields[5]
+ if f.Precision() == fs.ModTimeNotSupported {
+ lines[i] = fmt.Sprintf(lineFormat, fields[1], sizeVal, fields[3], fields[4], "-", fields[6])
+ continue
+ }
+ timeVal, timeErr := time.ParseInLocation(timeFormat, timeStr, TZ)
+ if timeErr == nil {
+ timeRound := timeVal.Round(f.Precision() * 2)
+ lines[i] = fmt.Sprintf(lineFormat, fields[1], sizeVal, fields[3], fields[4], timeRound, fields[6])
+ }
+ }
}
}
}
@@ -1225,6 +1413,8 @@ func (b *bisyncTest) newReplacer(mangle bool) *strings.Replacer {
b.dataDir + slash, "{datadir/}",
b.testDir + slash, "{testdir/}",
b.workDir + slash, "{workdir/}",
+ b.fs1.String(), "{path1String}",
+ b.fs2.String(), "{path2String}",
b.path1, "{path1/}",
b.path2, "{path2/}",
"//?/" + strings.TrimSuffix(strings.Replace(b.path1, slash, "/", -1), "/"), "{path1}", // fix windows-specific issue
@@ -1335,3 +1525,36 @@ func (b *bisyncTest) logPrintf(text string, args ...interface{}) {
require.NoError(b.t, err, "writing log file")
}
}
+
+// account for filename encoding differences between remotes by normalizing to OS encoding
+func normalizeEncoding(s string) string {
+ if s == "" || s == "." {
+ return s
+ }
+ nameVal, err := strconv.Unquote(s)
+ if err != nil {
+ nameVal = s
+ }
+ nameVal = filepath.Clean(nameVal)
+ nameVal = encoder.OS.FromStandardPath(nameVal)
+ return strconv.Quote(encoder.OS.ToStandardPath(filepath.ToSlash(nameVal)))
+}
+
+func stringToHash(s string) string {
+ ht := hash.MD5
+ hasher, err := hash.NewMultiHasherTypes(hash.NewHashSet(ht))
+ if err != nil {
+ fs.Errorf(s, "hash unsupported: %v", err)
+ }
+
+ _, err = hasher.Write([]byte(s))
+ if err != nil {
+ fs.Errorf(s, "failed to write to hasher: %v", err)
+ }
+
+ sum, err := hasher.SumString(ht, false)
+ if err != nil {
+ fs.Errorf(s, "hasher returned an error: %v", err)
+ }
+ return sum
+}
diff --git a/cmd/bisync/checkfn.go b/cmd/bisync/checkfn.go
index cc462772b..a097ec559 100644
--- a/cmd/bisync/checkfn.go
+++ b/cmd/bisync/checkfn.go
@@ -107,6 +107,9 @@ func CryptCheckFn(ctx context.Context, dst, src fs.Object) (differ bool, noHash
}
if cryptHash != underlyingHash {
err = fmt.Errorf("hashes differ (%s:%s) %q vs (%s:%s) %q", fdst.Name(), fdst.Root(), cryptHash, fsrc.Name(), fsrc.Root(), underlyingHash)
+ fs.Debugf(src, err.Error())
+ // using same error msg as CheckFn so integration tests match
+ err = fmt.Errorf("%v differ", hashType)
fs.Errorf(src, err.Error())
return true, false, nil
}
diff --git a/cmd/bisync/log.go b/cmd/bisync/log.go
index 5a7ce507a..29bf51338 100644
--- a/cmd/bisync/log.go
+++ b/cmd/bisync/log.go
@@ -7,6 +7,7 @@ import (
"strings"
"github.com/rclone/rclone/fs"
+ "github.com/rclone/rclone/lib/encoder"
"github.com/rclone/rclone/lib/terminal"
)
@@ -36,6 +37,7 @@ func (b *bisyncRun) indent(tag, file, msg string) {
// escapePath will escape control characters in path.
// It won't quote just due to backslashes on Windows.
func escapePath(path string, forceQuotes bool) string {
+ path = encode(path)
test := path
if runtime.GOOS == "windows" {
test = strings.ReplaceAll(path, "\\", "/")
@@ -58,3 +60,7 @@ func Color(style string, s string) string {
terminal.Start()
return style + s + terminal.Reset
}
+
+func encode(s string) string {
+ return encoder.OS.ToStandardPath(encoder.OS.FromStandardPath(s))
+}
diff --git a/cmd/bisync/testdata/test_changes/golden/test.log b/cmd/bisync/testdata/test_changes/golden/test.log
index 42a58cfed..b3702f98a 100644
--- a/cmd/bisync/testdata/test_changes/golden/test.log
+++ b/cmd/bisync/testdata/test_changes/golden/test.log
@@ -72,8 +72,8 @@ INFO : Path2: 7 changes: 1 new, 3 newer, 0 older, 3 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
-NOTICE: Local file system at {path2}: 1 differences found
-NOTICE: Local file system at {path2}: 1 errors while checking
+NOTICE: {path2String}: 1 differences found
+NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt
diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log b/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log
index 455296844..85a9c6938 100644
--- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log
+++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log
@@ -35,7 +35,7 @@ INFO : Bisync successful
(17) : test 3. Confirm the subdir exists only on Path1 and not Path2
(18) : list-dirs {path1/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(19) : list-dirs {path2/}
(20) : test 4.Run bisync WITH --create-empty-src-dirs
@@ -55,9 +55,9 @@ INFO : Bisync successful
(22) : test 5. Confirm the subdir exists on both paths
(23) : list-dirs {path1/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(24) : list-dirs {path2/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(25) : test 6. Delete the empty dir on Path1 using purge-children (and also add files so the path isn't empty)
(26) : purge-children {path1/}
@@ -89,7 +89,7 @@ INFO : Bisync successful
(35) : test 8. Confirm the subdir exists only on Path2 and not Path1
(36) : list-dirs {path1/}
(37) : list-dirs {path2/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(38) : test 9. Reset, do the delete again, and run bisync WITH --create-empty-src-dirs
(39) : bisync resync create-empty-src-dirs
@@ -100,9 +100,9 @@ INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to
INFO : Resync updating listings
INFO : Bisync successful
(40) : list-dirs {path1/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(41) : list-dirs {path2/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(42) : purge-children {path1/}
(43) : copy-as {datadir/}placeholder.txt {path1/} file1.txt
@@ -113,7 +113,7 @@ subdir/
(48) : copy-as {datadir/}placeholder.txt {path1/} file1.copy5.txt
(49) : list-dirs {path1/}
(50) : list-dirs {path2/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(51) : bisync create-empty-src-dirs
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
diff --git a/cmd/bisync/testdata/test_dry_run/golden/test.log b/cmd/bisync/testdata/test_dry_run/golden/test.log
index 83019af70..d5b938003 100644
--- a/cmd/bisync/testdata/test_dry_run/golden/test.log
+++ b/cmd/bisync/testdata/test_dry_run/golden/test.log
@@ -84,8 +84,8 @@ INFO : Path2: 6 changes: 1 new, 3 newer, 0 older, 2 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
-NOTICE: Local file system at {path2}: 1 differences found
-NOTICE: Local file system at {path2}: 1 errors while checking
+NOTICE: {path2String}: 1 differences found
+NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt
@@ -139,8 +139,8 @@ INFO : Path2: 6 changes: 1 new, 3 newer, 0 older, 2 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
-NOTICE: Local file system at {path2}: 1 differences found
-NOTICE: Local file system at {path2}: 1 errors while checking
+NOTICE: {path2String}: 1 differences found
+NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt
diff --git a/cmd/bisync/testdata/test_equal/golden/test.log b/cmd/bisync/testdata/test_equal/golden/test.log
index ced7587dd..097be45a6 100644
--- a/cmd/bisync/testdata/test_equal/golden/test.log
+++ b/cmd/bisync/testdata/test_equal/golden/test.log
@@ -36,9 +36,9 @@ 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
+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: - WARNING New or changed in both paths - file1.txt
NOTICE: - Path1 Renaming Path1 copy - {path1/}file1.txt..path1
diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/test.log b/cmd/bisync/testdata/test_extended_char_paths/golden/test.log
index 6b83d7542..8e3c32045 100644
--- a/cmd/bisync/testdata/test_extended_char_paths/golden/test.log
+++ b/cmd/bisync/testdata/test_extended_char_paths/golden/test.log
@@ -1,24 +1,35 @@
(01) : test extended-char-paths
-(02) : test resync subdirs with extended chars
-(03) : bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ resync
+(02) : fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/
+(03) : fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/
+(04) : fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+(05) : fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+(06) : fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/filename_contains_ě_.txt
+(07) : fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/filename_contains_ě_.txt
+(08) : fix-names {path1/}測試_check{spc}file
+(09) : fix-names {path2/}測試_check{spc}file
+(10) : fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+(11) : fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+
+(12) : test resync subdirs with extended chars
+(13) : bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ resync
INFO : Synching Path1 "{path1/}測試_Русский_ _ _ě_áñ/" with Path2 "{path2/}測試_Русский_ _ _ě_áñ/"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
-(04) : copy-listings resync
+(14) : copy-listings resync
-(05) : test place new files with extended chars on each side
+(15) : test place new files with extended chars on each side
-(06) : touch-glob 2001-01-02 {datadir/} file1.txt
-(07) : copy-as {datadir/}file1.txt {path1/}測試_Русский_{spc}_{spc}_ě_áñ 測試_file1p1
-(08) : copy-as {datadir/}file1.txt {path2/}測試_Русский_{spc}_{spc}_ě_áñ 測試_file1p2
+(16) : touch-glob 2001-01-02 {datadir/} file1.txt
+(17) : copy-as {datadir/}file1.txt {path1/}測試_Русский_{spc}_{spc}_ě_áñ 測試_file1p1
+(18) : copy-as {datadir/}file1.txt {path2/}測試_Русский_{spc}_{spc}_ě_áñ 測試_file1p2
-(09) : test normal sync of subdirs with extended chars
-(10) : bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ
+(19) : test normal sync of subdirs with extended chars
+(20) : bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ
INFO : Synching Path1 "{path1/}測試_Русский_ _ _ě_áñ/" with Path2 "{path2/}測試_Русский_ _ _ě_áñ/"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
@@ -35,18 +46,18 @@ INFO : - Path1 Do queued copies to - P
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}測試_Русский_ _ _ě_áñ/" vs Path2 "{path2/}測試_Русский_ _ _ě_áñ/"
INFO : Bisync successful
-(11) : move-listings normal-sync
+(21) : move-listings normal-sync
-(12) : test check-filename with extended chars. check should fail.
-(13) : bisync resync
+(22) : test check-filename with extended chars. check should fail.
+(23) : bisync resync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
-(14) : delete-file {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
-(15) : bisync check-access check-filename=測試_check{spc}file
+(24) : delete-file {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+(25) : bisync check-access check-filename=測試_check{spc}file
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
@@ -59,17 +70,17 @@ ERROR : -  Access test failed: Path2 file not found in Pat
ERROR : Bisync critical error: check file check failed
ERROR : Bisync aborted. Must run --resync to recover.
Bisync error: bisync aborted
-(16) : copy-listings check-access-fail
+(26) : copy-listings check-access-fail
-(17) : test check-filename with extended chars. check should pass.
-(18) : bisync resync
+(27) : test check-filename with extended chars. check should pass.
+(28) : bisync resync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
-(19) : bisync check-access check-filename=測試_check{spc}file
+(29) : bisync check-access check-filename=測試_check{spc}file
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
@@ -80,11 +91,11 @@ INFO : No changes found
INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
-(20) : move-listings check-access-pass
+(30) : move-listings check-access-pass
-(21) : test filters-file path with extended chars - masks /fileZ.txt
-(22) : copy-file {datadir/}測試_filtersfile.txt {workdir/}
-(23) : bisync filters-file={workdir/}測試_filtersfile.txt resync
+(31) : test filters-file path with extended chars - masks /fileZ.txt
+(32) : copy-file {datadir/}測試_filtersfile.txt {workdir/}
+(33) : bisync filters-file={workdir/}測試_filtersfile.txt resync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}測試_filtersfile.txt
INFO : Storing filters file hash to {workdir/}測試_filtersfile.txt.md5
@@ -93,8 +104,8 @@ INFO : - Path2 Resync is copying UNIQUE files to - P
INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2
INFO : Resync updating listings
INFO : Bisync successful
-(24) : copy-as {datadir/}file1.txt {path1/} fileZ.txt
-(25) : bisync filters-file={workdir/}測試_filtersfile.txt
+(34) : copy-as {datadir/}file1.txt {path1/} fileZ.txt
+(35) : bisync filters-file={workdir/}測試_filtersfile.txt
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Using filters file {workdir/}測試_filtersfile.txt
INFO : Building Path1 and Path2 listings
diff --git a/cmd/bisync/testdata/test_extended_char_paths/scenario.txt b/cmd/bisync/testdata/test_extended_char_paths/scenario.txt
index 32ad3fe75..b53656bb3 100644
--- a/cmd/bisync/testdata/test_extended_char_paths/scenario.txt
+++ b/cmd/bisync/testdata/test_extended_char_paths/scenario.txt
@@ -13,6 +13,18 @@ test extended-char-paths
# - Due to different encoding local backend returns the literal tab
# in logs or listings, but remotes return two ASCII chars `\t`.
+# verify expected files, attempt to fix
+fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ{/}
+fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ{/}
+fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/filename_contains_ě_.txt
+fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/filename_contains_ě_.txt
+fix-names {path1/}測試_check{spc}file
+fix-names {path2/}測試_check{spc}file
+fix-names {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+fix-names {path2/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file
+
test resync subdirs with extended chars
bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ resync
copy-listings resync
diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/test.log b/cmd/bisync/testdata/test_extended_filenames/golden/test.log
index 61c7b1ad6..b2cdcd002 100644
--- a/cmd/bisync/testdata/test_extended_filenames/golden/test.log
+++ b/cmd/bisync/testdata/test_extended_filenames/golden/test.log
@@ -1,8 +1,17 @@
(01) : test extended-filenames
-(02) : test initial bisync
-(03) : bisync resync
+(02) : fix-names {path1/}subdir_with_ࢺ_/
+(03) : fix-names {path2/}subdir_with_ࢺ_/
+(04) : fix-names {path1/}subdir_with_ࢺ_/filename_contains_ě_.txt
+(05) : fix-names {path2/}subdir_with_ࢺ_/filename_contains_ě_.txt
+(06) : fix-names {path1/}Русский.txt
+(07) : fix-names {path2/}Русский.txt
+(08) : fix-names {path1/}file_enconde_mañana_funcionará.txt
+(09) : fix-names {path2/}file_enconde_mañana_funcionará.txt
+
+(10) : test initial bisync
+(11) : bisync resync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
@@ -10,34 +19,35 @@ INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to
INFO : Resync updating listings
INFO : Bisync successful
-(04) : test place a newer files on both paths
+(12) : test place a newer files on both paths
-(05) : touch-glob 2001-01-02 {datadir/} file1.txt
-(06) : touch-glob 2001-01-02 {datadir/} file2.txt
-(07) : copy-as {datadir/}file1.txt {path2/} New_top_level_mañana_funcionará.txt
-(08) : copy-as {datadir/}file1.txt {path2/} file_enconde_mañana_funcionará.txt
-(09) : copy-as {datadir/}file1.txt {path1/} filename_contains_ࢺ_p1m.txt
-(10) : copy-as {datadir/}file1.txt {path2/} Русский.txt
-(11) : copy-as {datadir/}file1.txt {path1/} file1_with{spc}white{spc}space.txt
-(12) : copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ test.txt
-(13) : copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ mañana_funcionará.txt
-(14) : copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ file_with_測試_.txt
-(15) : copy-as {datadir/}file1.txt {path2/}subdir_with_ࢺ_ filename_contains_ࢺ_p2s.txt
-(16) : copy-as {datadir/}file1.txt {path2/}subdir{spc}with{eol}white{spc}space.txt file2{spc}with{eol}white{spc}space.txt
-(17) : copy-as {datadir/}file1.txt {path2/}subdir_rawchars_{chr:19}_{chr:81}_{chr:fe} file3_{chr:19}_{chr:81}_{chr:fe}
+(13) : touch-glob 2001-01-02 {datadir/} file1.txt
+(14) : touch-glob 2001-01-02 {datadir/} file2.txt
+(15) : copy-as {datadir/}file1.txt {path2/} New_top_level_mañana_funcionará.txt
+(16) : copy-as {datadir/}file1.txt {path2/} file_enconde_mañana_funcionará.txt
+(17) : copy-as {datadir/}file1.txt {path1/} filename_contains_ࢺ_p1m.txt
+(18) : copy-as {datadir/}file1.txt {path2/} Русский.txt
+(19) : copy-as {datadir/}file1.txt {path1/} file1_with{spc}white{spc}space.txt
+(20) : copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ test.txt
+(21) : copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ mañana_funcionará.txt
+(22) : copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ file_with_測試_.txt
+(23) : copy-as {datadir/}file1.txt {path2/}subdir_with_ࢺ_ filename_contains_ࢺ_p2s.txt
+(24) : copy-as {datadir/}file1.txt {path2/}subdir{spc}with{eol}white{spc}space.txt file2{spc}with{eol}white{spc}space.txt
+(25) : copy-as {datadir/}file1.txt {path2/}subdir_rawchars_{chr:19}_{chr:81}_{chr:fe} file3_{chr:19}_{chr:81}_{chr:fe}
+(26) : fix-names {path2/}subdir{spc}with{eol}white{spc}space.txt/file2{spc}with{eol}white{spc}space.txt
-(18) : test place a new file on both paths
-(19) : copy-as {datadir/}file2.txt {path2/}subdir_with_ࢺ_ filechangedbothpaths_ࢺ_.txt
-(20) : touch-glob 2001-01-03 {datadir/} file1.txt
-(21) : copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ filechangedbothpaths_ࢺ_.txt
+(27) : test place a new file on both paths
+(28) : copy-as {datadir/}file2.txt {path2/}subdir_with_ࢺ_ filechangedbothpaths_ࢺ_.txt
+(29) : touch-glob 2001-01-03 {datadir/} file1.txt
+(30) : copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ filechangedbothpaths_ࢺ_.txt
-(22) : test delete files on both paths
-(23) : delete-file {path2/}filename_contains_ࢺ_.txt
-(24) : delete-file {path2/}subdir_with_ࢺ_/filename_contains_ě_.txt
-(25) : delete-file {path1/}Русский.txt
+(31) : test delete files on both paths
+(32) : delete-file {path2/}filename_contains_ࢺ_.txt
+(33) : delete-file {path2/}subdir_with_ࢺ_/filename_contains_ě_.txt
+(34) : delete-file {path1/}Русский.txt
-(26) : test bisync run
-(27) : bisync
+(35) : test bisync run
+(36) : bisync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
@@ -63,8 +73,8 @@ INFO : Path2: 9 changes: 5 new, 2 newer, 0 older, 2 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt: sizes differ
-NOTICE: Local file system at {path2}: 1 differences found
-NOTICE: Local file system at {path2}: 1 errors while checking
+NOTICE: {path2String}: 1 differences found
+NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
INFO : - Path1 Queue copy to Path2 - {path2/}file1_with white space.txt
INFO : - Path1 Queue copy to Path2 - {path2/}filename_contains_ࢺ_p1m.txt
diff --git a/cmd/bisync/testdata/test_extended_filenames/scenario.txt b/cmd/bisync/testdata/test_extended_filenames/scenario.txt
index 774f5db8f..c2c948114 100644
--- a/cmd/bisync/testdata/test_extended_filenames/scenario.txt
+++ b/cmd/bisync/testdata/test_extended_filenames/scenario.txt
@@ -10,6 +10,16 @@ test extended-filenames
# `name{spc}with{eol}white{spc}space` instead of
# `name{tab}with{eol}white{spc}space`.
+# verify expected files, attempt to fix
+fix-names {path1/}subdir_with_ࢺ_{/}
+fix-names {path2/}subdir_with_ࢺ_{/}
+fix-names {path1/}subdir_with_ࢺ_/filename_contains_ě_.txt
+fix-names {path2/}subdir_with_ࢺ_/filename_contains_ě_.txt
+fix-names {path1/}Русский.txt
+fix-names {path2/}Русский.txt
+fix-names {path1/}file_enconde_mañana_funcionará.txt
+fix-names {path2/}file_enconde_mañana_funcionará.txt
+
test initial bisync
bisync resync
@@ -28,6 +38,7 @@ copy-as {datadir/}file1.txt {path1/}subdir_with_ࢺ_ file_with_測試_.txt
copy-as {datadir/}file1.txt {path2/}subdir_with_ࢺ_ filename_contains_ࢺ_p2s.txt
copy-as {datadir/}file1.txt {path2/}subdir{spc}with{eol}white{spc}space.txt file2{spc}with{eol}white{spc}space.txt
copy-as {datadir/}file1.txt {path2/}subdir_rawchars_{chr:19}_{chr:81}_{chr:fe} file3_{chr:19}_{chr:81}_{chr:fe}
+fix-names {path2/}subdir{spc}with{eol}white{spc}space.txt{/}file2{spc}with{eol}white{spc}space.txt
test place a new file on both paths
copy-as {datadir/}file2.txt {path2/}subdir_with_ࢺ_ filechangedbothpaths_ࢺ_.txt
diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.copy1to2.que b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.copy1to2.que
index bd7f8e7dd..896fa3f12 100644
--- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.copy1to2.que
+++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.copy1to2.que
@@ -1,3 +1,3 @@
"folder/HeLlO,wOrLd!.txt"
"folder/éééö.txt"
-"測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+"測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst
index 76c15edcd..ae1a6278b 100644
--- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst
+++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst
@@ -1,5 +1,7 @@
# bisync listing v1 from test
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt"
-- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new
index bd44aea5b..7c2dc8156 100644
--- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new
+++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new
@@ -1,5 +1,7 @@
# bisync listing v1 from test
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt"
-- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old
index 6815fa4ee..ef150b300 100644
--- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old
+++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old
@@ -1,5 +1,7 @@
# bisync listing v1 from test
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/éééö.txt"
-- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst
index 48252d18d..d4a293c84 100644
--- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst
+++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst
@@ -1,5 +1,7 @@
# bisync listing v1 from test
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/hello,WORLD!.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt"
-- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new
index 6f843cfa9..c0a689c72 100644
--- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new
+++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new
@@ -1,5 +1,7 @@
# bisync listing v1 from test
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/hello,WORLD!.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/éééö.txt"
-- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old
index ed2547754..b85b8c3b6 100644
--- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old
+++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old
@@ -1,5 +1,7 @@
# bisync listing v1 from test
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/hello,WORLD!.txt"
- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/éééö.txt"
-- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
diff --git a/cmd/bisync/testdata/test_normalization/golden/test.log b/cmd/bisync/testdata/test_normalization/golden/test.log
index db66b5e75..dd473711c 100644
--- a/cmd/bisync/testdata/test_normalization/golden/test.log
+++ b/cmd/bisync/testdata/test_normalization/golden/test.log
@@ -12,7 +12,7 @@ INFO : Resync updating listings
INFO : Bisync successful
-(05) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö.txt
+(05) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
(06) : copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
(07) : copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
@@ -28,7 +28,7 @@ INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File is new - folder/HeLlO,wOrLd!.txt
INFO : - Path1 File is new - folder/éééö.txt
-INFO : - Path1 File is new - "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+INFO : - Path1 File is new - "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : Path1: 3 changes: 3 new, 0 newer, 0 older, 0 deleted
INFO : Path2 checking for diffs
INFO : - Path2 File is newer - file1.txt
@@ -37,14 +37,14 @@ INFO : - Path2 File is new - f
INFO : Path2: 3 changes: 2 new, 1 newer, 0 older, 0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
-NOTICE: Local file system at {path2}: 0 differences found
-NOTICE: Local file system at {path2}: 2 matching files
+NOTICE: {path2String}: 0 differences found
+NOTICE: {path2String}: 2 matching files
INFO : Finished checking the potential conflicts. %!s(<nil>)
NOTICE: - WARNING New or changed in both paths - folder/HeLlO,wOrLd!.txt
INFO : folder/hello,WORLD!.txt: Files are equal but will copy anyway to fix case to folder/HeLlO,wOrLd!.txt
NOTICE: - WARNING New or changed in both paths - folder/éééö.txt
INFO : folder/éééö.txt: Files are equal but will copy anyway to fix case to folder/éééö.txt
-INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt
INFO : - Path2 Do queued copies to - Path1
INFO : - Path1 Do queued copies to - Path2
@@ -58,7 +58,9 @@ INFO : Bisync successful
(13) : purge-children {path1/}
(14) : purge-children {path2/}
(15) : touch-copy 2001-01-02 {datadir/}file1.txt {path2/}
-(16) : bisync resync
+(16) : copy-as-NFC {datadir/}file1.txt {path2/} file2.txt
+(17) : copy-as-NFC {datadir/}file1.txt {path1/} file3.txt
+(18) : bisync resync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
@@ -67,23 +69,23 @@ INFO : Resync updating listings
INFO : Bisync successful
-(17) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö.txt
-(18) : copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
-(19) : copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
+(19) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
+(20) : copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
+(21) : copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
-(20) : touch-copy 2001-01-03 {datadir/}file1.txt {path2/}
-(21) : copy-as-NFD {datadir/}file1.txt {path2/}folder éééö.txt
-(22) : copy-as-NFD {datadir/}file1.txt {path2/}folder hello,WORLD!.txt
+(22) : touch-copy 2001-01-03 {datadir/}file1.txt {path2/}
+(23) : copy-as-NFD {datadir/}file1.txt {path2/}folder éééö.txt
+(24) : copy-as-NFD {datadir/}file1.txt {path2/}folder hello,WORLD!.txt
-(23) : test bisync run with normalization
-(24) : bisync norm force
+(25) : test bisync run with normalization
+(26) : bisync norm force
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File is new - folder/HeLlO,wOrLd!.txt
INFO : - Path1 File is new - folder/éééö.txt
-INFO : - Path1 File is new - "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+INFO : - Path1 File is new - "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : Path1: 3 changes: 3 new, 0 newer, 0 older, 0 deleted
INFO : Path2 checking for diffs
INFO : - Path2 File is newer - file1.txt
@@ -92,14 +94,14 @@ INFO : - Path2 File is new - f
INFO : Path2: 3 changes: 2 new, 1 newer, 0 older, 0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
-NOTICE: Local file system at {path2}: 0 differences found
-NOTICE: Local file system at {path2}: 2 matching files
+NOTICE: {path2String}: 0 differences found
+NOTICE: {path2String}: 2 matching files
INFO : Finished checking the potential conflicts. %!s(<nil>)
NOTICE: - WARNING New or changed in both paths - folder/HeLlO,wOrLd!.txt
INFO : Files are equal! Skipping: folder/HeLlO,wOrLd!.txt
NOTICE: - WARNING New or changed in both paths - folder/éééö.txt
INFO : Files are equal! Skipping: folder/éééö.txt
-INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt
INFO : - Path2 Do queued copies to - Path1
INFO : - Path1 Do queued copies to - Path2
@@ -107,8 +109,8 @@ INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
-(25) : test resync
-(26) : bisync resync norm
+(27) : test resync
+(28) : bisync resync norm
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Copying unique Path2 files to Path1
INFO : - Path2 Resync is copying UNIQUE files to - Path1
@@ -116,18 +118,18 @@ INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to
INFO : Resync updating listings
INFO : Bisync successful
-(27) : test changed on one path
-(28) : touch-copy 2001-01-05 {datadir/}file1.txt {path2/}
-(29) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö.txt
-(30) : copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
-(31) : copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
-(32) : bisync norm
+(29) : test changed on one path
+(30) : touch-copy 2001-01-05 {datadir/}file1.txt {path2/}
+(31) : copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
+(32) : copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
+(33) : copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
+(34) : bisync norm
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
INFO : - Path1 File is newer - folder/HeLlO,wOrLd!.txt
INFO : - Path1 File is newer - folder/éééö.txt
-INFO : - Path1 File is newer - "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+INFO : - Path1 File is newer - "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : Path1: 3 changes: 0 new, 3 newer, 0 older, 0 deleted
INFO : Path2 checking for diffs
INFO : - Path2 File is newer - file1.txt
@@ -135,7 +137,7 @@ INFO : Path2: 1 changes: 0 new, 1 newer, 0 older, 0 deleted
INFO : Applying changes
INFO : - Path1 Queue copy to Path2 - {path2/}folder/hello,WORLD!.txt
INFO : - Path1 Queue copy to Path2 - {path2/}folder/éééö.txt
-INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éééö.txt"
+INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt"
INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt
INFO : - Path2 Do queued copies to - Path1
INFO : - Path1 Do queued copies to - Path2
diff --git a/cmd/bisync/testdata/test_normalization/scenario.txt b/cmd/bisync/testdata/test_normalization/scenario.txt
index bc42bbdb5..d31d2cf27 100644
--- a/cmd/bisync/testdata/test_normalization/scenario.txt
+++ b/cmd/bisync/testdata/test_normalization/scenario.txt
@@ -9,7 +9,7 @@ test initial bisync
bisync resync
# copy NFC version to Path1
-copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö.txt
+copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
@@ -25,10 +25,13 @@ bisync fix-case
purge-children {path1/}
purge-children {path2/}
touch-copy 2001-01-02 {datadir/}file1.txt {path2/}
+copy-as-NFC {datadir/}file1.txt {path2/} file2.txt
+copy-as-NFC {datadir/}file1.txt {path1/} file3.txt
bisync resync
# copy NFC version to Path1
-copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö.txt
+# note: need to slightly change the name to avoid Drive known issue #3262 which could try to copy the old name from the trash
+copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
@@ -45,7 +48,7 @@ bisync resync norm
test changed on one path
touch-copy 2001-01-05 {datadir/}file1.txt {path2/}
-copy-as-NFC {datadir/}file1.txt {path1/}測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö 測試_Русский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éééö.txt
+copy-as-NFC {datadir/}file1.txt {path1/}測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö 測試_Руский___ě_áñ👸🏼🧝🏾‍♀️💆🏿‍♂️🐨🤙🏼🤮🧑🏻‍🔧🧑‍🔬éö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt
copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt
bisync norm
\ No newline at end of file
diff --git a/cmd/bisync/testdata/test_rmdirs/golden/test.log b/cmd/bisync/testdata/test_rmdirs/golden/test.log
index 4094070a9..32d79b746 100644
--- a/cmd/bisync/testdata/test_rmdirs/golden/test.log
+++ b/cmd/bisync/testdata/test_rmdirs/golden/test.log
@@ -30,9 +30,9 @@ INFO : Bisync successful
(08) : test 3. confirm the subdir still exists on both paths
(09) : list-dirs {path1/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(10) : list-dirs {path2/}
-subdir/
+subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2
(11) : test 4. run bisync with remove-empty-dirs
(12) : bisync remove-empty-dirs
diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst
index 27dbd194a..fe9dd1f50 100644
--- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst
+++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst
@@ -1,103 +1,103 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file0.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file10.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file100.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file11.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file12.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file13.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file14.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file15.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file16.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file17.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file18.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file19.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file20.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file21.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file22.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file23.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file24.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file25.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file26.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file27.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file28.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file29.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file30.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file31.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file32.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file33.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file34.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file35.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file36.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file37.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file38.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file39.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file40.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file41.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file42.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file43.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file44.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file45.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file46.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file47.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file48.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file49.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file51.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file52.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file53.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file54.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file55.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file56.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file57.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file58.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file59.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file60.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file61.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file62.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file63.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file64.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file65.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file66.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file67.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file68.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file69.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file70.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file71.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file72.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file73.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file74.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file75.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file76.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file77.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file78.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file79.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file80.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file81.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file82.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file83.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file84.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file85.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file86.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file87.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file88.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file89.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file9.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file90.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file91.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file92.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file93.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file94.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file95.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file96.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file97.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file98.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file99.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt"
diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-new
index 74a73a22c..deb7f2753 100644
--- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-new
+++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-new
@@ -1,104 +1,104 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file0.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file10.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file100.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file11.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file12.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file13.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file14.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file15.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file16.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file17.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file18.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file19.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file20.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file21.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file22.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file23.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file24.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file25.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file26.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file27.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file28.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file29.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file30.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file31.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file32.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file33.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file34.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file35.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file36.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file37.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file38.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file39.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file40.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file41.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file42.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file43.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file44.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file45.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file46.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file47.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file48.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file49.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file51.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file52.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file53.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file54.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file55.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file56.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file57.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file58.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file59.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file60.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file61.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file62.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file63.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file64.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file65.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file66.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file67.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file68.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file69.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file70.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file71.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file72.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file73.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file74.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file75.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file76.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file77.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file78.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file79.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file80.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file81.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file82.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file83.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file84.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file85.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file86.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file87.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file88.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file89.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file9.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file90.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file91.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file92.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file93.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file94.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file95.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file96.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file97.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file98.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file99.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt"
diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-old
index 27dbd194a..fe9dd1f50 100644
--- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-old
+++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-old
@@ -1,103 +1,103 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file0.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file10.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file100.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file11.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file12.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file13.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file14.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file15.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file16.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file17.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file18.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file19.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file20.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file21.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file22.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file23.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file24.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file25.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file26.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file27.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file28.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file29.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file30.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file31.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file32.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file33.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file34.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file35.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file36.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file37.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file38.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file39.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file40.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file41.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file42.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file43.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file44.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file45.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file46.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file47.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file48.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file49.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file51.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file52.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file53.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file54.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file55.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file56.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file57.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file58.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file59.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file60.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file61.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file62.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file63.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file64.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file65.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file66.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file67.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file68.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file69.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file70.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file71.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file72.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file73.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file74.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file75.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file76.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file77.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file78.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file79.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file80.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file81.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file82.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file83.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file84.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file85.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file86.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file87.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file88.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file89.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file9.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file90.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file91.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file92.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file93.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file94.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file95.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file96.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file97.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file98.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file99.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt"
diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst
index 27dbd194a..fe9dd1f50 100644
--- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst
+++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst
@@ -1,103 +1,103 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file0.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file10.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file100.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file11.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file12.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file13.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file14.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file15.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file16.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file17.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file18.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file19.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file20.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file21.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file22.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file23.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file24.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file25.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file26.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file27.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file28.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file29.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file30.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file31.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file32.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file33.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file34.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file35.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file36.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file37.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file38.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file39.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file40.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file41.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file42.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file43.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file44.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file45.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file46.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file47.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file48.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file49.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file51.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file52.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file53.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file54.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file55.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file56.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file57.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file58.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file59.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file60.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file61.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file62.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file63.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file64.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file65.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file66.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file67.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file68.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file69.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file70.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file71.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file72.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file73.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file74.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file75.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file76.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file77.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file78.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file79.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file80.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file81.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file82.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file83.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file84.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file85.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file86.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file87.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file88.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file89.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file9.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file90.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file91.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file92.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file93.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file94.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file95.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file96.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file97.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file98.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file99.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt"
diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-new
index af4d4e41b..f6d4b4bdc 100644
--- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-new
+++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-new
@@ -1,104 +1,104 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file0.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file10.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file100.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file11.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file12.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file13.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file14.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file15.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file16.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file17.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file18.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file19.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file20.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file21.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file22.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file23.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file24.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file25.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file26.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file27.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file28.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file29.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file30.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file31.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file32.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file33.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file34.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file35.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file36.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file37.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file38.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file39.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file40.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file41.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file42.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file43.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file44.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file45.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file46.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file47.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file48.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file49.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file51.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file52.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file53.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file54.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file55.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file56.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file57.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file58.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file59.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file60.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file61.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file62.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file63.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file64.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file65.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file66.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file67.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file68.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file69.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file70.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file71.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file72.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file73.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file74.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file75.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file76.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file77.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file78.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file79.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file80.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file81.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file82.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file83.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file84.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file85.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file86.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file87.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file88.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file89.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file9.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file90.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file91.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file92.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file93.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file94.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file95.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file96.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file97.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file98.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file99.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt"
diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-old
index 27dbd194a..fe9dd1f50 100644
--- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-old
+++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-old
@@ -1,103 +1,103 @@
# bisync listing v1 from test
- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file0.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file10.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file100.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file11.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file12.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file13.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file14.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file15.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file16.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file17.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file18.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file19.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file20.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file21.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file22.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file23.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file24.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file25.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file26.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file27.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file28.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file29.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file30.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file31.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file32.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file33.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file34.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file35.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file36.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file37.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file38.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file39.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file40.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file41.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file42.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file43.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file44.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file45.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file46.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file47.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file48.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file49.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt"
- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1"
- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file51.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file52.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file53.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file54.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file55.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file56.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file57.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file58.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file59.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file60.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file61.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file62.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file63.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file64.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file65.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file66.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file67.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file68.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file69.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file70.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file71.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file72.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file73.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file74.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file75.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file76.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file77.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file78.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file79.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file80.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file81.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file82.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file83.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file84.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file85.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file86.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file87.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file88.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file89.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file9.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file90.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file91.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file92.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file93.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file94.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file95.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file96.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file97.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file98.txt"
-- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file99.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt"
+- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt"
diff --git a/cmd/bisync/testdata/test_volatile/golden/test.log b/cmd/bisync/testdata/test_volatile/golden/test.log
index 8e138c011..fcfe3f580 100644
--- a/cmd/bisync/testdata/test_volatile/golden/test.log
+++ b/cmd/bisync/testdata/test_volatile/golden/test.log
@@ -11,13 +11,14 @@ INFO : Bisync successful
(04) : test changed on both paths - file5 (file5R, file5L)
(05) : touch-glob 2001-01-02 {datadir/} file5R.txt
-(06) : copy-as {datadir/}file5R.txt {path2/} file5.txt
-(07) : touch-glob 2001-03-04 {datadir/} file5L.txt
-(08) : copy-as {datadir/}file5L.txt {path1/} file5.txt
+(06) : touch-glob 2023-08-26 {datadir/} file7.txt
+(07) : copy-as {datadir/}file5R.txt {path2/} file5.txt
+(08) : touch-glob 2001-03-04 {datadir/} file5L.txt
+(09) : copy-as {datadir/}file5L.txt {path1/} file5.txt
-(09) : test bisync with 50 files created during - should ignore new files
-(10) : test-func
-(11) : bisync
+(10) : test bisync with 50 files created during - should ignore new files
+(11) : test-func
+(12) : bisync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
@@ -29,8 +30,8 @@ INFO : Path2: 1 changes: 0 new, 1 newer, 0 older, 0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
-NOTICE: Local file system at {path2}: 1 differences found
-NOTICE: Local file system at {path2}: 1 errors while checking
+NOTICE: {path2String}: 1 differences found
+NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
NOTICE: - WARNING New or changed in both paths - file5.txt
NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1
@@ -43,15 +44,15 @@ INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
-(12) : test changed on both paths - file5 (file5R, file5L)
-(13) : touch-glob 2001-01-02 {datadir/} file5R.txt
-(14) : copy-as {datadir/}file5R.txt {path2/} file5.txt
-(15) : touch-glob 2001-03-04 {datadir/} file5L.txt
-(16) : copy-as {datadir/}file5L.txt {path1/} file5.txt
+(13) : test changed on both paths - file5 (file5R, file5L)
+(14) : touch-glob 2001-01-02 {datadir/} file5R.txt
+(15) : copy-as {datadir/}file5R.txt {path2/} file5.txt
+(16) : touch-glob 2001-03-04 {datadir/} file5L.txt
+(17) : copy-as {datadir/}file5L.txt {path1/} file5.txt
-(17) : test next bisync - should now notice new files
-(18) : test-func
-(19) : bisync
+(18) : test next bisync - should now notice new files
+(19) : test-func
+(20) : bisync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
@@ -108,6 +109,13 @@ INFO : - Path1 File is new - f
INFO : - Path1 File is new - file99.txt
INFO : Path1: 51 changes: 51 new, 0 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 File is newer - file3.txt
+INFO : - Path2 File is newer - file4.txt
+INFO : - Path2 File is newer - file6.txt
+INFO : - Path2 File is newer - file7.txt
+INFO : - Path2 File is newer - file8.txt
INFO : - Path2 File is new - file0.txt
INFO : - Path2 File is new - file10.txt
INFO : - Path2 File is new - file11.txt
@@ -151,12 +159,12 @@ INFO : - Path2 File is new - f
INFO : - Path2 File is new - file49.txt
INFO : - Path2 File is new - file5.txt
INFO : - Path2 File is new - file9.txt
-INFO : Path2: 43 changes: 43 new, 0 newer, 0 older, 0 deleted
+INFO : Path2: 50 changes: 43 new, 7 newer, 0 older, 0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
-NOTICE: Local file system at {path2}: 1 differences found
-NOTICE: Local file system at {path2}: 1 errors while checking
+NOTICE: {path2String}: 1 differences found
+NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
INFO : - Path1 Queue copy to Path2 - {path2/}file100.txt
NOTICE: - WARNING New or changed in both paths - file5.txt
@@ -214,6 +222,7 @@ INFO : - Path1 Queue copy to Path2 - {
INFO : - Path1 Queue copy to Path2 - {path2/}file98.txt
INFO : - Path1 Queue copy to Path2 - {path2/}file99.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file0.txt
+INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file11.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file12.txt
@@ -224,6 +233,7 @@ INFO : - Path2 Queue copy to Path1 - {
INFO : - Path2 Queue copy to Path1 - {path1/}file17.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file18.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file19.txt
+INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file20.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file21.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file22.txt
@@ -234,6 +244,7 @@ INFO : - Path2 Queue copy to Path1 - {
INFO : - Path2 Queue copy to Path1 - {path1/}file27.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file28.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file29.txt
+INFO : - Path2 Queue copy to Path1 - {path1/}file3.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file30.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file31.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file32.txt
@@ -244,6 +255,7 @@ INFO : - Path2 Queue copy to Path1 - {
INFO : - Path2 Queue copy to Path1 - {path1/}file37.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file38.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file39.txt
+INFO : - Path2 Queue copy to Path1 - {path1/}file4.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file40.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file41.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file42.txt
@@ -254,6 +266,9 @@ INFO : - Path2 Queue copy to Path1 - {
INFO : - Path2 Queue copy to Path1 - {path1/}file47.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file48.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file49.txt
+INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt
+INFO : - Path2 Queue copy to Path1 - {path1/}file7.txt
+INFO : - Path2 Queue copy to Path1 - {path1/}file8.txt
INFO : - Path2 Queue copy to Path1 - {path1/}file9.txt
INFO : - Path2 Do queued copies to - Path1
INFO : - Path1 Do queued copies to - Path2
@@ -261,15 +276,15 @@ INFO : Updating listings
INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
INFO : Bisync successful
-(20) : test changed on both paths - file5 (file5R, file5L)
-(21) : touch-glob 2001-01-02 {datadir/} file5R.txt
-(22) : copy-as {datadir/}file5R.txt {path2/} file5.txt
-(23) : touch-glob 2001-03-04 {datadir/} file5L.txt
-(24) : copy-as {datadir/}file5L.txt {path1/} file5.txt
+(21) : test changed on both paths - file5 (file5R, file5L)
+(22) : touch-glob 2001-01-02 {datadir/} file5R.txt
+(23) : copy-as {datadir/}file5R.txt {path2/} file5.txt
+(24) : touch-glob 2001-03-04 {datadir/} file5L.txt
+(25) : copy-as {datadir/}file5L.txt {path1/} file5.txt
-(25) : test next bisync - should be no changes except dummy
-(26) : test-func
-(27) : bisync
+(26) : test next bisync - should be no changes except dummy
+(27) : test-func
+(28) : bisync
INFO : Synching Path1 "{path1/}" with Path2 "{path2/}"
INFO : Building Path1 and Path2 listings
INFO : Path1 checking for diffs
@@ -281,8 +296,8 @@ INFO : Path2: 1 changes: 1 new, 0 newer, 0 older, 0 deleted
INFO : Applying changes
INFO : Checking potential conflicts...
ERROR : file5.txt: md5 differ
-NOTICE: Local file system at {path2}: 1 differences found
-NOTICE: Local file system at {path2}: 1 errors while checking
+NOTICE: {path2String}: 1 differences found
+NOTICE: {path2String}: 1 errors while checking
INFO : Finished checking the potential conflicts. 1 differences found
NOTICE: - WARNING New or changed in both paths - file5.txt
NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1
diff --git a/cmd/bisync/testdata/test_volatile/scenario.txt b/cmd/bisync/testdata/test_volatile/scenario.txt
index 499faf8a4..2aedf4408 100644
--- a/cmd/bisync/testdata/test_volatile/scenario.txt
+++ b/cmd/bisync/testdata/test_volatile/scenario.txt
@@ -5,6 +5,7 @@ bisync resync
test changed on both paths - file5 (file5R, file5L)
touch-glob 2001-01-02 {datadir/} file5R.txt
+touch-glob 2023-08-26 {datadir/} file7.txt
copy-as {datadir/}file5R.txt {path2/} file5.txt
touch-glob 2001-03-04 {datadir/} file5L.txt
copy-as {datadir/}file5L.txt {path1/} file5.txt