This commit is contained in:
Dmitry Zuikov 2024-03-16 16:14:54 +03:00
parent c6b90878c3
commit 8d0f1e3591
4 changed files with 1041 additions and 8 deletions

View File

@ -1,4 +1,4 @@
all: hbs2-git-problem hbs2-git-new-repo
all: hbs2-git-problem hbs2-git-new-repo hbs2-git-doc
.PHONY: all clean
@ -10,6 +10,8 @@ hbs2-git-problem: hbs2-git-problem.pdf
hbs2-git-new-repo: hbs2-git-new-repo.pdf
hbs2-git-doc: hbs2-git-doc-0.24.1.pdf
clean:
rm -f *.aux *.log *.nav *.out *.snm *.vrb *.toc *.pdf

File diff suppressed because it is too large Load Diff

View File

@ -96,13 +96,18 @@ lwwRefProto adapter pkt@(LWWRefProto1 req) = do
Just rv -> do
blk' <- getBlock sto rv
maybe1 blk' (forcedUpdateLwwRef sto key bs) $ \blk -> do
let seq0 = deserialiseOrFail @(SignedBox (LWWRef e) e) blk
let lww0 = deserialiseOrFail @(SignedBox (LWWRef e) e) blk
& either (const Nothing) Just
>>= unboxSignedBox0
<&> snd
<&> lwwSeq
when (Just (lwwSeq lww) > seq0) do
let seq0 = lwwSeq <$> lww0
let lwwv0 = lwwValue <$> lww0
when ( Just (lwwSeq lww) > seq0
|| (Just (lwwSeq lww) == seq0 && Just (lwwValue lww) > lwwv0)
) do
forcedUpdateLwwRef sto key (serialise box)
where

View File

@ -295,11 +295,11 @@
"suckless-conf": "suckless-conf_2"
},
"locked": {
"lastModified": 1710558394,
"narHash": "sha256-Io0xjrddivrVznym5rpvwzO0PjP2++dnNlpXtGPyfU0=",
"lastModified": 1710568478,
"narHash": "sha256-hzePQ+JY/42lp9qPXU7hEJq6I+TU8nLQmKFvy0wXOpg=",
"ref": "lwwrepo",
"rev": "ce7c1f37c046fa5806613a1d3eb67d4d6b00e84c",
"revCount": 989,
"rev": "c6b90878c3485b98220f7d87ad14e047ab7dcf2a",
"revCount": 991,
"type": "git",
"url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP"
},