You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ds...@apache.org on 2021/02/05 11:05:07 UTC
svn commit: r1886227 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: dsahlberg
Date: Fri Feb 5 11:05:07 2021
New Revision: 1886227
URL: http://svn.apache.org/viewvc?rev=1886227&view=rev
Log:
Improve readability of comment added in r1880192, see
http://mail-archives.apache.org/mod_mbox/subversion-dev/202102.mbox/%3cCAMHy98PKmqg-DQXA8t3U7Z4iYnoPGiiHsjeJZ+qXFDeWmJUA-A@mail.gmail.com%3e
* subversion/libsvn_client/merge.c
(process_children_with_new_mergeinfo): Doc fix only
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=1886227&r1=1886226&r2=1886227&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Feb 5 11:05:07 2021
@@ -7921,8 +7921,8 @@ process_children_with_new_mergeinfo(merg
if (!merge_b->paths_with_new_mergeinfo || merge_b->dry_run)
return SVN_NO_ERROR;
- /* Iterate over each path with explicit mergeinfo added by the merge. */
- /* Iterate over the paths in a parent-to-child order so that inherited
+ /* Iterate over each path with explicit mergeinfo added by the merge.
+ * Iterate in a parent-to-child order so that inherited
* mergeinfo is propagated consistently from each parent path to its
* children. (Issue #4862) */
a = svn_sort__hash(merge_b->paths_with_new_mergeinfo,