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

[st...@apache.org]

Author: stsp
Date: Wed Mar 31 12:50:00 2010
New Revision: 929512

URL: http://svn.apache.org/viewvc?rev=929512&view=rev
Log:
* notes/wc-ng/conflict-storage: "Patch" conflicts are called "reject"
   conflicts now.

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=929512&r1=929511&r2=929512&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/conflict-storage (original)
+++ subversion/trunk/notes/wc-ng/conflict-storage Wed Mar 31 12:50:00 2010
@@ -8,15 +8,15 @@ Conflict meta data is stored in the ACTU
 conflict information, or NULL (meaning no conflict is present).
 
 There are five types of conflicts (text conflicts, property conflicts,
-tree conflicts, patch conflicts, and obstructions). The conflict skel
+tree conflicts, reject conflicts, and obstructions). The conflict skel
 has the form:
 
   ((KIND OPERATION KIND-SPECIFIC) (KIND OPERATION KIND-SPECIFIC) ...)
 
-where KIND is one of "text", "prop", "tree", "patch", or
-"obstructed". OPERATION indicates the operation which caused
-the conflict and is detailed below. KIND-SPECIFIC is specific
-to each KIND, and is detailed below.
+where KIND is one of "text", "prop", "tree", "reject", or "obstructed".
+OPERATION indicates the operation which caused the conflict and is
+detailed below. KIND-SPECIFIC is specific to each KIND, and is detailed
+below.
 
 ### stsp: need conflict data format version info inside skel, too?
 ###   or do we bump the entire wc.db format number if we need to tweak