svn commit: r1366368 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

[rh...@apache.org]

Author: rhuijben
Date: Fri Jul 27 12:37:29 2012
New Revision: 1366368

URL: http://svn.apache.org/viewvc?rev=1366368&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Extend comment.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1366368&r1=1366367&r2=1366368&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Jul 27 12:37:29 2012
@@ -2290,7 +2290,14 @@ resolve_conflict_on_node(svn_boolean_t *
       /* We currently handle *_conflict as *_full as this argument is currently
          always applied for all conflicts on a node at the same time. Giving
          an error would break some tests that assumed that this would just
-         resolve property conflicts to working */
+         resolve property conflicts to working.
+
+         An alternative way to handle these conflicts would be to just copy all
+         property state from mine/theirs on the _full option instead of just the
+         conflicted properties. In some ways this feels like a sensible option as
+         that would take both properties and text from mine/theirs, but when not
+         both properties and text are conflicted we would fail in doing so.
+       */
       switch (conflict_choice)
         {
         case svn_wc_conflict_choose_base: