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 2013/01/11 21:03:05 UTC

svn commit: r1432255 - /subversion/trunk/subversion/libsvn_wc/merge.c

Author: julianfoad
Date: Fri Jan 11 20:03:05 2013
New Revision: 1432255

URL: http://svn.apache.org/viewvc?rev=1432255&view=rev
Log:
* subversion/libsvn_wc/merge.c
  (svn_wc_merge5): Tweak comments.

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

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1432255&r1=1432254&r2=1432255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Fri Jan 11 20:03:05 2013
@@ -1299,6 +1299,8 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
       actual_props = apr_hash_make(scratch_pool);
   }
 
+  /* Merge the properties, if requested.  We merge the properties first
+   * because the properties can affect the text (EOL style, keywords). */
   if (merge_props_outcome)
     {
       int i;
@@ -1328,7 +1330,7 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
                                   scratch_pool, scratch_pool));
     }
 
-  /* Queue all the work.  */
+  /* Merge the text. */
   SVN_ERR(svn_wc__internal_merge(&work_items,
                                  &conflict_skel,
                                  merge_content_outcome,