From abdc7223068e96ee8fd0bc0ae8e7fe18eac8de44 Mon Sep 17 00:00:00 2001
From: Kevin Jump <kevin@thejumps.co.uk>
Date: Tue, 16 Apr 2024 16:55:44 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20for=20#619.=20don't=20report=20property?=
 =?UTF-8?q?=20deletes=20as=20changes=20when=20they=20have=E2=80=A6=20(#621?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix for #619. don't report property deletes as changes when they have already happened

* Add fix for #620 - don't recreate items that are deleted.
---
 uSync.Core/Tracking/SyncRootMergerHelper.cs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/uSync.Core/Tracking/SyncRootMergerHelper.cs b/uSync.Core/Tracking/SyncRootMergerHelper.cs
index cb52b0e3..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,11 +28,19 @@ 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 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 +162,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();
             }
         }