subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1544739 - in /subversion/branches/1.8.x: ./ STATUS subversion/svn/status-cmd.c
Date Sat, 23 Nov 2013 04:02:58 GMT
Author: svn-role
Date: Sat Nov 23 04:02:58 2013
New Revision: 1544739

URL: http://svn.apache.org/r1544739
Log:
Merge r1543145 from trunk:

 * r1543145
   Properly end the list of errors we want to handle as warnings in svn's
   status handling. Without this patch we read invalid stack locations
   until we find a NULL.
   Justification:
     Regression since 1.8.
     https://bugzilla.redhat.com/show_bug.cgi?id=985582#c5
     (And the report from astieger on irc)
   Votes:
     +1: rhuijben, stsp, brane

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/svn/status-cmd.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1543145

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1544739&r1=1544738&r2=1544739&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Nov 23 04:02:58 2013
@@ -207,14 +207,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1543145
-   Properly end the list of errors we want to handle as warnings in svn's
-   status handling. Without this patch we read invalid stack locations
-   until we find a NULL.
-   Justification:
-     Regression since 1.8.
-     https://bugzilla.redhat.com/show_bug.cgi?id=985582#c5
-     (And the report from astieger on irc)
-   Votes:
-     +1: rhuijben, stsp, brane

Modified: subversion/branches/1.8.x/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/status-cmd.c?rev=1544739&r1=1544738&r2=1544739&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/status-cmd.c (original)
+++ subversion/branches/1.8.x/subversion/svn/status-cmd.c Sat Nov 23 04:02:58 2013
@@ -358,7 +358,8 @@ svn_cl__status(apr_getopt_t *os,
                           NULL, opt_state->quiet,
                           /* not versioned: */
                           SVN_ERR_WC_NOT_WORKING_COPY,
-                          SVN_ERR_WC_PATH_NOT_FOUND));
+                          SVN_ERR_WC_PATH_NOT_FOUND,
+                          SVN_NO_ERROR));
 
       if (opt_state->xml)
         SVN_ERR(print_finish_target_xml(repos_rev, iterpool));



Mime
View raw message