   parent_relpath  TEXT,
   
   /* what kind of node is this? may be "unknown" if the node is not present */
-  kind  TEXT NOT NULL,
+  node_kind  TEXT NOT NULL,
+
+  /* what sort of conflict are we describing? */
+  conflict_kind  TEXT NOT NULL,
 
   /* the name of the property in conflict, or NULL */
   property_name  TEXT,

  work  BLOB NOT NULL
  );

CREATE TABLE TREE_CONFLICT_VICTIM (
  /* specifies the location of this node in the local filesystem */
  wc_id  INTEGER NOT NULL,
  local_relpath  TEXT NOT NULL,

  PRIMARY KEY (wc_id, local_relpath)
  );

CREATE INDEX I_TCPARENT ON CONFLICT_VICTIM (wc_id, parent_relpath);


/* We cannot directly remove columns, so we use a temporary table instead. */
