Hi Brian,
On Sun, 28 Aug 2016, brian m. carlson wrote:
> assert(!"Invalid existing change recorded");
> } else {
> - hashcpy(mp->obj, obj);
> - hashcpy(mp->base, p->one->oid.hash);
> - hashcpy(mp->local, uninitialized);
> - hashcpy(mp->remote, p->two->oid.hash);
> + hashcpy(mp->obj.hash, obj);
> + oidcpy(&mp->base, &p->one->oid);
> + hashcpy(mp->local.hash, uninitialized);
> + oidcpy(&mp->remote, &p->two->oid);
> len++;
This puzzled me at first, and a little bit of digging revealed that obj
is a local variable and uninitialized is a file-local variable. I would
have thought that these would be converted to object_id's, too...
I guess that's left for later?
Ciao,
Dscho