From 73eaa10caf93aa272733527196987de6be14ca72 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sun, 1 Nov 2015 02:20:54 +0100 Subject: [PATCH] semantics change: allow referral just by ID i.e. flat match, not deep equality. This allows to send just an Ref (with the ID) over the wire to refer to an complete object to be picked, moved or deleted on the receiver side. --- src/lib/diff/tree-diff-application.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/diff/tree-diff-application.hpp b/src/lib/diff/tree-diff-application.hpp index cf2791e60..836de4aca 100644 --- a/src/lib/diff/tree-diff-application.hpp +++ b/src/lib/diff/tree-diff-application.hpp @@ -129,7 +129,7 @@ namespace diff{ throw error::State(_Fmt("Unable to %s element %s from target as demanded; " "no (further) elements in target sequence") % oper % elm , LUMIERA_ERROR_DIFF_CONFLICT); - if (*srcPos() != elm) + if (not srcPos()->matches(elm)) throw error::State(_Fmt("Unable to %s element %s from target as demanded; " "found element %s on current target position instead") % oper % elm % *srcPos()