subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1357435 - /subversion/trunk/subversion/svn/merge-cmd.c
Date Wed, 04 Jul 2012 22:40:54 GMT
Author: rhuijben
Date: Wed Jul  4 22:40:53 2012
New Revision: 1357435

URL: http://svn.apache.org/viewvc?rev=1357435&view=rev
Log:
* subversion/svn/merge-cmd.c
  (svn_cl__merge): Resolve possible error leak.

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

Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1357435&r1=1357434&r2=1357435&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Wed Jul  4 22:40:53 2012
@@ -517,7 +517,7 @@ svn_cl__merge(apr_getopt_t *os,
           SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING)
         {
           err = svn_error_quick_wrap(
-            merge_err,
+            svn_error_compose_create(merge_err, err),
             _("Merge tracking not possible, use --ignore-ancestry or\n"
               "fix invalid mergeinfo in target with 'svn propset'"));
         }



Mime
View raw message