bisync: full support for comparing checksum, size, modtime - fixes #5679 fixes #5683 fixes #5684 fixes #5675

Before this change, bisync could only detect changes based on modtime, and
would refuse to run if either path lacked modtime support. This made bisync
unavailable for many of rclone's backends. Additionally, bisync did not account
for the Fs's precision when comparing modtimes, meaning that they could only be
reliably compared within the same side -- not against the opposite side. Size
and checksum (even when available) were ignored completely for deltas.

After this change, bisync now fully supports comparing based on any combination
of size, modtime, and checksum, lifting the prior restriction on backends
without modtime support. The comparison logic considers the backend's
precision, hash types, and other features as appropriate.

The comparison features optionally use a new --compare flag (which takes any
combination of size,modtime,checksum) and even supports some combinations not
otherwise supported in `sync` (like comparing all three at the same time.) By
default (without the --compare flag), bisync inherits the same comparison
options as `sync` (that is: size and modtime by default, unless modified with
flags such as --checksum or --size-only.) If the --compare flag is set, it will
override these defaults.

If --compare includes checksum and both remotes support checksums but have no
hash types in common with each other, checksums will be considered only for
comparisons within the same side (to determine what has changed since the prior
sync), but not for comparisons against the opposite side. If one side supports
checksums and the other does not, checksums will only be considered on the side
that supports them. When comparing with checksum and/or size without modtime,
bisync cannot determine whether a file is newer or older -- only whether it is
changed or unchanged. (If it is changed on both sides, bisync still does the
standard equality-check to avoid declaring a sync conflict unless it absolutely
has to.)

Also included are some new flags to customize the checksum comparison behavior
on backends where hashes are slow or unavailable. --no-slow-hash and
--slow-hash-sync-only allow selectively ignoring checksums on backends such as
local where they are slow. --download-hash allows computing them by downloading
when (and only when) they're otherwise not available. Of course, this option
probably won't be practical with large files, but may be a good option for
syncing small-but-important files with maximum accuracy (for example, a source
code repo on a crypt remote.) An additional advantage over methods like
cryptcheck is that the original file is not required for comparison (for
example, --download-hash can be used to bisync two different crypt remotes with
different passwords.)

Additionally, all of the above are now considered during the final --check-sync
for much-improved accuracy (before this change, it only compared filenames!)

Many other details are explained in the included docs.

cmd/bisync/bisync_test.go

@@ -80,6 +80,12 @@ var logReplacements = []string{
 	`^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,
+	// ignore differences in backend features
+	`^.*?"HashType1":.*?$`, dropMe,
+	`^.*?"HashType2":.*?$`, dropMe,
+	`^.*?"SlowHashDetected":.*?$`, dropMe,
+	`^.*? for same-side diffs on .*?$`, dropMe,
+	`^.*?Downloading hashes.*?$`, dropMe,
 }
 
 // Some dry-run messages differ depending on the particular remote.
@@ -118,7 +124,7 @@ var logHoppers = []string{
 // converted to "/" in every matching token to match golden logs.
 var logLinesWithSlash = []string{
 	`.*\(\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  : - .*Path[12].* +.*Queue copy to.* Path[12].*`,
 	`INFO  : Synching Path1 .*? with Path2 `,
 	`INFO  : Validating listings for `,
 }
@@ -820,6 +826,14 @@ func (b *bisyncTest) runBisync(ctx context.Context, args []string) (err error) {
 			require.NoError(b.t, err, "parsing max-delete=%q", val)
 		case "size-only":
 			ci.SizeOnly = true
+		case "ignore-size":
+			ci.IgnoreSize = true
+		case "checksum":
+			ci.CheckSum = true
+			opt.Compare.DownloadHash = true // allows us to test crypt and the like
+		case "compare-all":
+			opt.CompareFlag = "size,modtime,checksum"
+			opt.Compare.DownloadHash = true // allows us to test crypt and the like
 		case "subdir":
 			fs1 = addSubdir(b.path1, val)
 			fs2 = addSubdir(b.path2, val)

cmd/bisync/checkfn.go

@@ -192,3 +192,44 @@ func WhichEqual(ctx context.Context, src, dst fs.Object, Fsrc, Fdst fs.Fs) bool
 	}
 	return !differ
 }
+
+// Replaces the standard Equal func with one that also considers checksum
+// Note that it also updates the modtime the same way as Sync
+func (b *bisyncRun) EqualFn(ctx context.Context) context.Context {
+	ci := fs.GetConfig(ctx)
+	ci.CheckSum = false // force checksum off so modtime is evaluated if needed
+	// modtime and size settings should already be set correctly for Equal
+	var equalFn operations.EqualFn = func(ctx context.Context, src fs.ObjectInfo, dst fs.Object) bool {
+		fs.Debugf(src, "evaluating...")
+		equal := false
+		logger, _ := operations.GetLogger(ctx)
+		// temporarily unset logger, we don't want Equal to duplicate it
+		noop := func(ctx context.Context, sigil operations.Sigil, src, dst fs.DirEntry, err error) {
+			fs.Debugf(src, "equal skipped")
+		}
+		ctxNoLogger := operations.WithLogger(ctx, noop)
+		if operations.Equal(ctxNoLogger, src, dst) {
+			whichHashType := func(f fs.Info) hash.Type {
+				ht := getHashType(f.Name())
+				if ht == hash.None && b.opt.Compare.SlowHashSyncOnly && !b.opt.Resync {
+					ht = f.Hashes().GetOne()
+				}
+				return ht
+			}
+			srcHash, _ := src.Hash(ctx, whichHashType(src.Fs()))
+			dstHash, _ := dst.Hash(ctx, whichHashType(dst.Fs()))
+			srcHash, _ = tryDownloadHash(ctx, src, srcHash)
+			dstHash, _ = tryDownloadHash(ctx, dst, dstHash)
+			equal = !hashDiffers(srcHash, dstHash, whichHashType(src.Fs()), whichHashType(dst.Fs()), src.Size(), dst.Size())
+		}
+		if equal {
+			logger(ctx, operations.Match, src, dst, nil)
+			fs.Debugf(src, "EqualFn: files are equal")
+			return true
+		}
+		logger(ctx, operations.Differ, src, dst, nil)
+		fs.Debugf(src, "EqualFn: files are NOT equal")
+		return false
+	}
+	return operations.WithEqualFn(ctx, equalFn)
+}

cmd/bisync/cmd.go

@@ -50,6 +50,8 @@ type Options struct {
 	Resilient             bool
 	TestFn                TestFunc // test-only option, for mocking errors
 	Retries               int
+	Compare               CompareOpt
+	CompareFlag           string
 }
 
 // Default values
@@ -128,6 +130,10 @@ func init() {
 	flags.BoolVarP(cmdFlags, &Opt.IgnoreListingChecksum, "ignore-listing-checksum", "", Opt.IgnoreListingChecksum, "Do not use checksums for listings (add --ignore-checksum to additionally skip post-copy checksum checks)", "")
 	flags.BoolVarP(cmdFlags, &Opt.Resilient, "resilient", "", Opt.Resilient, "Allow future runs to retry after certain less-serious errors, instead of requiring --resync. Use at your own risk!", "")
 	flags.IntVarP(cmdFlags, &Opt.Retries, "retries", "", Opt.Retries, "Retry operations this many times if they fail", "")
+	flags.StringVarP(cmdFlags, &Opt.CompareFlag, "compare", "", Opt.CompareFlag, "Comma-separated list of bisync-specific compare options ex. 'size,modtime,checksum' (default: 'size,modtime')", "")
+	flags.BoolVarP(cmdFlags, &Opt.Compare.NoSlowHash, "no-slow-hash", "", Opt.Compare.NoSlowHash, "Ignore listing checksums only on backends where they are slow", "")
+	flags.BoolVarP(cmdFlags, &Opt.Compare.SlowHashSyncOnly, "slow-hash-sync-only", "", Opt.Compare.SlowHashSyncOnly, "Ignore slow checksums for listings and deltas, but still consider them during sync calls.", "")
+	flags.BoolVarP(cmdFlags, &Opt.Compare.DownloadHash, "download-hash", "", Opt.Compare.DownloadHash, "Compute hash by downloading when otherwise unavailable. (warning: may be slow and use lots of data!)", "")
 }
 
 // bisync command definition

cmd/bisync/compare.go

@@ -0,0 +1,309 @@
+package bisync
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+	mutex "sync"
+	"time"
+
+	"github.com/rclone/rclone/fs"
+	"github.com/rclone/rclone/fs/accounting"
+	"github.com/rclone/rclone/fs/hash"
+	"github.com/rclone/rclone/fs/operations"
+	"github.com/rclone/rclone/lib/terminal"
+)
+
+// CompareOpt describes the Compare options in force
+type CompareOpt = struct {
+	Modtime          bool
+	Size             bool
+	Checksum         bool
+	HashType1        hash.Type
+	HashType2        hash.Type
+	NoSlowHash       bool
+	SlowHashSyncOnly bool
+	SlowHashDetected bool
+	DownloadHash     bool
+}
+
+func (b *bisyncRun) setCompareDefaults(ctx context.Context) error {
+	ci := fs.GetConfig(ctx)
+
+	// defaults
+	b.opt.Compare.Size = true
+	b.opt.Compare.Modtime = true
+	b.opt.Compare.Checksum = false
+
+	if ci.SizeOnly {
+		b.opt.Compare.Size = true
+		b.opt.Compare.Modtime = false
+		b.opt.Compare.Checksum = false
+	} else if ci.CheckSum && !b.opt.IgnoreListingChecksum {
+		b.opt.Compare.Size = true
+		b.opt.Compare.Modtime = false
+		b.opt.Compare.Checksum = true
+	}
+
+	if ci.IgnoreSize {
+		b.opt.Compare.Size = false
+	}
+
+	err = b.setFromCompareFlag(ctx)
+	if err != nil {
+		return err
+	}
+
+	if b.fs1.Features().SlowHash || b.fs2.Features().SlowHash {
+		b.opt.Compare.SlowHashDetected = true
+	}
+	if b.opt.Compare.Checksum && !b.opt.IgnoreListingChecksum {
+		b.setHashType(ci)
+	}
+
+	// Checks and Warnings
+	if b.opt.Compare.SlowHashSyncOnly && b.opt.Compare.SlowHashDetected && b.opt.Resync {
+		fs.Logf(nil, Color(terminal.Dim, "Ignoring checksums during --resync as --slow-hash-sync-only is set."))
+		ci.CheckSum = false
+		// note not setting b.opt.Compare.Checksum = false as we still want to build listings on the non-slow side, if any
+	} else if b.opt.Compare.Checksum && !ci.CheckSum {
+		fs.Logf(nil, Color(terminal.YellowFg, "WARNING: Checksums will be compared for deltas but not during sync as --checksum is not set."))
+	}
+	if b.opt.Compare.Modtime && (b.fs1.Precision() == fs.ModTimeNotSupported || b.fs2.Precision() == fs.ModTimeNotSupported) {
+		fs.Logf(nil, Color(terminal.YellowFg, "WARNING: Modtime compare was requested but at least one remote does not support it. It is recommended to use --checksum or --size-only instead."))
+	}
+	if (ci.CheckSum || b.opt.Compare.Checksum) && b.opt.IgnoreListingChecksum {
+		if (b.opt.Compare.HashType1 == hash.None || b.opt.Compare.HashType2 == hash.None) && !b.opt.Compare.DownloadHash {
+			fs.Logf(nil, Color(terminal.YellowFg, `WARNING: Checksum compare was requested but at least one remote does not support checksums (or checksums are being ignored) and --ignore-listing-checksum is set.
+			 Ignoring Checksums globally and falling back to --compare modtime,size for sync. (Use --compare size or --size-only to ignore modtime). Path1 (%s): %s, Path2 (%s): %s`),
+				b.fs1.String(), b.opt.Compare.HashType1.String(), b.fs2.String(), b.opt.Compare.HashType2.String())
+			b.opt.Compare.Modtime = true
+			b.opt.Compare.Size = true
+			ci.CheckSum = false
+			b.opt.Compare.Checksum = false
+		} else {
+			fs.Logf(nil, Color(terminal.YellowFg, "WARNING: Ignoring checksum for deltas as --ignore-listing-checksum is set"))
+			// note: --checksum will still affect the internal sync calls
+		}
+	}
+	if !ci.CheckSum && !b.opt.Compare.Checksum && !b.opt.IgnoreListingChecksum {
+		fs.Infof(nil, Color(terminal.Dim, "Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set."))
+		b.opt.IgnoreListingChecksum = true
+	}
+	if !b.opt.Compare.Size && !b.opt.Compare.Modtime && !b.opt.Compare.Checksum {
+		return errors.New(Color(terminal.RedFg, "must set a Compare method. (size, modtime, and checksum can't all be false.)"))
+	}
+
+	notSupported := func(label string, value bool, opt *bool) {
+		if value {
+			fs.Logf(nil, Color(terminal.YellowFg, "WARNING: %s is set but bisync does not support it. It will be ignored."), label)
+			*opt = false
+		}
+	}
+	notSupported("--update", ci.UpdateOlder, &ci.UpdateOlder)
+	notSupported("--no-check-dest", ci.NoCheckDest, &ci.NoCheckDest)
+	notSupported("--no-traverse", ci.NoTraverse, &ci.NoTraverse)
+	// TODO: thorough search for other flags that should be on this list...
+
+	prettyprint(b.opt.Compare, "Bisyncing with Comparison Settings", fs.LogLevelInfo)
+	return nil
+}
+
+// returns true if the sizes are definitely different.
+// returns false if equal, or if either is unknown.
+func sizeDiffers(a, b int64) bool {
+	if a < 0 || b < 0 {
+		return false
+	}
+	return a != b
+}
+
+// returns true if the hashes are definitely different.
+// returns false if equal, or if either is unknown.
+func hashDiffers(a, b string, ht1, ht2 hash.Type, size1, size2 int64) bool {
+	if a == "" || b == "" {
+		if ht1 != hash.None && ht2 != hash.None && !(size1 <= 0 || size2 <= 0) {
+			fs.Logf(nil, Color(terminal.YellowFg, "WARNING: hash unexpectedly blank despite Fs support (%s, %s) (you may need to --resync!)"), a, b)
+		}
+		return false
+	}
+	if ht1 != ht2 {
+		if !(downloadHash && ((ht1 == hash.MD5 && ht2 == hash.None) || (ht1 == hash.None && ht2 == hash.MD5))) {
+			fs.Infof(nil, Color(terminal.YellowFg, "WARNING: Can't compare hashes of different types (%s, %s)"), ht1.String(), ht2.String())
+			return false
+		}
+	}
+	return a != b
+}
+
+// chooses hash type, giving priority to types both sides have in common
+func (b *bisyncRun) setHashType(ci *fs.ConfigInfo) {
+	downloadHash = b.opt.Compare.DownloadHash
+	if b.opt.Compare.NoSlowHash && b.opt.Compare.SlowHashDetected {
+		fs.Infof(nil, "Not checking for common hash as at least one slow hash detected.")
+	} else {
+		common := b.fs1.Hashes().Overlap(b.fs2.Hashes())
+		if common.Count() > 0 && common.GetOne() != hash.None {
+			ht := common.GetOne()
+			b.opt.Compare.HashType1 = ht
+			b.opt.Compare.HashType2 = ht
+			if !b.opt.Compare.SlowHashSyncOnly || !b.opt.Compare.SlowHashDetected {
+				return
+			}
+		} else if b.opt.Compare.SlowHashSyncOnly && b.opt.Compare.SlowHashDetected {
+			fs.Logf(b.fs2, Color(terminal.YellowFg, "Ignoring --slow-hash-sync-only and falling back to --no-slow-hash as Path1 and Path2 have no hashes in common."))
+			b.opt.Compare.SlowHashSyncOnly = false
+			b.opt.Compare.NoSlowHash = true
+			ci.CheckSum = false
+		}
+	}
+
+	if !b.opt.Compare.DownloadHash && !b.opt.Compare.SlowHashSyncOnly {
+		fs.Logf(b.fs2, Color(terminal.YellowFg, "--checksum is in use but Path1 and Path2 have no hashes in common; falling back to --compare modtime,size for sync. (Use --compare size or --size-only to ignore modtime)"))
+		fs.Infof("Path1 hashes", "%v", b.fs1.Hashes().String())
+		fs.Infof("Path2 hashes", "%v", b.fs2.Hashes().String())
+		b.opt.Compare.Modtime = true
+		b.opt.Compare.Size = true
+		ci.CheckSum = false
+	}
+	if (b.opt.Compare.NoSlowHash || b.opt.Compare.SlowHashSyncOnly) && b.fs1.Features().SlowHash {
+		fs.Infof(nil, Color(terminal.YellowFg, "Slow hash detected on Path1. Will ignore checksum due to slow-hash settings"))
+		b.opt.Compare.HashType1 = hash.None
+	} else {
+		b.opt.Compare.HashType1 = b.fs1.Hashes().GetOne()
+		if b.opt.Compare.HashType1 != hash.None {
+			fs.Logf(b.fs1, Color(terminal.YellowFg, "will use %s for same-side diffs on Path1 only"), b.opt.Compare.HashType1)
+		}
+	}
+	if (b.opt.Compare.NoSlowHash || b.opt.Compare.SlowHashSyncOnly) && b.fs2.Features().SlowHash {
+		fs.Infof(nil, Color(terminal.YellowFg, "Slow hash detected on Path2. Will ignore checksum due to slow-hash settings"))
+		b.opt.Compare.HashType1 = hash.None
+	} else {
+		b.opt.Compare.HashType2 = b.fs2.Hashes().GetOne()
+		if b.opt.Compare.HashType2 != hash.None {
+			fs.Logf(b.fs2, Color(terminal.YellowFg, "will use %s for same-side diffs on Path2 only"), b.opt.Compare.HashType2)
+		}
+	}
+	if b.opt.Compare.HashType1 == hash.None && b.opt.Compare.HashType2 == hash.None && !b.opt.Compare.DownloadHash {
+		fs.Logf(nil, Color(terminal.YellowFg, "WARNING: Ignoring checksums globally as hashes are ignored or unavailable on both sides."))
+		b.opt.Compare.Checksum = false
+		ci.CheckSum = false
+		b.opt.IgnoreListingChecksum = true
+	}
+}
+
+// returns true if the times are definitely different (by more than the modify window).
+// returns false if equal, within modify window, or if either is unknown.
+// considers precision per-Fs.
+func timeDiffers(ctx context.Context, a, b time.Time, fsA, fsB fs.Info) bool {
+	modifyWindow := fs.GetModifyWindow(ctx, fsA, fsB)
+	if modifyWindow == fs.ModTimeNotSupported {
+		return false
+	}
+	if a.IsZero() || b.IsZero() {
+		fs.Logf(fsA, "Fs supports modtime, but modtime is missing")
+		return false
+	}
+	dt := b.Sub(a)
+	if dt < modifyWindow && dt > -modifyWindow {
+		fs.Debugf(a, "modification time the same (differ by %s, within tolerance %s)", dt, modifyWindow)
+		return false
+	}
+
+	fs.Debugf(a, "Modification times differ by %s: %v, %v", dt, a, b)
+	return true
+}
+
+func (b *bisyncRun) setFromCompareFlag(ctx context.Context) error {
+	if b.opt.CompareFlag == "" {
+		return nil
+	}
+	var CompareFlag CompareOpt // for exlcusions
+	opts := strings.Split(b.opt.CompareFlag, ",")
+	for _, opt := range opts {
+		switch strings.ToLower(strings.TrimSpace(opt)) {
+		case "size":
+			b.opt.Compare.Size = true
+			CompareFlag.Size = true
+		case "modtime":
+			b.opt.Compare.Modtime = true
+			CompareFlag.Modtime = true
+		case "checksum":
+			b.opt.Compare.Checksum = true
+			CompareFlag.Checksum = true
+		default:
+			return fmt.Errorf(Color(terminal.RedFg, "unknown compare option: %s (must be size, modtime, or checksum)"), opt)
+		}
+	}
+
+	// exclusions (override defaults, only if --compare != "")
+	if !CompareFlag.Size {
+		b.opt.Compare.Size = false
+	}
+	if !CompareFlag.Modtime {
+		b.opt.Compare.Modtime = false
+	}
+	if !CompareFlag.Checksum {
+		b.opt.Compare.Checksum = false
+	}
+
+	// override sync flags to match
+	ci := fs.GetConfig(ctx)
+	if b.opt.Compare.Checksum {
+		ci.CheckSum = true
+	}
+	if b.opt.Compare.Modtime && !b.opt.Compare.Checksum {
+		ci.CheckSum = false
+	}
+	if !b.opt.Compare.Size {
+		ci.IgnoreSize = true
+	}
+	if !b.opt.Compare.Modtime {
+		ci.UseServerModTime = true
+	}
+	if b.opt.Compare.Size && !b.opt.Compare.Modtime && !b.opt.Compare.Checksum {
+		ci.SizeOnly = true
+	}
+
+	return nil
+}
+
+// downloadHash is true if we should attempt to compute hash by downloading when otherwise unavailable
+var downloadHash bool
+var downloadHashWarn mutex.Once
+var firstDownloadHash mutex.Once
+
+func tryDownloadHash(ctx context.Context, o fs.DirEntry, hashVal string) (string, error) {
+	if hashVal != "" || !downloadHash {
+		return hashVal, nil
+	}
+	obj, ok := o.(fs.Object)
+	if !ok {
+		fs.Infof(o, "failed to download hash -- not an fs.Object")
+		return hashVal, fs.ErrorObjectNotFound
+	}
+	if o.Size() < 0 {
+		downloadHashWarn.Do(func() {
+			fs.Logf(o, Color(terminal.YellowFg, "Skipping hash download as checksum not reliable with files of unknown length."))
+		})
+		fs.Debugf(o, "Skipping hash download as checksum not reliable with files of unknown length.")
+		return hashVal, hash.ErrUnsupported
+	}
+
+	firstDownloadHash.Do(func() {
+		fs.Infof(obj.Fs().Name(), Color(terminal.Dim, "Downloading hashes..."))
+	})
+	tr := accounting.Stats(ctx).NewCheckingTransfer(o, "computing hash with --download-hash")
+	defer func() {
+		tr.Done(ctx, nil)
+	}()
+
+	sum, err := operations.HashSum(ctx, hash.MD5, false, true, obj)
+	if err != nil {
+		fs.Infof(o, "DownloadHash -- hash: %v, err: %v", sum, err)
+	} else {
+		fs.Debugf(o, "DownloadHash -- hash: %v", sum)
+	}
+	return sum, err
+}

cmd/bisync/deltas.go

@@ -13,6 +13,7 @@ import (
 	"github.com/rclone/rclone/fs"
 	"github.com/rclone/rclone/fs/filter"
 	"github.com/rclone/rclone/fs/operations"
+	"github.com/rclone/rclone/lib/terminal"
 	"golang.org/x/text/unicode/norm"
 )
 
@@ -24,14 +25,17 @@ const (
 	deltaNew  delta = 1 << iota
 	deltaNewer
 	deltaOlder
-	deltaSize
+	deltaLarger
+	deltaSmaller
 	deltaHash
 	deltaDeleted
 )
 
 const (
-	deltaModified delta = deltaNewer | deltaOlder | deltaSize | deltaHash | deltaDeleted
-	deltaOther    delta = deltaNew | deltaNewer | deltaOlder
+	deltaSize     delta = deltaLarger | deltaSmaller
+	deltaTime     delta = deltaNewer | deltaOlder
+	deltaModified delta = deltaTime | deltaSize | deltaHash
+	deltaOther    delta = deltaNew | deltaTime | deltaSize | deltaHash
 )
 
 func (d delta) is(cond delta) bool {
@@ -41,6 +45,8 @@ func (d delta) is(cond delta) bool {
 // deltaSet
 type deltaSet struct {
 	deltas     map[string]delta
+	size       map[string]int64
+	hash       map[string]string
 	opt        *Options
 	fs         fs.Fs  // base filesystem
 	msg        string // filesystem name for logging
@@ -72,25 +78,71 @@ func (ds *deltaSet) printStats() {
 	}
 	nAll := len(ds.deltas)
 	nNew := 0
+	nMod := 0
+	nTime := 0
 	nNewer := 0
 	nOlder := 0
+	nSize := 0
+	nLarger := 0
+	nSmaller := 0
+	nHash := 0
 	nDeleted := 0
 	for _, d := range ds.deltas {
 		if d.is(deltaNew) {
 			nNew++
 		}
+		if d.is(deltaModified) {
+			nMod++
+		}
+		if d.is(deltaTime) {
+			nTime++
+		}
 		if d.is(deltaNewer) {
 			nNewer++
 		}
 		if d.is(deltaOlder) {
 			nOlder++
 		}
+		if d.is(deltaSize) {
+			nSize++
+		}
+		if d.is(deltaLarger) {
+			nLarger++
+		}
+		if d.is(deltaSmaller) {
+			nSmaller++
+		}
+		if d.is(deltaHash) {
+			nHash++
+		}
 		if d.is(deltaDeleted) {
 			nDeleted++
 		}
 	}
-	fs.Infof(nil, "%s: %4d changes: %4d new, %4d newer, %4d older, %4d deleted",
-		ds.msg, nAll, nNew, nNewer, nOlder, nDeleted)
+	if nAll != nNew+nMod+nDeleted {
+		fs.Errorf(nil, "something doesn't add up! %4d != %4d + %4d + %4d", nAll, nNew, nMod, nDeleted)
+	}
+	fs.Infof(nil, "%s: %4d changes: "+Color(terminal.GreenFg, "%4d new")+", "+Color(terminal.YellowFg, "%4d modified")+", "+Color(terminal.RedFg, "%4d deleted"),
+		ds.msg, nAll, nNew, nMod, nDeleted)
+	if nMod > 0 {
+		details := []string{}
+		if nTime > 0 {
+			details = append(details, fmt.Sprintf(Color(terminal.CyanFg, "%4d newer"), nNewer))
+			details = append(details, fmt.Sprintf(Color(terminal.BlueFg, "%4d older"), nOlder))
+		}
+		if nSize > 0 {
+			details = append(details, fmt.Sprintf(Color(terminal.CyanFg, "%4d larger"), nLarger))
+			details = append(details, fmt.Sprintf(Color(terminal.BlueFg, "%4d smaller"), nSmaller))
+		}
+		if nHash > 0 {
+			details = append(details, fmt.Sprintf(Color(terminal.CyanFg, "%4d hash differs"), nHash))
+		}
+		if (nNewer+nOlder != nTime) || (nLarger+nSmaller != nSize) || (nMod > nTime+nSize+nHash) {
+			fs.Errorf(nil, "something doesn't add up!")
+		}
+
+		fs.Infof(nil, "(%s: %s)", Color(terminal.YellowFg, "Modified"), strings.Join(details, ", "))
+	}
 }
 
 // findDeltas
@@ -117,6 +169,8 @@ func (b *bisyncRun) findDeltas(fctx context.Context, f fs.Fs, oldListing string,
 
 	ds = &deltaSet{
 		deltas:     map[string]delta{},
+		size:       map[string]int64{},
+		hash:       map[string]string{},
 		fs:         f,
 		msg:        msg,
 		oldCount:   len(old.list),
@@ -125,31 +179,70 @@ func (b *bisyncRun) findDeltas(fctx context.Context, f fs.Fs, oldListing string,
 	}
 
 	for _, file := range old.list {
+		// REMEMBER: this section is only concerned with comparing listings from the same side (not different sides)
 		d := deltaZero
+		s := int64(0)
+		h := ""
 		if !now.has(file) {
-			b.indent(msg, file, "File was deleted")
+			b.indent(msg, file, Color(terminal.RedFg, "File was deleted"))
 			ds.deleted++
 			d |= deltaDeleted
 		} else {
 			// skip dirs here, as we only care if they are new/deleted, not newer/older
 			if !now.isDir(file) {
-				if old.getTime(file) != now.getTime(file) {
-					if old.beforeOther(now, file) {
-						fs.Debugf(file, "(old: %v current: %v", old.getTime(file), now.getTime(file))
-						b.indent(msg, file, "File is newer")
-						d |= deltaNewer
-					} else { // Current version is older than prior sync.
-						fs.Debugf(file, "(old: %v current: %v", old.getTime(file), now.getTime(file))
-						b.indent(msg, file, "File is OLDER")
-						d |= deltaOlder
+				whatchanged := []string{}
+				if b.opt.Compare.Size {
+					if sizeDiffers(old.getSize(file), now.getSize(file)) {
+						fs.Debugf(file, "(old: %v current: %v)", old.getSize(file), now.getSize(file))
+						if now.getSize(file) > old.getSize(file) {
+							whatchanged = append(whatchanged, Color(terminal.MagentaFg, "size (larger)"))
+							d |= deltaLarger
+						} else {
+							whatchanged = append(whatchanged, Color(terminal.MagentaFg, "size (smaller)"))
+							d |= deltaSmaller
+						}
+						s = now.getSize(file)
 					}
 				}
-				// TODO Compare sizes and hashes
+				if b.opt.Compare.Modtime {
+					if timeDiffers(fctx, old.getTime(file), now.getTime(file), f, f) {
+						if old.beforeOther(now, file) {
+							fs.Debugf(file, "(old: %v current: %v)", old.getTime(file), now.getTime(file))
+							whatchanged = append(whatchanged, Color(terminal.MagentaFg, "time (newer)"))
+							d |= deltaNewer
+						} else { // Current version is older than prior sync.
+							fs.Debugf(file, "(old: %v current: %v)", old.getTime(file), now.getTime(file))
+							whatchanged = append(whatchanged, Color(terminal.MagentaFg, "time (older)"))
+							d |= deltaOlder
+						}
+					}
+				}
+				if b.opt.Compare.Checksum {
+					if hashDiffers(old.getHash(file), now.getHash(file), old.hash, now.hash, old.getSize(file), now.getSize(file)) {
+						fs.Debugf(file, "(old: %v current: %v)", old.getHash(file), now.getHash(file))
+						whatchanged = append(whatchanged, Color(terminal.MagentaFg, "hash"))
+						d |= deltaHash
+						h = now.getHash(file)
+					}
+				}
+				// concat changes and print log
+				if d.is(deltaModified) {
+					summary := fmt.Sprintf(Color(terminal.YellowFg, "File changed: %s"), strings.Join(whatchanged, ", "))
+					b.indent(msg, file, summary)
+				}
 			}
 		}
 
 		if d.is(deltaModified) {
 			ds.deltas[file] = d
+			if b.opt.Compare.Size {
+				ds.size[file] = s
+			}
+			if b.opt.Compare.Checksum {
+				ds.hash[file] = h
+			}
+		} else if d.is(deltaDeleted) {
+			ds.deltas[file] = d
 		} else {
 			// Once we've found at least one unchanged file,
 			// we know that not everything has changed,
@@ -160,8 +253,14 @@ func (b *bisyncRun) findDeltas(fctx context.Context, f fs.Fs, oldListing string,
 
 	for _, file := range now.list {
 		if !old.has(file) {
-			b.indent(msg, file, "File is new")
+			b.indent(msg, file, Color(terminal.GreenFg, "File is new"))
 			ds.deltas[file] = deltaNew
+			if b.opt.Compare.Size {
+				ds.size[file] = now.getSize(file)
+			}
+			if b.opt.Compare.Checksum {
+				ds.hash[file] = now.getHash(file)
+			}
 		}
 	}
 
@@ -234,20 +333,28 @@ func (b *bisyncRun) applyDeltas(ctx context.Context, ds1, ds2 *deltaSet) (change
 		d1 := ds1.deltas[file]
 		if d1.is(deltaOther) {
 			d2, in2 := ds2.deltas[file]
+			file2 := file
 			if !in2 && file != alias {
 				d2 = ds2.deltas[alias]
+				file2 = alias
 			}
 			if d2.is(deltaOther) {
-				checkit := func(filename string) {
-					if err := filterCheck.AddFile(filename); err != nil {
-						fs.Debugf(nil, "Non-critical error adding file to list of potential conflicts to check: %s", err)
-					} else {
-						fs.Debugf(nil, "Added file to list of potential conflicts to check: %s", filename)
+				// if size or hash differ, skip this, as we already know they're not equal
+				if (b.opt.Compare.Size && sizeDiffers(ds1.size[file], ds2.size[file2])) ||
+					(b.opt.Compare.Checksum && hashDiffers(ds1.hash[file], ds2.hash[file2], b.opt.Compare.HashType1, b.opt.Compare.HashType2, ds1.size[file], ds2.size[file2])) {
+					fs.Debugf(file, "skipping equality check as size/hash definitely differ")
+				} else {
+					checkit := func(filename string) {
+						if err := filterCheck.AddFile(filename); err != nil {
+							fs.Debugf(nil, "Non-critical error adding file to list of potential conflicts to check: %s", err)
+						} else {
+							fs.Debugf(nil, "Added file to list of potential conflicts to check: %s", filename)
+						}
+					}
+					checkit(file)
+					if file != alias {
+						checkit(alias)
 					}
-				}
-				checkit(file)
-				if file != alias {
-					checkit(alias)
 				}
 			}
 		}
@@ -294,6 +401,17 @@ func (b *bisyncRun) applyDeltas(ctx context.Context, ds1, ds2 *deltaSet) (change
 							// the Path1 version is deemed "correct" in this scenario
 							fs.Infof(alias, "Files are equal but will copy anyway to fix case to %s", file)
 							copy1to2.Add(file)
+						} else if b.opt.Compare.Modtime && timeDiffers(ctx, ls1.getTime(ls1.getTryAlias(file, alias)), ls2.getTime(ls2.getTryAlias(file, alias)), b.fs1, b.fs2) {
+							fs.Infof(file, "Files are equal but will copy anyway to update modtime (will not rename)")
+							if ls1.getTime(ls1.getTryAlias(file, alias)).Before(ls2.getTime(ls2.getTryAlias(file, alias))) {
+								// Path2 is newer
+								b.indent("Path2", p1, "Queue copy to Path1")
+								copy2to1.Add(ls2.getTryAlias(file, alias))
+							} else {
+								// Path1 is newer
+								b.indent("Path1", p2, "Queue copy to Path2")
+								copy1to2.Add(ls1.getTryAlias(file, alias))
+							}
 						} else {
 							fs.Infof(nil, "Files are equal! Skipping: %s", file)
 							renameSkipped.Add(file)

cmd/bisync/listing.go

@@ -141,6 +141,15 @@ func (ls *fileList) put(file string, size int64, modtime time.Time, hash, id str
 	}
 }
 
+func (ls *fileList) getTryAlias(file, alias string) string {
+	if ls.has(file) {
+		return file
+	} else if ls.has(alias) {
+		return alias
+	}
+	return ""
+}
+
 func (ls *fileList) getTime(file string) time.Time {
 	fi := ls.get(file)
 	if fi == nil {
@@ -149,6 +158,48 @@ func (ls *fileList) getTime(file string) time.Time {
 	return fi.time
 }
 
+func (ls *fileList) getSize(file string) int64 {
+	fi := ls.get(file)
+	if fi == nil {
+		return 0
+	}
+	return fi.size
+}
+
+func (ls *fileList) getHash(file string) string {
+	fi := ls.get(file)
+	if fi == nil {
+		return ""
+	}
+	return fi.hash
+}
+
+func (b *bisyncRun) fileInfoEqual(file1, file2 string, ls1, ls2 *fileList) bool {
+	equal := true
+	if ls1.isDir(file1) && ls2.isDir(file2) {
+		return equal
+	}
+	if b.opt.Compare.Size {
+		if sizeDiffers(ls1.getSize(file1), ls2.getSize(file2)) {
+			b.indent("ERROR", file1, fmt.Sprintf("Size not equal in listing. Path1: %v, Path2: %v", ls1.getSize(file1), ls2.getSize(file2)))
+			equal = false
+		}
+	}
+	if b.opt.Compare.Modtime {
+		if timeDiffers(b.fctx, ls1.getTime(file1), ls2.getTime(file2), b.fs1, b.fs2) {
+			b.indent("ERROR", file1, fmt.Sprintf("Modtime not equal in listing. Path1: %v, Path2: %v", ls1.getTime(file1), ls2.getTime(file2)))
+			equal = false
+		}
+	}
+	if b.opt.Compare.Checksum && !ignoreListingChecksum {
+		if hashDiffers(ls1.getHash(file1), ls2.getHash(file2), b.opt.Compare.HashType1, b.opt.Compare.HashType2, ls1.getSize(file1), ls2.getSize(file2)) {
+			b.indent("ERROR", file1, fmt.Sprintf("Checksum not equal in listing. Path1: %v, Path2: %v", ls1.getHash(file1), ls2.getHash(file2)))
+			equal = false
+		}
+	}
+	return equal
+}
+
 // also returns false if not found
 func (ls *fileList) isDir(file string) bool {
 	fi := ls.get(file)
@@ -418,8 +469,8 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res
 	}
 
 	fs.Debugf(nil, "updating %s", direction)
-	fs.Debugf(nil, "RESULTS: %v", results)
-	fs.Debugf(nil, "QUEUE: %v", queue)
+	prettyprint(results, "results", fs.LogLevelDebug)
+	prettyprint(queue, "queue", fs.LogLevelDebug)
 
 	srcListing, dstListing := b.getListingNames(is1to2)
 	srcList, err := b.loadListing(srcListing)
@@ -432,8 +483,19 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res
 	}
 	// set list hash type
 	if b.opt.Resync && !b.opt.IgnoreListingChecksum {
-		srcList.hash = src.Hashes().GetOne()
-		dstList.hash = dst.Hashes().GetOne()
+		if is1to2 {
+			srcList.hash = b.opt.Compare.HashType1
+			dstList.hash = b.opt.Compare.HashType2
+		} else {
+			srcList.hash = b.opt.Compare.HashType2
+			dstList.hash = b.opt.Compare.HashType1
+		}
+		if b.opt.Compare.DownloadHash && srcList.hash == hash.None {
+			srcList.hash = hash.MD5
+		}
+		if b.opt.Compare.DownloadHash && dstList.hash == hash.None {
+			dstList.hash = hash.MD5
+		}
 	}
 
 	srcWinners := newFileList()
@@ -457,13 +519,13 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res
 		// build src winners list
 		if result.IsSrc && result.Src != "" && (result.Winner.Err == nil || result.Flags == "d") {
 			srcWinners.put(result.Name, result.Size, ConvertPrecision(result.Modtime, src), result.Hash, "-", result.Flags)
-			fs.Debugf(nil, "winner: copy to src: %v", result)
+			prettyprint(result, "winner: copy to src", fs.LogLevelDebug)
 		}
 
 		// build dst winners list
 		if result.IsWinner && result.Winner.Side != "none" && (result.Winner.Err == nil || result.Flags == "d") {
 			dstWinners.put(result.Name, result.Size, ConvertPrecision(result.Modtime, dst), result.Hash, "-", result.Flags)
-			fs.Debugf(nil, "winner: copy to dst: %v", result)
+			prettyprint(result, "winner: copy to dst", fs.LogLevelDebug)
 		}
 
 		// build errors list
@@ -597,13 +659,9 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res
 
 	// update files
 	err = srcList.save(ctx, srcListing)
-	if err != nil {
-		b.abort = true
-	}
+	b.handleErr(srcList, "error saving srcList from modifyListing", err, true, true)
 	err = dstList.save(ctx, dstListing)
-	if err != nil {
-		b.abort = true
-	}
+	b.handleErr(dstList, "error saving dstList from modifyListing", err, true, true)
 
 	return err
 }
@@ -626,15 +684,20 @@ func (b *bisyncRun) recheck(ctxRecheck context.Context, src, dst fs.Fs, srcList,
 		fs.Debugf(dst, "error recchecking dst obj: %v", err)
 	}
 
-	putObj := func(obj fs.Object, f fs.Fs, list *fileList) {
+	putObj := func(obj fs.Object, list *fileList) {
 		hashVal := ""
 		if !b.opt.IgnoreListingChecksum {
-			hashType := f.Hashes().GetOne()
+			hashType := list.hash
 			if hashType != hash.None {
 				hashVal, _ = obj.Hash(ctxRecheck, hashType)
 			}
+			hashVal, _ = tryDownloadHash(ctxRecheck, obj, hashVal)
 		}
-		list.put(obj.Remote(), obj.Size(), obj.ModTime(ctxRecheck), hashVal, "-", "-")
+		var modtime time.Time
+		if b.opt.Compare.Modtime {
+			modtime = obj.ModTime(ctxRecheck).In(TZ)
+		}
+		list.put(obj.Remote(), obj.Size(), modtime, hashVal, "-", "-")
 	}
 
 	for _, srcObj := range srcObjs {
@@ -643,8 +706,8 @@ func (b *bisyncRun) recheck(ctxRecheck context.Context, src, dst fs.Fs, srcList,
 			if srcObj.Remote() == dstObj.Remote() || srcObj.Remote() == b.aliases.Alias(dstObj.Remote()) {
 				// note: unlike Equal(), WhichEqual() does not update the modtime in dest if sums match but modtimes don't.
 				if b.opt.DryRun || WhichEqual(ctxRecheck, srcObj, dstObj, src, dst) {
-					putObj(srcObj, src, srcList)
-					putObj(dstObj, dst, dstList)
+					putObj(srcObj, srcList)
+					putObj(dstObj, dstList)
 					resolved = append(resolved, srcObj.Remote())
 				} else {
 					fs.Infof(srcObj, "files not equal on recheck: %v %v", srcObj, dstObj)

cmd/bisync/log.go

@@ -1,6 +1,7 @@
 package bisync
 
 import (
+	"encoding/json"
 	"fmt"
 	"runtime"
 	"strconv"
@@ -28,8 +29,14 @@ func (b *bisyncRun) indent(tag, file, msg string) {
 		logf = fs.Logf
 	}
 
-	tag = Color(terminal.BlueFg, tag)
+	if tag == "Path1" {
+		tag = Color(terminal.CyanFg, "Path1")
+	} else {
+		tag = Color(terminal.BlueFg, tag)
+	}
 	msg = Color(terminal.MagentaFg, msg)
+	msg = strings.Replace(msg, "Queue copy to", Color(terminal.GreenFg, "Queue copy to"), -1)
+	msg = strings.Replace(msg, "Queue delete", Color(terminal.RedFg, "Queue delete"), -1)
 	file = Color(terminal.CyanFg, escapePath(file, false))
 	logf(nil, "- %-18s%-43s - %s", tag, msg, file)
 }
@@ -64,3 +71,16 @@ func Color(style string, s string) string {
 func encode(s string) string {
 	return encoder.OS.ToStandardPath(encoder.OS.FromStandardPath(s))
 }
+
+// prettyprint formats JSON for improved readability in debug logs
+func prettyprint(in any, label string, level fs.LogLevel) {
+	inBytes, err := json.MarshalIndent(in, "", "\t")
+	if err != nil {
+		fs.Debugf(nil, "failed to marshal input: %v", err)
+	}
+	if level == fs.LogLevelDebug {
+		fs.Debugf(nil, "%s: \n%s\n", label, string(inBytes))
+	} else if level == fs.LogLevelInfo {
+		fs.Infof(nil, "%s: \n%s\n", label, string(inBytes))
+	}
+}

cmd/bisync/march.go

@@ -3,6 +3,7 @@ package bisync
 import (
 	"context"
 	"sync"
+	"time"
 
 	"github.com/rclone/rclone/fs"
 	"github.com/rclone/rclone/fs/accounting"
@@ -45,18 +46,21 @@ func (b *bisyncRun) makeMarchListing(ctx context.Context) (*fileList, *fileList,
 		err = firstErr
 	}
 	if err != nil {
+		b.handleErr("march", "error during march", err, true, true)
 		b.abort = true
 	}
 
 	// save files
+	if b.opt.Compare.DownloadHash && ls1.hash == hash.None {
+		ls1.hash = hash.MD5
+	}
+	if b.opt.Compare.DownloadHash && ls2.hash == hash.None {
+		ls2.hash = hash.MD5
+	}
 	err = ls1.save(ctx, b.newListing1)
-	if err != nil {
-		b.abort = true
-	}
+	b.handleErr(ls1, "error saving ls1 from march", err, true, true)
 	err = ls2.save(ctx, b.newListing2)
-	if err != nil {
-		b.abort = true
-	}
+	b.handleErr(ls2, "error saving ls2 from march", err, true, true)
 
 	return ls1, ls2, err
 }
@@ -117,18 +121,10 @@ func (b *bisyncRun) setupListing() {
 	ls1 = newFileList()
 	ls2 = newFileList()
 
-	hashType1 := hash.None
-	hashType2 := hash.None
-	if !b.opt.IgnoreListingChecksum {
-		// Currently bisync just honors --ignore-listing-checksum
-		// (note that this is different from --ignore-checksum)
-		// TODO add full support for checksums and related flags
-		hashType1 = b.fs1.Hashes().GetOne()
-		hashType2 = b.fs2.Hashes().GetOne()
-	}
-
-	ls1.hash = hashType1
-	ls2.hash = hashType2
+	// note that --ignore-listing-checksum is different from --ignore-checksum
+	// and we already checked it when we set b.opt.Compare.HashType1 and 2
+	ls1.hash = b.opt.Compare.HashType1
+	ls2.hash = b.opt.Compare.HashType2
 }
 
 func (b *bisyncRun) ForObject(o fs.Object, isPath1 bool) {
@@ -150,11 +146,24 @@ func (b *bisyncRun) ForObject(o fs.Object, isPath1 bool) {
 		}
 		marchErrLock.Unlock()
 	}
-	time := o.ModTime(marchCtx).In(TZ)
+	hashVal, hashErr = tryDownloadHash(marchCtx, o, hashVal)
+	marchErrLock.Lock()
+	if firstErr == nil {
+		firstErr = hashErr
+	}
+	if firstErr != nil {
+		b.handleErr(hashType, "error hashing during march", firstErr, false, true)
+	}
+	marchErrLock.Unlock()
+
+	var modtime time.Time
+	if b.opt.Compare.Modtime {
+		modtime = o.ModTime(marchCtx).In(TZ)
+	}
 	id := ""     // TODO
 	flags := "-" // "-" for a file and "d" for a directory
 	marchLsLock.Lock()
-	ls.put(o.Remote(), o.Size(), time, hashVal, id, flags)
+	ls.put(o.Remote(), o.Size(), modtime, hashVal, id, flags)
 	marchLsLock.Unlock()
 }
 
@@ -164,11 +173,14 @@ func (b *bisyncRun) ForDir(o fs.Directory, isPath1 bool) {
 		tr.Done(marchCtx, nil)
 	}()
 	ls := whichLs(isPath1)
-	time := o.ModTime(marchCtx).In(TZ)
+	var modtime time.Time
+	if b.opt.Compare.Modtime {
+		modtime = o.ModTime(marchCtx).In(TZ)
+	}
 	id := ""     // TODO
 	flags := "d" // "-" for a file and "d" for a directory
 	marchLsLock.Lock()
-	ls.put(o.Remote(), -1, time, "", id, flags)
+	ls.put(o.Remote(), -1, modtime, "", id, flags)
 	marchLsLock.Unlock()
 }
 
@@ -217,6 +229,7 @@ func (b *bisyncRun) findCheckFiles(ctx context.Context) (*fileList, *fileList, e
 		err = firstErr
 	}
 	if err != nil {
+		b.handleErr("march", "error during findCheckFiles", err, true, true)
 		b.abort = true
 	}
 

cmd/bisync/operations.go

@@ -55,6 +55,7 @@ type queues struct {
 
 // Bisync handles lock file, performs bisync run and checks exit status
 func Bisync(ctx context.Context, fs1, fs2 fs.Fs, optArg *Options) (err error) {
+	defer resetGlobals()
 	opt := *optArg // ensure that input is never changed
 	b := &bisyncRun{
 		fs1: fs1,
@@ -71,13 +72,9 @@ func Bisync(ctx context.Context, fs1, fs2 fs.Fs, optArg *Options) (err error) {
 	ci := fs.GetConfig(ctx)
 	opt.OrigBackupDir = ci.BackupDir
 
-	if !opt.DryRun && !opt.Force {
-		if fs1.Precision() == fs.ModTimeNotSupported {
-			return errors.New("modification time support is missing on path1")
-		}
-		if fs2.Precision() == fs.ModTimeNotSupported {
-			return errors.New("modification time support is missing on path2")
-		}
+	err = b.setCompareDefaults(ctx)
+	if err != nil {
+		return err
 	}
 
 	if b.workDir, err = filepath.Abs(opt.Workdir); err != nil {
@@ -389,10 +386,12 @@ func (b *bisyncRun) resync(octx, fctx context.Context) error {
 	var ls2 = newFileList()
 	err = ls1.save(fctx, b.newListing1)
 	if err != nil {
+		b.handleErr(ls1, "error saving ls1 from resync", err, true, true)
 		b.abort = true
 	}
 	err = ls2.save(fctx, b.newListing2)
 	if err != nil {
+		b.handleErr(ls2, "error saving ls2 from resync", err, true, true)
 		b.abort = true
 	}
 
@@ -519,6 +518,10 @@ func (b *bisyncRun) checkSync(listing1, listing2 string) error {
 		if !files2.has(file) && !files2.has(b.aliases.Alias(file)) {
 			b.indent("ERROR", file, "Path1 file not found in Path2")
 			ok = false
+		} else {
+			if !b.fileInfoEqual(file, files2.getTryAlias(file, b.aliases.Alias(file)), files1, files2) {
+				ok = false
+			}
 		}
 	}
 	for _, file := range files2.list {
@@ -527,6 +530,7 @@ func (b *bisyncRun) checkSync(listing1, listing2 string) error {
 			ok = false
 		}
 	}
+
 	if !ok {
 		return errors.New("path1 and path2 are out of sync, run --resync to recover")
 	}
@@ -583,6 +587,7 @@ func (b *bisyncRun) handleErr(o interface{}, msg string, err error, critical, re
 		}
 		if critical {
 			b.critical = true
+			b.abort = true
 			fs.Errorf(o, "%s: %v", msg, err)
 		} else {
 			fs.Infof(o, "%s: %v", msg, err)
@@ -603,3 +608,25 @@ func (b *bisyncRun) setBackupDir(ctx context.Context, destPath int) context.Cont
 	fs.Debugf(ci.BackupDir, "updated backup-dir for Path%d", destPath)
 	return ctx
 }
+
+// mainly to make sure tests don't interfere with each other when running more than one
+func resetGlobals() {
+	downloadHash = false
+	logger = operations.NewLoggerOpt()
+	ignoreListingChecksum = false
+	ignoreListingModtime = false
+	hashTypes = nil
+	queueCI = nil
+	hashType = 0
+	fsrc, fdst = nil, nil
+	fcrypt = nil
+	Opt = Options{}
+	once = gosync.Once{}
+	downloadHashWarn = gosync.Once{}
+	firstDownloadHash = gosync.Once{}
+	ls1 = newFileList()
+	ls2 = newFileList()
+	err = nil
+	firstErr = nil
+	marchCtx = nil
+}

cmd/bisync/queue.go

@@ -12,6 +12,7 @@ import (
 	"github.com/rclone/rclone/cmd/bisync/bilib"
 	"github.com/rclone/rclone/fs"
 	"github.com/rclone/rclone/fs/filter"
+	"github.com/rclone/rclone/fs/hash"
 	"github.com/rclone/rclone/fs/operations"
 	"github.com/rclone/rclone/fs/sync"
 	"github.com/rclone/rclone/lib/terminal"
@@ -40,7 +41,18 @@ var logger = operations.NewLoggerOpt()
 var lock mutex.Mutex
 var once mutex.Once
 var ignoreListingChecksum bool
-var ci *fs.ConfigInfo
+var ignoreListingModtime bool
+var hashTypes map[string]hash.Type
+var queueCI *fs.ConfigInfo
+
+// allows us to get the right hashtype during the LoggerFn without knowing whether it's Path1/Path2
+func getHashType(fname string) hash.Type {
+	ht, ok := hashTypes[fname]
+	if ok {
+		return ht
+	}
+	return hash.None
+}
 
 // FsPathIfAny handles type assertions and returns a formatted bilib.FsPath if valid, otherwise ""
 func FsPathIfAny(x fs.DirEntry) string {
@@ -102,13 +114,16 @@ func WriteResults(ctx context.Context, sigil operations.Sigil, src, dst fs.DirEn
 		result.Flags = "-"
 		if side != nil {
 			result.Size = side.Size()
-			result.Modtime = side.ModTime(ctx).In(time.UTC)
-
+			if !ignoreListingModtime {
+				result.Modtime = side.ModTime(ctx).In(TZ)
+			}
 			if !ignoreListingChecksum {
 				sideObj, ok := side.(fs.ObjectInfo)
 				if ok {
-					result.Hash, _ = sideObj.Hash(ctx, sideObj.Fs().Hashes().GetOne())
+					result.Hash, _ = sideObj.Hash(ctx, getHashType(sideObj.Fs().Name()))
+					result.Hash, _ = tryDownloadHash(ctx, sideObj, result.Hash)
 				}
+
 			}
 		}
 		result.IsWinner = result.Winner.Obj == side
@@ -126,13 +141,13 @@ func WriteResults(ctx context.Context, sigil operations.Sigil, src, dst fs.DirEn
 			result.Size = -1
 		}
 
-		if result.Size < 0 && result.Flags != "d" && (ci.CheckSum || ci.SizeOnly) {
+		prettyprint(result, "writing result", fs.LogLevelDebug)
+		if result.Size < 0 && result.Flags != "d" && ((queueCI.CheckSum && !downloadHash) || queueCI.SizeOnly) {
 			once.Do(func() {
 				fs.Logf(result.Name, Color(terminal.YellowFg, "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"))
 			})
 		}
 
-		fs.Debugf(nil, "writing result: %v", result)
 		err := json.NewEncoder(opt.JSON).Encode(result)
 		if err != nil {
 			fs.Errorf(result, "Error encoding JSON: %v", err)
@@ -149,13 +164,45 @@ func ReadResults(results io.Reader) []Results {
 		if err := dec.Decode(&r); err == io.EOF {
 			break
 		}
-		fs.Debugf(nil, "result: %v", r)
+		prettyprint(r, "result", fs.LogLevelDebug)
 		slice = append(slice, r)
 	}
 	return slice
 }
 
+// for setup code shared by both fastCopy and resyncDir
+func (b *bisyncRun) preCopy(ctx context.Context) context.Context {
+	queueCI = fs.GetConfig(ctx)
+	ignoreListingChecksum = b.opt.IgnoreListingChecksum
+	ignoreListingModtime = !b.opt.Compare.Modtime
+	hashTypes = map[string]hash.Type{
+		b.fs1.Name(): b.opt.Compare.HashType1,
+		b.fs2.Name(): b.opt.Compare.HashType2,
+	}
+	logger.LoggerFn = WriteResults
+	overridingEqual := false
+	if (b.opt.Compare.Modtime && b.opt.Compare.Checksum) || b.opt.Compare.DownloadHash {
+		overridingEqual = true
+		fs.Debugf(nil, "overriding equal")
+		// otherwise impossible in Sync, so override Equal
+		ctx = b.EqualFn(ctx)
+	}
+	ctxCopyLogger := operations.WithSyncLogger(ctx, logger)
+	if b.opt.Compare.Checksum && (b.opt.Compare.NoSlowHash || b.opt.Compare.SlowHashSyncOnly) && b.opt.Compare.SlowHashDetected {
+		// set here in case !b.opt.Compare.Modtime
+		queueCI = fs.GetConfig(ctxCopyLogger)
+		if b.opt.Compare.NoSlowHash {
+			queueCI.CheckSum = false
+		}
+		if b.opt.Compare.SlowHashSyncOnly && !overridingEqual {
+			queueCI.CheckSum = true
+		}
+	}
+	return ctxCopyLogger
+}
+
 func (b *bisyncRun) fastCopy(ctx context.Context, fsrc, fdst fs.Fs, files bilib.Names, queueName string) ([]Results, error) {
+	ctx = b.preCopy(ctx)
 	if err := b.saveQueue(files, queueName); err != nil {
 		return nil, err
 	}
@@ -173,13 +220,9 @@ func (b *bisyncRun) fastCopy(ctx context.Context, fsrc, fdst fs.Fs, files bilib.
 		}
 	}
 
-	ignoreListingChecksum = b.opt.IgnoreListingChecksum
-	ci = fs.GetConfig(ctx)
-	logger.LoggerFn = WriteResults
-	ctxCopyLogger := operations.WithSyncLogger(ctxCopy, logger)
 	b.testFn()
-	err := sync.Sync(ctxCopyLogger, fdst, fsrc, b.opt.CreateEmptySrcDirs)
-	fs.Debugf(nil, "logger is: %v", logger)
+	err := sync.Sync(ctxCopy, fdst, fsrc, b.opt.CreateEmptySrcDirs)
+	prettyprint(logger, "logger", fs.LogLevelDebug)
 
 	getResults := ReadResults(logger.JSON)
 	fs.Debugf(nil, "Got %v results for %v", len(getResults), queueName)
@@ -203,12 +246,10 @@ func (b *bisyncRun) retryFastCopy(ctx context.Context, fsrc, fdst fs.Fs, files b
 }
 
 func (b *bisyncRun) resyncDir(ctx context.Context, fsrc, fdst fs.Fs) ([]Results, error) {
-	ci = fs.GetConfig(ctx)
-	ignoreListingChecksum = b.opt.IgnoreListingChecksum
-	logger.LoggerFn = WriteResults
-	ctxCopyLogger := operations.WithSyncLogger(ctx, logger)
-	err := sync.CopyDir(ctxCopyLogger, fdst, fsrc, b.opt.CreateEmptySrcDirs)
-	fs.Debugf(nil, "logger is: %v", logger)
+	ctx = b.preCopy(ctx)
+
+	err := sync.CopyDir(ctx, fdst, fsrc, b.opt.CreateEmptySrcDirs)
+	prettyprint(logger, "logger", fs.LogLevelDebug)
 
 	getResults := ReadResults(logger.JSON)
 	fs.Debugf(nil, "Got %v results for %v", len(getResults), "resync")

cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst

@@ -1,9 +1,9 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-new

@@ -1,9 +1,9 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-old

@@ -1,9 +1,9 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst

@@ -1,9 +1,9 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-new

@@ -1,9 +1,9 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-old

@@ -1,9 +1,9 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_all_changed/golden/test.log

@@ -3,10 +3,20 @@
 
 (02)  : test initial bisync
 (03)  : bisync resync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : 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  : - Path1    Resync is copying UNIQUE OR DIFFERING files to - Path2
 INFO  : Resync updating listings
 INFO  : Bisync successful
 
@@ -16,27 +26,38 @@ INFO  : Bisync successful
 
 (07)  : test sync should pass
 (08)  : bisync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
-INFO  : - Path1    File is newer                      - file1.copy1.txt
-INFO  : - Path1    File is newer                      - file1.copy2.txt
-INFO  : - Path1    File is newer                      - file1.copy3.txt
-INFO  : - Path1    File is newer                      - file1.copy4.txt
-INFO  : - Path1    File is newer                      - file1.copy5.txt
-INFO  : - Path1    File is newer                      - file1.txt
-INFO  : - Path1    File is newer                      - subdir/file20.txt
-INFO  : Path1:    7 changes:    0 new,    7 newer,    0 older,    0 deleted
+INFO  : - Path1    File changed: time (newer) - file1.copy1.txt
+INFO  : - Path1    File changed: time (newer) - file1.copy2.txt
+INFO  : - Path1    File changed: time (newer) - file1.copy3.txt
+INFO  : - Path1    File changed: time (newer) - file1.copy4.txt
+INFO  : - Path1    File changed: time (newer) - file1.copy5.txt
+INFO  : - Path1    File changed: time (newer) - file1.txt
+INFO  : - Path1    File changed: time (newer) - subdir/file20.txt
+INFO  : Path1:    7 changes:    0 new,    7 modified,    0 deleted
+INFO  : (Modified:    7 newer,    0 older)
 INFO  : Path2 checking for diffs
 INFO  : Applying changes
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy1.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy2.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy3.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy4.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy5.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}subdir/file20.txt
-INFO  : - Path1    Do queued copies to                - Path2
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy1.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy2.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy3.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy4.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy5.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}subdir/file20.txt
+INFO  : - Path1    Do queued copies to                - Path2
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful
@@ -47,18 +68,29 @@ INFO  : Bisync successful
 
 (12)  : test sync should fail
 (13)  : bisync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
-INFO  : - Path1    File is newer                      - RCLONE_TEST
-INFO  : - Path1    File is OLDER                      - file1.copy1.txt
-INFO  : - Path1    File is OLDER                      - file1.copy2.txt
-INFO  : - Path1    File is OLDER                      - file1.copy3.txt
-INFO  : - Path1    File is OLDER                      - file1.copy4.txt
-INFO  : - Path1    File is OLDER                      - file1.copy5.txt
-INFO  : - Path1    File is OLDER                      - file1.txt
-INFO  : - Path1    File is OLDER                      - subdir/file20.txt
-INFO  : Path1:    8 changes:    0 new,    1 newer,    7 older,    0 deleted
+INFO  : - Path1    File changed: time (newer) - RCLONE_TEST
+INFO  : - Path1    File changed: time (older) - file1.copy1.txt
+INFO  : - Path1    File changed: time (older) - file1.copy2.txt
+INFO  : - Path1    File changed: time (older) - file1.copy3.txt
+INFO  : - Path1    File changed: time (older) - file1.copy4.txt
+INFO  : - Path1    File changed: time (older) - file1.copy5.txt
+INFO  : - Path1    File changed: time (older) - file1.txt
+INFO  : - Path1    File changed: time (older) - subdir/file20.txt
+INFO  : Path1:    8 changes:    0 new,    8 modified,    0 deleted
+INFO  : (Modified:    1 newer,    7 older)
 INFO  : Path2 checking for diffs
 ERROR : Safety abort: all files were changed on Path1 "{path1/}". Run with --force if desired.
 NOTICE: Bisync aborted. Please try again.
@@ -66,29 +98,40 @@ Bisync error: all files were changed
 
 (14)  : test sync with force should pass
 (15)  : bisync force
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
-INFO  : - Path1    File is newer                      - RCLONE_TEST
-INFO  : - Path1    File is OLDER                      - file1.copy1.txt
-INFO  : - Path1    File is OLDER                      - file1.copy2.txt
-INFO  : - Path1    File is OLDER                      - file1.copy3.txt
-INFO  : - Path1    File is OLDER                      - file1.copy4.txt
-INFO  : - Path1    File is OLDER                      - file1.copy5.txt
-INFO  : - Path1    File is OLDER                      - file1.txt
-INFO  : - Path1    File is OLDER                      - subdir/file20.txt
-INFO  : Path1:    8 changes:    0 new,    1 newer,    7 older,    0 deleted
+INFO  : - Path1    File changed: time (newer) - RCLONE_TEST
+INFO  : - Path1    File changed: time (older) - file1.copy1.txt
+INFO  : - Path1    File changed: time (older) - file1.copy2.txt
+INFO  : - Path1    File changed: time (older) - file1.copy3.txt
+INFO  : - Path1    File changed: time (older) - file1.copy4.txt
+INFO  : - Path1    File changed: time (older) - file1.copy5.txt
+INFO  : - Path1    File changed: time (older) - file1.txt
+INFO  : - Path1    File changed: time (older) - subdir/file20.txt
+INFO  : Path1:    8 changes:    0 new,    8 modified,    0 deleted
+INFO  : (Modified:    1 newer,    7 older)
 INFO  : Path2 checking for diffs
 INFO  : Applying changes
-INFO  : - Path1    Queue copy to Path2                - {path2/}RCLONE_TEST
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy1.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy2.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy3.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy4.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.copy5.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file1.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}subdir/file20.txt
-INFO  : - Path1    Do queued copies to                - Path2
+INFO  : - Path1    Queue copy to Path2       - {path2/}RCLONE_TEST
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy1.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy2.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy3.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy4.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.copy5.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file1.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}subdir/file20.txt
+INFO  : - Path1    Do queued copies to                - Path2
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst

@@ -1,9 +1,9 @@
 # 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 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-new

@@ -1,9 +1,9 @@
 # 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 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-old

@@ -1,9 +1,9 @@
 # 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 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst

@@ -1,9 +1,9 @@
 # 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 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-new

@@ -1,9 +1,9 @@
 # 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 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-old

@@ -1,9 +1,9 @@
 # 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 "file1.copy1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_basic/golden/test.log

@@ -3,10 +3,20 @@
 
 (02)  : test initial bisync
 (03)  : bisync resync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : 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  : - Path1    Resync is copying UNIQUE OR DIFFERING files to - Path2
 INFO  : Resync updating listings
 INFO  : Bisync successful
 
@@ -17,19 +27,31 @@ INFO  : Bisync successful
 
 (07)  : test bisync run
 (08)  : bisync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
-INFO  : - Path1    File is newer                      - subdir/file20.txt
-INFO  : Path1:    1 changes:    0 new,    1 newer,    0 older,    0 deleted
+INFO  : - Path1    File changed: size (larger), time (newer) - subdir/file20.txt
+INFO  : Path1:    1 changes:    0 new,    1 modified,    0 deleted
+INFO  : (Modified:    1 newer,    0 older,    1 larger,    0 smaller)
 INFO  : Path2 checking for diffs
-INFO  : - Path2    File is newer                      - file1.txt
-INFO  : Path2:    1 changes:    0 new,    1 newer,    0 older,    0 deleted
+INFO  : - Path2    File changed: size (larger), time (newer) - file1.txt
+INFO  : Path2:    1 changes:    0 new,    1 modified,    0 deleted
+INFO  : (Modified:    1 newer,    0 older,    1 larger,    0 smaller)
 INFO  : Applying changes
-INFO  : - Path1    Queue copy to Path2                - {path2/}subdir/file20.txt
-INFO  : - Path2    Queue copy to Path1                - {path1/}file1.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}subdir/file20.txt
+INFO  : - Path2    Queue copy to Path1       - {path1/}file1.txt
 INFO  : - Path2    Do queued copies to                - Path1
-INFO  : - Path1    Do queued copies to                - Path2
+INFO  : - Path1    Do queued copies to                - Path2
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst

@@ -1,10 +1,10 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt"
--       13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.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"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt"
+-       13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+-       39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1"
+-       39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt"

cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-new

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt"
--       13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--       39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt"
+-       13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-       39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt"

cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-old

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt"

cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst

@@ -1,10 +1,10 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt"
--       13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.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"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt"
+-       13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt"
+-       39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1"
+-       39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt"

cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-new

@@ -1,8 +1,8 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--       39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt"
--       19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-       39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt"
+-       19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt"

cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-old

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt"

cmd/bisync/testdata/test_changes/golden/test.log

@@ -3,10 +3,20 @@
 
 (02)  : test initial bisync
 (03)  : bisync resync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : 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  : - Path1    Resync is copying UNIQUE OR DIFFERING files to - Path2
 INFO  : Resync updating listings
 INFO  : Bisync successful
 
@@ -49,47 +59,59 @@ INFO  : Bisync successful
 
 (31)  : test bisync run
 (32)  : bisync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
-INFO  : - Path1    File is newer                      - file2.txt
-INFO  : - Path1    File was deleted                   - file4.txt
-INFO  : - Path1    File is newer                      - file5.txt
-INFO  : - Path1    File was deleted                   - file6.txt
-INFO  : - Path1    File is newer                      - file7.txt
-INFO  : - Path1    File was deleted                   - file8.txt
-INFO  : - Path1    File is new                        - file11.txt
-INFO  : Path1:    7 changes:    1 new,    3 newer,    0 older,    3 deleted
+INFO  : - Path1    File changed: size (larger), time (newer) - file2.txt
+INFO  : - Path1    File was deleted          - file4.txt
+INFO  : - Path1    File changed: size (larger), time (newer) - file5.txt
+INFO  : - Path1    File was deleted          - file6.txt
+INFO  : - Path1    File changed: size (larger), time (newer) - file7.txt
+INFO  : - Path1    File was deleted          - file8.txt
+INFO  : - Path1    File is new               - file11.txt
+INFO  : Path1:    7 changes:    1 new,    3 modified,    3 deleted
+INFO  : (Modified:    3 newer,    0 older,    3 larger,    0 smaller)
 INFO  : Path2 checking for diffs
-INFO  : - Path2    File is newer                      - file1.txt
-INFO  : - Path2    File was deleted                   - file3.txt
-INFO  : - Path2    File is newer                      - file5.txt
-INFO  : - Path2    File is newer                      - file6.txt
-INFO  : - Path2    File was deleted                   - file7.txt
-INFO  : - Path2    File was deleted                   - file8.txt
-INFO  : - Path2    File is new                        - file10.txt
-INFO  : Path2:    7 changes:    1 new,    3 newer,    0 older,    3 deleted
+INFO  : - Path2    File changed: size (larger), time (newer) - file1.txt
+INFO  : - Path2    File was deleted          - file3.txt
+INFO  : - Path2    File changed: size (larger), time (newer) - file5.txt
+INFO  : - Path2    File changed: size (larger), time (newer) - file6.txt
+INFO  : - Path2    File was deleted          - file7.txt
+INFO  : - Path2    File was deleted          - file8.txt
+INFO  : - Path2    File is new               - file10.txt
+INFO  : Path2:    7 changes:    1 new,    3 modified,    3 deleted
+INFO  : (Modified:    3 newer,    0 older,    3 larger,    0 smaller)
 INFO  : Applying changes
 INFO  : Checking potential conflicts...
 ERROR : file5.txt: md5 differ
 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
-INFO  : - Path2    Queue delete                       - {path2/}file4.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file11.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file2.txt
+INFO  : - Path2    Queue delete              - {path2/}file4.txt
 NOTICE: - WARNING  New or changed in both paths       - file5.txt
-NOTICE: - Path1    Renaming Path1 copy                - {path1/}file5.txt..path1
-NOTICE: - Path1    Queue copy to Path2                - {path2/}file5.txt..path1
+NOTICE: - Path1    Renaming Path1 copy                - {path1/}file5.txt..path1
+NOTICE: - Path1    Queue copy to Path2       - {path2/}file5.txt..path1
 NOTICE: - Path2    Renaming Path2 copy                - {path2/}file5.txt..path2
-NOTICE: - Path2    Queue copy to Path1                - {path1/}file5.txt..path2
-INFO  : - Path2    Queue copy to Path1                - {path1/}file6.txt
-INFO  : - Path1    Queue copy to Path2                - {path2/}file7.txt
-INFO  : - Path2    Queue copy to Path1                - {path1/}file1.txt
-INFO  : - Path2    Queue copy to Path1                - {path1/}file10.txt
-INFO  : - Path1    Queue delete                       - {path1/}file3.txt
+NOTICE: - Path2    Queue copy to Path1       - {path1/}file5.txt..path2
+INFO  : - Path2    Queue copy to Path1       - {path1/}file6.txt
+INFO  : - Path1    Queue copy to Path2       - {path2/}file7.txt
+INFO  : - Path2    Queue copy to Path1       - {path1/}file1.txt
+INFO  : - Path2    Queue copy to Path1       - {path1/}file10.txt
+INFO  : - Path1    Queue delete              - {path1/}file3.txt
 INFO  : - Path2    Do queued copies to                - Path1
-INFO  : - Path1    Do queued copies to                - Path2
+INFO  : - Path1    Do queued copies to                - Path2
 INFO  : Updating listings
 INFO  : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"
 INFO  : Bisync successful

cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-new

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-old

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-new

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-old

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-err

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,7 +1,7 @@
 # bisync listing v1 from test
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-err

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-err

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,7 +1,7 @@
 # bisync listing v1 from test
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-err

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,7 +1,7 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,8 +1,8 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_access/golden/test.log

@@ -3,15 +3,35 @@
 
 (02)  : test initial bisync
 (03)  : bisync resync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : 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  : - Path1    Resync is copying UNIQUE OR DIFFERING files to - Path2
 INFO  : Resync updating listings
 INFO  : Bisync successful
 
 (04)  : test 1. see that check-access passes with the initial setup
 (05)  : bisync check-access
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
@@ -26,12 +46,22 @@ INFO  : Bisync successful
 (06)  : test 2. delete the path2 subdir RCLONE_TEST and run sync. should fail critical.
 (07)  : delete-file {path2/}subdir/RCLONE_TEST
 (08)  : bisync check-access
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
 INFO  : Path2 checking for diffs
-INFO  : - Path2    File was deleted                   - subdir/RCLONE_TEST
-INFO  : Path2:    1 changes:    0 new,    0 newer,    0 older,    1 deleted
+INFO  : - Path2    File was deleted          - subdir/RCLONE_TEST
+INFO  : Path2:    1 changes:    0 new,    0 modified,    1 deleted
 INFO  : Checking access health
 ERROR : Access test failed: Path1 count 2, Path2 count 1 - RCLONE_TEST
 ERROR : -          Access test failed: Path1 file not found in Path2 - subdir/RCLONE_TEST
@@ -43,15 +73,35 @@ Bisync error: bisync aborted
 (10)  : test 3. put the path2 subdir RCLONE_TEST back, resync.
 (11)  : copy-file {path1/}subdir/RCLONE_TEST {path2/}
 (12)  : bisync resync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : 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  : - Path1    Resync is copying UNIQUE OR DIFFERING files to - Path2
 INFO  : Resync updating listings
 INFO  : Bisync successful
 
 (13)  : test 4. run sync with check-access. should pass.
 (14)  : bisync check-access
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
@@ -66,11 +116,21 @@ INFO  : Bisync successful
 (15)  : test 5. delete path1 top level RCLONE_TEST, run sync. should fail critical.
 (16)  : delete-file {path1/}RCLONE_TEST
 (17)  : bisync check-access
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
-INFO  : - Path1    File was deleted                   - RCLONE_TEST
-INFO  : Path1:    1 changes:    0 new,    0 newer,    0 older,    1 deleted
+INFO  : - Path1    File was deleted          - RCLONE_TEST
+INFO  : Path1:    1 changes:    0 new,    0 modified,    1 deleted
 INFO  : Path2 checking for diffs
 INFO  : Checking access health
 ERROR : Access test failed: Path1 count 1, Path2 count 2 - RCLONE_TEST
@@ -82,6 +142,16 @@ Bisync error: bisync aborted
 
 (19)  : test 6. run again. should fail critical due to missing listings.
 (20)  : bisync check-access
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 ERROR : Bisync critical error: cannot find prior Path1 or Path2 listings, likely due to critical error on prior run
 Tip: here are the filenames we were looking for. Do they exist?
@@ -95,15 +165,35 @@ Bisync error: bisync aborted
 
 (22)  : test 7. run resync, which will copy the path2 top level back to path1.
 (23)  : bisync resync
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : 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  : - Path1    Resync is copying UNIQUE OR DIFFERING files to - Path2
 INFO  : Resync updating listings
 INFO  : Bisync successful
 
 (24)  : test 8. run sync with --check-access. should pass.
 (25)  : bisync check-access
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs

cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-err

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,9 +1,9 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-err

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,9 +1,9 @@
 # bisync listing v1 from test
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,10 +1,10 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-err

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,12 +1,12 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-err

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,13 +1,13 @@
 # bisync listing v1 from test
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-new

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-old

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-new

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-old

@@ -1,14 +1,14 @@
 # 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 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt"

cmd/bisync/testdata/test_check_access_filters/golden/test.log

@@ -6,17 +6,37 @@
 
 (04)  : test resync to get the filters file md5 built.
 (05)  : bisync resync filters-file={workdir/}exclude-other-filtersfile.txt
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Using filters file {workdir/}exclude-other-filtersfile.txt
 INFO  : Storing filters file hash to {workdir/}exclude-other-filtersfile.txt.md5
 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  : - Path1    Resync is copying UNIQUE OR DIFFERING files to - Path2
 INFO  : Resync updating listings
 INFO  : Bisync successful
 
 (06)  : test EXCLUDE - test filters for check access
 (07)  : bisync check-access filters-file={workdir/}exclude-other-filtersfile.txt
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Using filters file {workdir/}exclude-other-filtersfile.txt
 INFO  : Building Path1 and Path2 listings
@@ -38,6 +58,16 @@ INFO  : Bisync successful
 
 (14)  : test EXCLUDE - test should PASS
 (15)  : bisync check-access filters-file={workdir/}exclude-other-filtersfile.txt
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Using filters file {workdir/}exclude-other-filtersfile.txt
 INFO  : Building Path1 and Path2 listings
@@ -57,15 +87,25 @@ INFO  : Bisync successful
 
 (20)  : test EXCLUDE - test should ABORT
 (21)  : bisync check-access filters-file={workdir/}exclude-other-filtersfile.txt
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Using filters file {workdir/}exclude-other-filtersfile.txt
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
-INFO  : - Path1    File was deleted                   - subdir/RCLONE_TEST
-INFO  : Path1:    1 changes:    0 new,    0 newer,    0 older,    1 deleted
+INFO  : - Path1    File was deleted          - subdir/RCLONE_TEST
+INFO  : Path1:    1 changes:    0 new,    0 modified,    1 deleted
 INFO  : Path2 checking for diffs
-INFO  : - Path2    File was deleted                   - RCLONE_TEST
-INFO  : Path2:    1 changes:    0 new,    0 newer,    0 older,    1 deleted
+INFO  : - Path2    File was deleted          - RCLONE_TEST
+INFO  : Path2:    1 changes:    0 new,    0 modified,    1 deleted
 INFO  : Checking access health
 ERROR : -          Access test failed: Path1 file not found in Path2 - RCLONE_TEST
 ERROR : -          Access test failed: Path2 file not found in Path1 - subdir/RCLONE_TEST
@@ -80,17 +120,37 @@ Bisync error: bisync aborted
 (26)  : sync-dir {path1/} {path2/}
 (27)  : copy-file {datadir/}include-other-filtersfile.txt {workdir/}
 (28)  : bisync resync filters-file={workdir/}include-other-filtersfile.txt
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Using filters file {workdir/}include-other-filtersfile.txt
 INFO  : Storing filters file hash to {workdir/}include-other-filtersfile.txt.md5
 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  : - Path1    Resync is copying UNIQUE OR DIFFERING files to - Path2
 INFO  : Resync updating listings
 INFO  : Bisync successful
 
 (29)  : test INCLUDE - test include/exclude filters for check access
 (30)  : bisync check-access filters-file={workdir/}include-other-filtersfile.txt
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Using filters file {workdir/}include-other-filtersfile.txt
 INFO  : Building Path1 and Path2 listings
@@ -111,6 +171,16 @@ INFO  : Bisync successful
 
 (36)  : test INCLUDE - test should PASS
 (37)  : bisync check-access filters-file={workdir/}include-other-filtersfile.txt
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Using filters file {workdir/}include-other-filtersfile.txt
 INFO  : Building Path1 and Path2 listings
@@ -131,16 +201,26 @@ INFO  : Bisync successful
 
 (43)  : test INCLUDE - test should ABORT
 (44)  : bisync check-access filters-file={workdir/}include-other-filtersfile.txt
+INFO  : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.
+INFO  : Bisyncing with Comparison Settings:
+{
+"Modtime": true,
+"Size": true,
+"Checksum": false,
+"NoSlowHash": false,
+"SlowHashSyncOnly": false,
+"DownloadHash": false
+}
 INFO  : Synching Path1 "{path1/}" with Path2 "{path2/}"
 INFO  : Using filters file {workdir/}include-other-filtersfile.txt
 INFO  : Building Path1 and Path2 listings
 INFO  : Path1 checking for diffs
-INFO  : - Path1    File was deleted                   - subdir/RCLONE_TEST
-INFO  : - Path1    File was deleted                   - subdirX/subdirX1/RCLONE_TEST
-INFO  : Path1:    2 changes:    0 new,    0 newer,    0 older,    2 deleted
+INFO  : - Path1    File was deleted          - subdir/RCLONE_TEST
+INFO  : - Path1    File was deleted          - subdirX/subdirX1/RCLONE_TEST
+INFO  : Path1:    2 changes:    0 new,    0 modified,    2 deleted
 INFO  : Path2 checking for diffs
-INFO  : - Path2    File was deleted                   - RCLONE_TEST
-INFO  : Path2:    1 changes:    0 new,    0 newer,    0 older,    1 deleted
+INFO  : - Path2    File was deleted          - RCLONE_TEST
+INFO  : Path2:    1 changes:    0 new,    0 modified,    1 deleted
 INFO  : Checking access health
 ERROR : Access test failed: Path1 count 3, Path2 count 4 - RCLONE_TEST
 ERROR : -          Access test failed: Path1 file not found in Path2 - RCLONE_TEST

cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst

@@ -1,8 +1,8 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-new

@@ -1,8 +1,8 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-old

@@ -1,8 +1,8 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst

@@ -1,8 +1,8 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-new

@@ -1,8 +1,8 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-old

@@ -1,8 +1,8 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"

cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst

@@ -1,8 +1,8 @@
 # bisync listing v1 from test
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
--      109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
--        0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt"
+-      109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file"
+-        0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt"