subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1441257 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 31 Jan 2013 23:23:25 GMT
Author: rhuijben
Date: Thu Jan 31 23:23:25 2013
New Revision: 1441257

URL: http://svn.apache.org/viewvc?rev=1441257&view=rev
Log:
* subversion/libsvn_client/merge.c
  (notify_merge_begin): Following up on r1441232, fix string comparison
    to make the code work as documented.

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=1441257&r1=1441256&r2=1441257&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jan 31 23:23:25 2013
@@ -3361,6 +3361,7 @@ notify_merge_begin(merge_cmd_baton_t *me
   if (merge_b->merge_source.ancestral
       && ! merge_b->is_single_file_merge)
     {
+      const svn_client__merge_path_t *child;
       /* Find NOTIFY->PATH's nearest ancestor in
          NOTIFY->CHILDREN_WITH_MERGEINFO.  Normally we consider a child in
          NOTIFY->CHILDREN_WITH_MERGEINFO representing PATH to be an
@@ -3376,14 +3377,17 @@ notify_merge_begin(merge_cmd_baton_t *me
            --- Merging rX into 'PARENT'
            D    PARENT/CHILD
       */
-      const svn_client__merge_path_t *child
-        = find_nearest_ancestor(
-            merge_b->children_with_mergeinfo,
-            ! delete_action,
-            local_abspath);
+
+      child = find_nearest_ancestor(merge_b->children_with_mergeinfo,
+                                    ! delete_action, local_abspath);
+
+      assert(child != NULL); /* Should always find the merge anchor */
+
+      if (! child)
+        return SVN_NO_ERROR;
 
       if (merge_b->cur_ancestor_abspath != NULL
-          && strcmp(child->abspath, merge_b->cur_ancestor_abspath))
+          && strcmp(child->abspath, merge_b->cur_ancestor_abspath) == 0)
         {
           /* Don't notify the same merge again */
           return SVN_NO_ERROR;



Mime
View raw message