From 7d1860e608496ad28cadc173bc7eea47e653600a Mon Sep 17 00:00:00 2001
From: Kevin Jump <kevin@thejumps.co.uk>
Date: Tue, 16 Apr 2024 16:29:18 +0100
Subject: [PATCH 1/2] Fix for #619. don't report property deletes as changes
 when they have already happened

---
 uSync.Core/Tracking/SyncRootMergerHelper.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/uSync.Core/Tracking/SyncRootMergerHelper.cs b/uSync.Core/Tracking/SyncRootMergerHelper.cs
index cb52b0e3..8ab418be 100644
--- a/uSync.Core/Tracking/SyncRootMergerHelper.cs
+++ b/uSync.Core/Tracking/SyncRootMergerHelper.cs
@@ -28,9 +28,17 @@ public static (XElement combined, XElement differences) CompareNodes(List<XEleme
 
         foreach (var node in nodes[..^1])
         {
+            // if the later node is a delete/rename, it always wins
+            // there is nothing to merge
+            if (node.IsEmptyItem())
+                return (node, BlankNode(differences));
+
+            // if this node is the same as the differences we already have, 
+            // return it. 
             if (node.ToString() == differences.ToString())
                 return (combined, BlankNode(differences));
 
+            // workout any merged diffrences, 
             (combined, differences) = GetTrackedNodeDifferences(node, combined, trackedNodes);
         }
         return (combined, differences);
@@ -152,8 +160,13 @@ private static (XElement combined, XElement diffrence) GetMultipleChanges(Tracki
             else
             {
                 var replacement = FindByKey(combinedCollection, element, item.Keys, key);
-                replacement?.AddAfterSelf(targetElement);
-                replacement?.Remove();
+
+				// only add this if its not a delete
+				if (targetElement.Attribute("deleted").ValueOrDefault(false) is false)
+                {
+					replacement?.AddAfterSelf(targetElement);
+				}
+				replacement?.Remove();
             }
         }
 

From 10e350978d9dcb22ee3398d746844a39bfd449ec Mon Sep 17 00:00:00 2001
From: Kevin Jump <kevin@thejumps.co.uk>
Date: Tue, 16 Apr 2024 16:47:06 +0100
Subject: [PATCH 2/2] Add fix for #620 - don't recreate items that are deleted.

---
 uSync.Core/Tracking/SyncRootMergerHelper.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/uSync.Core/Tracking/SyncRootMergerHelper.cs b/uSync.Core/Tracking/SyncRootMergerHelper.cs
index 8ab418be..9aa5a4dd 100644
--- a/uSync.Core/Tracking/SyncRootMergerHelper.cs
+++ b/uSync.Core/Tracking/SyncRootMergerHelper.cs
@@ -4,6 +4,8 @@
 using System.Xml.Linq;
 using System.Xml.XPath;
 
+using Serilog.Core;
+
 namespace uSync.Core.Tracking;
 
 public class SyncRootMergerHelper
@@ -26,13 +28,13 @@ public static (XElement combined, XElement differences) CompareNodes(List<XEleme
         var differences = XElement.Parse(nodes[^1].ToString());
         var combined = XElement.Parse(nodes[^1].ToString());
 
+        // latest is a blank one, that is a delete so should 
+        // be marked as one.
+        if (combined.IsEmptyItem())
+            return (combined, BlankNode(differences));
+            
         foreach (var node in nodes[..^1])
         {
-            // if the later node is a delete/rename, it always wins
-            // there is nothing to merge
-            if (node.IsEmptyItem())
-                return (node, BlankNode(differences));
-
             // if this node is the same as the differences we already have, 
             // return it. 
             if (node.ToString() == differences.ToString())