From 348df3c65fe9607c03c31840932b553a1e8f25ff Mon Sep 17 00:00:00 2001 From: John Goerzen Date: Thu, 29 May 2008 02:18:41 -0500 Subject: [PATCH] Much progress on syncable; important tests are passing! --- src/Data/Syncable.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Data/Syncable.hs b/src/Data/Syncable.hs index c103224..f583466 100644 --- a/src/Data/Syncable.hs +++ b/src/Data/Syncable.hs @@ -129,8 +129,8 @@ syncBiDir masterstate childstate lastchildstate = -- then subtract out any items in the master changes that have the -- same key. childPayloadChanges = - Map.union (findModified childstate childstate masterstate lastchildstate) - (findModified childstate childstate childstate lastchildstate) + Map.difference (findModified childstate masterstate masterstate lastchildstate) + (findModified masterstate childstate childstate lastchildstate) {- | Compares two SyncCollections, and returns the commands that, when applied to the first collection, would yield the second. -} -- 2.39.2