subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1295702 - in /subversion/branches/1.7.x: ./ STATUS subversion/svn/log-cmd.c
Date Thu, 01 Mar 2012 17:46:26 GMT
Author: stsp
Date: Thu Mar  1 17:46:25 2012
New Revision: 1295702

URL: http://svn.apache.org/viewvc?rev=1295702&view=rev
Log:
Reintegrate the 1.7.x-log-diff branch.

 * r1295671
   Fix ordering of "svn log --diff" output on Windows.
   Branch:
     ^/subversion/branches/1.7.x-log-diff
   Notes:
     Untried on Windows, doesn't break Linux.
   Votes:
     +1: philip, stsp
     +1: danielsh (r1220783 would be nice, but harder to backport)

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

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 17:46:25 2012
@@ -12,6 +12,7 @@
 /subversion/branches/1.7.x-issue4102:1292401-1295402
 /subversion/branches/1.7.x-issue4123:1293358-1293812
 /subversion/branches/1.7.x-issue4k:1166502-1167193
+/subversion/branches/1.7.x-log-diff:1295670-1295699
 /subversion/branches/1.7.x-neon-default:1148803-1158680
 /subversion/branches/1.7.x-r1152189:1152759-1154249
 /subversion/branches/1.7.x-r1155160:1158704-1159223

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1295702&r1=1295701&r2=1295702&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Mar  1 17:46:25 2012
@@ -97,13 +97,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1295671
-   Fix ordering of "svn log --diff" output on Windows.
-   Branch:
-     ^/subversion/branches/1.7.x-log-diff
-   Notes:
-     Untried on Windows, doesn't break Linux.
-   Votes:
-     +1: philip, stsp
-     +1: danielsh (r1220783 would be nice, but harder to backport)

Modified: subversion/branches/1.7.x/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svn/log-cmd.c?rev=1295702&r1=1295701&r2=1295702&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svn/log-cmd.c (original)
+++ subversion/branches/1.7.x/subversion/svn/log-cmd.c Thu Mar  1 17:46:25 2012
@@ -303,6 +303,7 @@ log_entry_receiver(void *baton,
       end_revision.value.number = log_entry->revision;
 
       SVN_ERR(svn_cmdline_printf(pool, _("\n")));
+      SVN_ERR(svn_cmdline_fflush(stdout));
       SVN_ERR(svn_client_diff_peg5(diff_options,
                                    lb->target_path_or_url,
                                    &lb->target_peg_revision,



Mime
View raw message