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

[rh...@apache.org]

Author: rhuijben
Date: Thu Feb 21 08:48:10 2013
New Revision: 1448547

URL: http://svn.apache.org/r1448547
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_text_conflict_on_node,
   resolve_prop_conflict_on_node): Add note on the status of conflict markers.

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=1448547&r1=1448546&r2=1448547&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Feb 21 08:48:10 2013
@@ -2311,6 +2311,12 @@ svn_wc__read_conflicts(const apr_array_h
  * to TRUE.  Otherwise, don't change *REMOVED_REJECT_FILES.
  *
  * It is an error if there is no text conflict.
+ *
+ * Note: When there are no conflict markers to remove there is no existing
+ * text conflict; just a database containing old information, which we should
+ * remove to avoid checking all the time. Resolving a text conflict by
+ * removing all the marker files is a fully supported scenario since
+ * Subversion 1.0.
  */
 static svn_error_t *
 resolve_text_conflict_on_node(svn_boolean_t *removed_reject_files,
@@ -2474,6 +2480,14 @@ resolve_text_conflict_on_node(svn_boolea
  *
  * It is an error if there is no prop conflict.
  *
+ * Note: When there are no conflict markers on-disk to remove there is
+ * no existing text conflict (unless we are still in the process of
+ * creating the text conflict and we didn't register a marker file yet).
+ * In this case the database contains old information, which we should
+ * remove to avoid checking the next time. Resolving a property conflict
+ * by just removing the marker file is a fully supported scenario since
+ * Subversion 1.0.
+ *
  * ### TODO [JAF] The '*_full' and '*_conflict' choices should differ.
  *     In my opinion, 'mine_full'/'theirs_full' should select
  *     the entire set of properties from 'mine' or 'theirs' respectively,