From 6c30699acca59d71f24b2ebb10dae1ff412ba9e7 Mon Sep 17 00:00:00 2001 From: cschen Date: Wed, 14 Aug 2024 16:15:42 +0200 Subject: [PATCH] Revert "(to alemi: always has been) fix: try now lmao." This reverts commit 1b5b9e74bf29b5de196e72842a630f805af0d2b4. --- src/buffer/worker.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buffer/worker.rs b/src/buffer/worker.rs index 81ac567..82ec367 100644 --- a/src/buffer/worker.rs +++ b/src/buffer/worker.rs @@ -140,7 +140,7 @@ impl ControllerWorker for BufferWorker { // x.0.start should always be after lastver! // this step_ver will be the version after we apply the operation // we give it to the controller so that he knows where it's at. - let step_ver = oplog.version_union(&[lv.end], &last_ver); + let step_ver = oplog.version_union(&[lv.start], &last_ver); branch.merge(&oplog, &step_ver); let new_local_v = branch.local_version();