subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1428661 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 03 Jan 2013 22:59:32 GMT
Author: julianfoad
Date: Thu Jan  3 22:59:32 2013
New Revision: 1428661

URL: http://svn.apache.org/viewvc?rev=1428661&view=rev
Log:
* subversion/libsvn_client/merge.c
  (prepare_merge_props_changed): Move a comment which has seemed out of
place since r846481 (at which time this code was in diff.c).

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1428661&r1=1428660&r2=1428661&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jan  3 22:59:32 2013
@@ -1268,6 +1268,8 @@ prepare_merge_props_changed(const apr_ar
 
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
 
+  /* We only want to merge "regular" version properties:  by
+     definition, 'svn merge' shouldn't touch any data within .svn/  */
   SVN_ERR(svn_categorize_props(propchanges, NULL, NULL, &props,
                                result_pool));
 
@@ -1292,8 +1294,6 @@ prepare_merge_props_changed(const apr_ar
       props = mergeinfo_props;
     }
 
-  /* We only want to merge "regular" version properties:  by
-     definition, 'svn merge' shouldn't touch any data within .svn/  */
   if (props->nelts)
     {
       /* If this is a forward merge then don't add new mergeinfo to



Mime
View raw message