subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1667691 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Thu, 19 Mar 2015 10:21:58 GMT
Author: stsp
Date: Thu Mar 19 10:21:57 2015
New Revision: 1667691

URL: http://svn.apache.org/r1667691
Log:
Replace an assertion which is triggerable from the conflict resolver
with a proper error message.

* subversion/libsvn_wc/conflicts.c
  (build_text_conflict_resolve_items): If no path to install from was found
   raise an error explaining the problem instead of asserting.

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=1667691&r1=1667690&r2=1667691&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Mar 19 10:21:57 2015
@@ -1669,7 +1669,13 @@ build_text_conflict_resolve_items(svn_sk
         SVN_ERR_ASSERT(choice == svn_wc_conflict_choose_postpone);
     }
 
-  SVN_ERR_ASSERT(install_from_abspath != NULL);
+  if (install_from_abspath == NULL)
+    return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
+                             _("Conflict on '%s' could not be resolved "
+                               "because the chosen version of the file "
+                               "is not available."),
+                             svn_dirent_local_style(local_abspath,
+                                                    scratch_pool));
 
   /* ### It would be nice if we could somehow pass RECORD_FILEINFO
          as true in some easy cases. */



Mime
View raw message