You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/03/12 11:01:26 UTC
svn commit: r922195 - /subversion/trunk/subversion/libsvn_subr/mergeinfo.c
Author: julianfoad
Date: Fri Mar 12 10:01:26 2010
New Revision: 922195
URL: http://svn.apache.org/viewvc?rev=922195&view=rev
Log:
* subversion/libsvn_subr/mergeinfo.c
(intersection_type_t): Tweak comments.
Modified:
subversion/trunk/subversion/libsvn_subr/mergeinfo.c
Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=922195&r1=922194&r2=922195&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Fri Mar 12 10:01:26 2010
@@ -115,10 +115,10 @@ parse_pathname(const char **input,
return SVN_NO_ERROR;
}
-/* Ways in which two svn_merge_range_t can intersect, if at all. */
+/* Ways in which two svn_merge_range_t can intersect or adjoin, if at all. */
typedef enum
{
- /* Ranges don't intersect. */
+ /* Ranges don't intersect and don't adjoin. */
svn__no_intersection,
/* Ranges are equal. */
@@ -127,7 +127,7 @@ typedef enum
/* Ranges adjoin but don't overlap. */
svn__adjoining_intersection,
- /* Ranges overalp but neither is a subset of the other. */
+ /* Ranges overlap but neither is a subset of the other. */
svn__overlapping_intersection,
/* One range is a proper subset of the other. */