subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1851914 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Wed, 23 Jan 2019 13:44:59 GMT
Author: stsp
Date: Wed Jan 23 13:44:59 2019
New Revision: 1851914

URL: http://svn.apache.org/viewvc?rev=1851914&view=rev
Log:
Follow-up to r1851913:

*  subversion/libsvn_client/conflicts.c
   (resolve_both_moved_dir_merge): Fix docstring of this function.

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1851914&r1=1851913&r2=1851914&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Jan 23 13:44:59 2019
@@ -8998,9 +8998,8 @@ unlock_wc:
 }
 
 /* Implements conflict_option_resolve_func_t.
- * Resolve an incoming move vs local move conflict by merging from the
- * incoming move's target location to the local move's target location,
- * overriding the incoming move. */
+ * Resolve an incoming move vs local move conflict by moving the locally moved
+ * directory to the incoming move target location, and then merging changes. */
 static svn_error_t *
 resolve_both_moved_dir_merge(svn_client_conflict_option_t *option,
                              svn_client_conflict_t *conflict,



Mime
View raw message