Skip to content

W
wendelin.core
Commit 6fb9e716 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent 76499288
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
wcfs/δbtail.go
View file @ 6fb9e716
...@@ -1020,13 +1020,13 @@ func δMerge(δ, δ2 map[Key]ΔValue) error { ...@@ -1020,13 +1020,13 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
case δv1.Old == VDEL && δv1.New == VDEL: // δv1 == hole case δv1.Old == VDEL && δv1.New == VDEL: // δv1 == hole
δv = δv2 δv = δv2
// ø -> x // ø -> x -> y->x
// y -> ø // y -> ø
case δv2.New == VDEL: case δv2.New == VDEL:
δv.Old = δv2.Old δv.Old = δv2.Old
δv.New = δv1.New δv.New = δv1.New
// x -> ø // x -> ø -> x->y
// ø -> y // ø -> y
default: default:
δv.Old = δv1.Old δv.Old = δv1.Old
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7