subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1748189 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Mon, 13 Jun 2016 12:11:17 GMT
Author: stsp
Date: Mon Jun 13 12:11:17 2016
New Revision: 1748189

URL: http://svn.apache.org/viewvc?rev=1748189&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (svn_wc__guess_incoming_move_target_node): Return something even if all
   common ancestors are the empty string (longest_ancestor_len is initially 0).

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

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1748189&r1=1748188&r2=1748189&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Jun 13 12:11:17 2016
@@ -3755,7 +3755,7 @@ svn_wc__guess_incoming_move_target_node(
                                                          victim_abspath,
                                                          iterpool);
       ancestor_len = strlen(ancestor_abspath);
-      if (ancestor_len > longest_ancestor_len)
+      if (ancestor_len >= longest_ancestor_len)
         {
           longest_ancestor_len = ancestor_len;
 



Mime
View raw message