svn commit: r928926 - /subversion/trunk/notes/wc-ng/conflict-storage

[gs...@apache.org]

Author: gstein
Date: Mon Mar 29 22:37:51 2010
New Revision: 928926

URL: http://svn.apache.org/viewvc?rev=928926&view=rev
Log:
In r928900, I dropped a bit at the top about obstructions. Put that back,
fix up the count of conflict types, and put a stake in the ground for an
obstruction conflict skel.

* notes/wc-ng/conflict-storage: fix up the "obstructed" conflict kind.

Modified:
    subversion/trunk/notes/wc-ng/conflict-storage

Modified: subversion/trunk/notes/wc-ng/conflict-storage
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/wc-ng/conflict-storage?rev=928926&r1=928925&r2=928926&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/conflict-storage (original)
+++ subversion/trunk/notes/wc-ng/conflict-storage Mon Mar 29 22:37:51 2010
@@ -7,14 +7,16 @@ Conflict meta data is stored in the ACTU
 'conflict_data' column. The data in this column is a skel containing
 conflict information, or NULL (meaning no conflict is present).
 
-There are 4 types of conflicts (text conflicts, property conflicts,
-tree conflicts, patch conflicts). The conflict skel has the form:
+There are five types of conflicts (text conflicts, property conflicts,
+tree conflicts, patch conflicts, and obstructions). The conflict skel
+has the form:
 
   (COMMON (KIND KIND-SPECIFIC) (KIND KIND-SPECIFIC) ...)
 
-where KIND is one of "text", "prop", "tree", or "patch". KIND-SPECIFIC
-is specific to each KIND, and is detailed below. The COMMON skel
-contains data that is common to all KINDs, and is detailed below.
+where KIND is one of "text", "prop", "tree", "patch", or
+"obstructed". KIND-SPECIFIC is specific to each KIND, and is detailed
+below. The COMMON skel contains data that is common to all KINDs, and
+is detailed below.
 
 ### need conflict data format version info inside skel, too?
 ### or do we bump the entire wc.db format number if we need to tweak
@@ -37,6 +39,7 @@ equivalent in wc-ng conflict storage (su
 but this information can be deduced from the information stored
 (e.g. conflict-old and friends; foo.r42 is now 'foo' + '.r' + left_rev)
 
+
 Terminology
 --------------------
 
@@ -98,6 +101,7 @@ version of the item.
 {LEFT,RIGHT}_PEG_REV is the peg revision of the {left,right} version
 of the item.
 
+
 Text conflicts
 --------------
 
@@ -170,15 +174,14 @@ content can be obtained from the pristin
 (Unversioned) Obstructions
 --------------------------
 
-When an update introduces a new node where an existing node is
+When an update introduces a new node where an existing unversioned node is
 stored locally we need to add some marker to allow the operation to update
 the BASE_NODE table.
 
-### BH: I don't think we need specific data here; just a boolean?
-### It is always a conflict between the IN-WC data and the local WC.
-###
-### gstein sez: maybe KIND == "obstructed" ? thus, a skel such as:
-###   ("obstructed")
+There is no particular data which needs to be recorded for an
+obstruction. Thus, the "obstructed" conflict skel has the form:
+
+  ("obstructed")
 
 
 Patch conflicts (a.k.a. "rejects")