svn commit: r1357566 - /subversion/trunk/subversion/svn/merge-cmd.c

[st...@apache.org]

Author: stsp
Date: Thu Jul  5 11:48:37 2012
New Revision: 1357566

URL: http://svn.apache.org/viewvc?rev=1357566&view=rev
Log:
Follow-up to r1357363:
* subversion/svn/merge-cmd.c
  (svn_cl__merge): Handle errors returned from reintegrate merges.
   Fixes test failures due to abort() because of leaked errors.

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=1357566&r1=1357565&r2=1357566&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Thu Jul  5 11:48:37 2012
@@ -521,7 +521,7 @@ svn_cl__merge(apr_getopt_t *os,
             _("Merge tracking not possible, use --ignore-ancestry or\n"
               "fix invalid mergeinfo in target with 'svn propset'"));
         }
-      else if (! opt_state->reintegrate)
+      else
         {
           err = svn_error_compose_create(merge_err, err);
           return svn_cl__may_need_force(err);