Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wendelin.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Kirill Smelkov
wendelin.core
Commits
1af926c6
Commit
1af926c6
authored
Sep 22, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
b2b0b6c1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
wcfs/internal/xbtree/treediff.go
wcfs/internal/xbtree/treediff.go
+1
-1
No files found.
wcfs/internal/xbtree/treediff.go
View file @
1af926c6
...
@@ -390,6 +390,7 @@ func treediff(ctx context.Context, root zodb.Oid, δtops setOid, δZTC setOid, t
...
@@ -390,6 +390,7 @@ func treediff(ctx context.Context, root zodb.Oid, δtops setOid, δZTC setOid, t
//
//
// a/b can be nil; a=nil means addition, b=nil means deletion.
// a/b can be nil; a=nil means addition, b=nil means deletion.
//
//
//
// δtrack is trackSet δ that needs to be applied to trackSet to keep it
// δtrack is trackSet δ that needs to be applied to trackSet to keep it
// consistent with b (= a + δ).
// consistent with b (= a + δ).
//
//
...
@@ -834,7 +835,6 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
...
@@ -834,7 +835,6 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
// both δ and δ2 has [k] - it can be that key
// both δ and δ2 has [k] - it can be that key
// entry migrated from one bucket into another.
// entry migrated from one bucket into another.
// XXX also handle ø->ø + ø->c i.e. [k] was hole and become value
if
!
(
(
δv1
.
New
==
VDEL
&&
δv2
.
Old
==
VDEL
)
||
if
!
(
(
δv1
.
New
==
VDEL
&&
δv2
.
Old
==
VDEL
)
||
(
δv1
.
Old
==
VDEL
&&
δv2
.
New
==
VDEL
)
)
{
(
δv1
.
Old
==
VDEL
&&
δv2
.
New
==
VDEL
)
)
{
return
fmt
.
Errorf
(
"BUG or btree corrupt: [%v] has "
+
return
fmt
.
Errorf
(
"BUG or btree corrupt: [%v] has "
+
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment