From be57d6ce8efc458fcfec94430cb6020d7eb5ae8a Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Tue, 4 Sep 2018 13:32:19 -0700 Subject: [PATCH] replication/diff: replace invalid comparison of CreateTXG with Creation --- replication/internal/diff/diff.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/replication/internal/diff/diff.go b/replication/internal/diff/diff.go index 213bc77..c76f5de 100644 --- a/replication/internal/diff/diff.go +++ b/replication/internal/diff/diff.go @@ -65,7 +65,16 @@ func IncrementalPath(receiver, sender []*FilesystemVersion) (incPath []*Filesyst } break } - if receiver[mrcaRcv].CreateTXG < sender[mrcaSnd].CreateTXG { + receiverCreation, err := receiver[mrcaRcv].CreationAsTime() + if err != nil { + panic(err) // FIXME move this to a sorting phase before + } + senderCreation, err := sender[mrcaSnd].CreationAsTime() + if err != nil { + panic(err) // FIXME move this to the sorting phase before + } + + if receiverCreation.Before(senderCreation) { mrcaSnd-- } else { mrcaRcv--