Commit 550bf54b authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 6fb9e716
......@@ -1010,23 +1010,23 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
δv := ΔValue{}
switch {
// XXX
// x -> ø | ø -> x
// ø -> ø
case δv2.Old == VDEL && δv2.New == VDEL: // δv2 == hole
δv = δv1
// ø -> ø
// XXX
// y -> ø | ø -> y
case δv1.Old == VDEL && δv1.New == VDEL: // δv1 == hole
δv = δv2
// ø -> x -> y->x
// ø -> x -> y->x
// y -> ø
case δv2.New == VDEL:
δv.Old = δv2.Old
δv.New = δv1.New
// x -> ø -> x->y
// x -> ø -> x->y
// ø -> y
default:
δ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