subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1358113 - /subversion/trunk/subversion/svn/file-merge.c
Date Fri, 06 Jul 2012 10:53:25 GMT
Author: stsp
Date: Fri Jul  6 10:53:25 2012
New Revision: 1358113

URL: http://svn.apache.org/viewvc?rev=1358113&view=rev
Log:
* subversion/svn/file-merge.c
  (merge_chunks): If launching the editor fails, stay within the merge tool
   prompt rather than dropping back to the interactive conflict prompt.

Modified:
    subversion/trunk/subversion/svn/file-merge.c

Modified: subversion/trunk/subversion/svn/file-merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1358113&r1=1358112&r2=1358113&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Fri Jul  6 10:53:25 2012
@@ -578,12 +578,16 @@ merge_chunks(apr_array_header_t **merged
         {
           SVN_ERR(edit_chunk(merged_chunk, chunk1, editor_cmd, config,
                              result_pool, iterpool));
+          if (*merged_chunk == NULL)
+            continue;
           break;
         }
       else if (strcmp(answer, "e2") == 0)
         {
           SVN_ERR(edit_chunk(merged_chunk, chunk2, editor_cmd, config,
                              result_pool, iterpool));
+          if (*merged_chunk == NULL)
+            continue;
           break;
         }
       else if (strcmp(answer, "eb") == 0)
@@ -594,6 +598,8 @@ merge_chunks(apr_array_header_t **merged
                                                               scratch_pool);
           SVN_ERR(edit_chunk(merged_chunk, conflict_chunk, editor_cmd, config,
                              result_pool, iterpool));
+          if (*merged_chunk == NULL)
+            continue;
           break;
         }
     }



Mime
View raw message