svn commit: r1727719 - /subversion/trunk/subversion/libsvn_client/resolved.c

[stsp]

Author: stsp
Date: Sat Jan 30 16:20:46 2016
New Revision: 1727719

URL: http://svn.apache.org/viewvc?rev=1727719&view=rev
Log:
* subversion/libsvn_client/resolved.c
  (resolve_conflict): Plug an error leak.

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

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1727719&r1=1727718&r2=1727719&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Sat Jan 30 16:20:46 
2016
@@ -712,6 +712,8 @@ resolve_conflict(svn_client_conflict_opt
                                                                  
scratch_pool));
   svn_io_sleep_for_timestamps(local_abspath, scratch_pool);
 
+  SVN_ERR(err);
+
   return SVN_NO_ERROR;
 }