subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1544028 - in /subversion/branches/1.8.x: ./ STATUS subversion/svn/svn.c
Date Thu, 21 Nov 2013 04:02:55 GMT
Author: svn-role
Date: Thu Nov 21 04:02:55 2013
New Revision: 1544028

URL: http://svn.apache.org/r1544028
Log:
Merge the r1499470 group from trunk:

 * r1499470, r1543413
   Flush stdout before exiting svn with an error.
   Justification:
      Without this patch merge_tests.py 135 may fail to output its required
      output.
   Votes:
     +1: ivan (without r1543413)
     +1: rhuijben, stsp, pburba

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/svn/svn.c   (contents, props changed)

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1499470,1543413

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1544028&r1=1544027&r2=1544028&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Nov 21 04:02:55 2013
@@ -201,12 +201,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1499470, r1543413
-   Flush stdout before exiting svn with an error.
-   Justification:
-      Without this patch merge_tests.py 135 may fail to output its required
-      output.
-   Votes:
-     +1: ivan (without r1543413)
-     +1: rhuijben, stsp, pburba

Modified: subversion/branches/1.8.x/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/svn.c?rev=1544028&r1=1544027&r2=1544028&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.8.x/subversion/svn/svn.c Thu Nov 21 04:02:55 2013
@@ -2939,6 +2939,10 @@ sub_main(int argc, const char *argv[], a
                          "Subversion"));
         }
 
+      /* Ensure that stdout is flushed, so the user will see any write errors.
+         This makes sure that output is not silently lost. */
+      err = svn_error_compose_create(err, svn_cmdline_fflush(stdout));
+
       return EXIT_ERROR(err);
     }
   else

Propchange: subversion/branches/1.8.x/subversion/svn/svn.c
------------------------------------------------------------------------------
  Merged /subversion/trunk/subversion/svn/svn.c:r1499470,1543413



Mime
View raw message