From b2defdcaf57cf8eddf2aa473bdef3d5655d06daa Mon Sep 17 00:00:00 2001
From: Kathleen Tuite <ktuite@getodk.org>
Date: Wed, 21 Aug 2024 09:19:09 -0700
Subject: [PATCH] Add branchid to entity base version query

---
 lib/model/query/entities.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model/query/entities.js b/lib/model/query/entities.js
index e7173e234..8b2b248fb 100644
--- a/lib/model/query/entities.js
+++ b/lib/model/query/entities.js
@@ -322,7 +322,7 @@ const _computeBaseVersion = (eventId, dataset, clientEntity, submissionDef) => a
     else if (clientEntity.def.baseVersion === clientEntity.def.trunkVersion) // Start of an offline branch
       condition = { version: clientEntity.def.baseVersion };
     else // middle of an offline branch
-      condition = { branchBaseVersion: clientEntity.def.baseVersion - 1 };
+      condition = { branchId: clientEntity.def.branchId, branchBaseVersion: clientEntity.def.baseVersion - 1 };
 
     const baseEntityVersion = await Entities.getDef(dataset.id, clientEntity.uuid, new QueryOptions({ condition }));