This should fix update conflicts on replica side when transaction on master was rolled back and concurrent transaction run update and commits while first transaction undoes own changes via savepoints.

See also #8541 : Deadlock update conflict on replica server?

Author: hvlad

src/jrd/replication/Publisher.cpp

@@ -226,7 +226,7 @@ namespace
 		{
 			const auto savepoint = *iter;
 
-			if (savepoint->isReplicated() || savepoint->isRoot())
+			if (savepoint->isReplicated())
 				break;
 
 			transaction->tra_replicator->startSavepoint(&status);