Commit 1af926c6 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent b2b0b6c1
...@@ -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 " +
......
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