[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: allowing multiple conflicts in storage

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Tue, 30 Mar 2010 17:56:54 +0100

> Conflict meta data storage in wc-ng
> ===================================
> Conflict meta data is stored in the ACTUAL_NODE table, within the
> 'conflict_data' column. The data in this column is a skel containing
> conflict information, or NULL (meaning no conflict is present).

Is storing a record in ACTUAL OK even for a node that (apart from the
conflict descripition) has no BASE and no ACTUAL in the WC? E.g.
because it wasn't there and an incoming delete cause a tree conflict.
What values would the rest of the ACTUAL_NODE columns have in this case?

> There are five types of conflicts (text conflicts, property conflicts,
> tree conflicts, patch conflicts, and obstructions).

Whoa. A patch can cause a text conflict and/or (in the future) property
conflicts and/or a tree conflict and/or an obstruction. I don't think
it is right to call "patch conflict" in the same space as those others.
A patch is a potential *source* of the change that conflicts, not a kind
of conflict. Sources of a conflict are:

That's all for now.

- Julian
Received on 2010-03-30 18:57:28 CEST

This is an archived mail posted to the Subversion Dev mailing list.