Commit 79719a61 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 334b2148
...@@ -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
} }
......
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