svn commit: r1355121 - in /subversion/trunk: notes/wc-ng/conflict-storage-2.0 subversion/libsvn_wc/conflicts.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Jun 28 19:23:29 2012
New Revision: 1355121

URL: http://svn.apache.org/viewvc?rev=1355121&view=rev
Log:
Following up on r1355114, apply some simple documentation changes.

* notes/wc-ng/conflict-storage-2.0
  (WHY): Document new corner case.
  (Property Conflicts): Document additional data, necessary for compatibility.
    Remove gstein's comment as I think I answered these two questions now.

* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_skel_add_prop_conflict): Update skel documentation.

Modified:
    subversion/trunk/notes/wc-ng/conflict-storage-2.0
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/notes/wc-ng/conflict-storage-2.0
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/wc-ng/conflict-storage-2.0?rev=1355121&r1=1355120&r2=1355121&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/conflict-storage-2.0 (original)
+++ subversion/trunk/notes/wc-ng/conflict-storage-2.0 Thu Jun 28 19:23:29 2012
@@ -79,7 +79,8 @@ this format in a future version if we wa
 
 "update" and "switch" will have 1 PATH_REV item, containing the original BASE
 path from before the update/switch. The new location is already available in
-BASE so doesn't have to be duplicated.
+BASE so doesn't have to be duplicated. If the node is an addition the empty
+list is used.
 
 Merge will have 2 items: the left and right paths. These can come from a
 different repository.
@@ -139,7 +140,11 @@ Property Conflicts
 ------------------
   
 Property conflicts are initially described as
-  ("prop" MARKERS (PROPS-OLD PROPS-NEW PROPS_WORKING) ...)
+  ("prop" MARKERS PROP-NAMES
+   ORIGINAL-PROPS MINE-PROPS ORIGINAL-THEIRS THEIRS ...)
+
+PROP-NAMES is a list of conflicted/not-resolved properties.
+*-PROPS are (key value) property mapping lists.
 
 This simple model extends the wc-1.0 model to allow the same conflict
 resolving as for text conflicts. All the options 'base', 'working',
@@ -159,12 +164,6 @@ independently once this is implemented.
 The --accept options already provide a lot of additional value and the
 WHY model would allow access to the specific sets by URL.
 
-### gs: there are FOUR values of interest w.r.t property conflicts.
-###     and each of these may be missing to designate the property
-###     does not exist. see 'conflict-storage'.
-
-### gs: the property name needs to be stored. again, see 'conflict-storage'
-
 
 Tree Conflicts
 --------------

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1355121&r1=1355120&r2=1355121&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Jun 28 19:23:29 2012
@@ -285,6 +285,7 @@ svn_wc__conflict_skel_add_prop_conflict(
       prop-conflicted_prop_names
       original-props
       mine-props
+      original-their-props
       their-props)
      NULL lists are recorded as "" */