Much progress on syncable; important tests are passing!

diff --git a/src/Data/Syncable.hs b/src/Data/Syncable.hs
index c1032249ad8364e04a8f0267c087adf9067e8b8d..f583466c7bc372e54e919f8c7a69f3e1cbb18f2d 100644 (file)
--- 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. -}