[lsd0004] branch master updated: hint as to why it may not be possible to merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository lsd0004.

The following commit(s) were added to refs/heads/master by this push:
     new 4952f2e  hint as to why it may not be possible to merge
4952f2e is described below

commit 4952f2e02a1c4df80f8c0113cdd879d42e92dbb7
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sun Aug 20 17:32:42 2023 +0200

    hint as to why it may not be possible to merge
---
 draft-schanzen-r5n.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
index a591718..b2ae396 100644
--- a/draft-schanzen-r5n.xml
+++ b/draft-schanzen-r5n.xml
@@ -929,7 +929,8 @@ BEGIN
          When a second query from the same origin for the
          same query hash is received, the DHT <bcp14>MUST</bcp14>
          attempt to merge the new request with the state for
-         the old request.  If this is not possible, the
+         the old request.  If this is not possible (say because
+         the MUTATOR differs), the
          existing result filter <bcp14>MUST</bcp14> be
          discarded and replaced with the result
          filter of the incoming message.

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.