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
79719a61
Commit
79719a61
authored
Jun 24, 2020
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
334b2148
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
wcfs/δbtail.go
wcfs/δbtail.go
+10
-2
No files found.
wcfs/δbtail.go
View file @
79719a61
...
@@ -1008,10 +1008,18 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
...
@@ -1008,10 +1008,18 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
}
}
δv
:=
ΔValue
{}
δv
:=
ΔValue
{}
if
δv2
.
New
==
VDEL
{
switch
{
case
δv2
.
Old
==
VDEL
&&
δv2
.
New
==
VDEL
:
// δv2 == hole
δv
=
δv1
case
δv1
.
Old
==
VDEL
&&
δv1
.
New
==
VDEL
:
// δv1 == hole
δv
=
δv2
case
δv2
.
New
==
VDEL
:
δv
.
Old
=
δv2
.
Old
δv
.
Old
=
δv2
.
Old
δv
.
New
=
δv1
.
New
δv
.
New
=
δv1
.
New
}
else
{
default
:
δv
.
Old
=
δv1
.
Old
δv
.
Old
=
δv1
.
Old
δv
.
New
=
δv2
.
New
δv
.
New
=
δv2
.
New
}
}
...
...
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