Re: [Monotone-devel] resolving name conflicts; implementation

[Stephen Leake]

Stephen Leake <address@hidden> writes:

> This is now failing:
>
> 371 resolve_duplicate_name_conflict               FAIL (line 109)
>
> This is because I changed the way suture ancestor node ids are
> handled, and it broke something somewhere. I need to rethink how
> suture ancestor information is stored; the current code and docs are
> not consistent.

I found the immediate cause of this failure.

There are two formats for "changes to rosters" stored in the database;
changesets and roster_deltas.

I'm not clear why we have both.

Changesets are defined by cset.hh struct cset; I added sutures to that
to get the ancestors right.

roster_deltas are defined by roster_delta.cc struct roster_delta_t. I
need to add sutures to that.

These two pieces of code are very similar; perhaps we can merge them
someday.

-- 
-- Stephe