.

wcfs/δbtail.go

@@ -436,7 +436,7 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid) (δ map[Key]Value, err
 	defer xerr.Contextf(&err, "diffT %s %s", xidOf(a), xidOf(b))
 
 	if (a != nil && b != nil) && (a.POid() != b.POid()) {
-		panic("different trees")
+		panic("different trees")	// XXX wrong - tree object can be changed completely
 	}
 
 	var av []TreeEntry
@@ -474,6 +474,7 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid) (δ map[Key]Value, err
 
 	for child := range allChildren { // XXX -> sorted?
 		// add/del/modify, but child is not tracked - ignore
+		// XXX correct only in children from a? (b could have changed childeren to new objects)
 		if !δZTC.Has(child) {
 			continue
 		}
@@ -502,6 +503,15 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid) (δ map[Key]Value, err
 			}
 		}
 
+		// merge Tkdel <- δc
+		for k, v := range δc {
+			if v == VDEL {
+				Tkdel.Add(k)
+			} else {
+				delete(Tkdel, k)
+			}
+		}
+
 		// XXX process keys from δ outside of already tracked nodes
 		// XXX only deleted keys - no - delete can be from untracked
 		// node and on tracked it is seen as addition
@@ -517,7 +527,7 @@ func diffB(ctx context.Context, a, b *Bucket) (δ map[Key]Value, err error) {
 	defer xerr.Contextf(&err, "diffB %s %s", xidOf(a), xidOf(b))
 	// XXX oid can be InvalidOid for T/B... (i.e. B is part of T and is not yet committed separately)
 	if (a != nil && b != nil) && (a.POid() != b.POid()) {
-		panic("different buckets")
+		panic("different buckets") // XXX wrong - bucket object can be changed completely
 	}