hexedtech/codemp
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp.git synced 2024-11-22 15:24:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: this time is the good one

Browse source
This commit is contained in:
cschen 2024-08-14 16:31:28 +02:00
parent 6c30699acc
commit d22446ee10
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/buffer/worker.rs
View file

@ -140,7 +140,7 @@ impl ControllerWorker<TextChange> for BufferWorker {
// x.0.start should always be after lastver! // x.0.start should always be after lastver!
// this step_ver will be the version after we apply the operation // 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. // we give it to the controller so that he knows where it's at.
let step_ver = oplog.version_union(&[lv.start], &last_ver); let step_ver = oplog.version_union(&[lv.end-1], &last_ver);
branch.merge(&oplog, &step_ver); branch.merge(&oplog, &step_ver);
let new_local_v = branch.local_version(); let new_local_v = branch.local_version();