subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1348798 - in /subversion/branches/ev2-export: ./ subversion/libsvn_subr/pool.c subversion/tests/cmdline/blame_tests.py
Date Mon, 11 Jun 2012 11:13:15 GMT
Author: hwright
Date: Mon Jun 11 11:13:14 2012
New Revision: 1348798

URL: http://svn.apache.org/viewvc?rev=1348798&view=rev
Log:
On the ev2-export branch:
Bring up-to-date with trunk, thus fixing the last current test failure.

Modified:
    subversion/branches/ev2-export/   (props changed)
    subversion/branches/ev2-export/subversion/libsvn_subr/pool.c
    subversion/branches/ev2-export/subversion/tests/cmdline/blame_tests.py

Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1348742-1348782

Modified: subversion/branches/ev2-export/subversion/libsvn_subr/pool.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_subr/pool.c?rev=1348798&r1=1348797&r2=1348798&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_subr/pool.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_subr/pool.c Mon Jun 11 11:13:14 2012
@@ -53,6 +53,7 @@ abort_on_pool_failure(int retcode)
      And we don't have any of it... */
   printf("Out of memory - terminating application.\n");
   abort();
+  return 0; /* not reached */
 }
 
 

Modified: subversion/branches/ev2-export/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/cmdline/blame_tests.py?rev=1348798&r1=1348797&r2=1348798&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/branches/ev2-export/subversion/tests/cmdline/blame_tests.py Mon Jun 11 11:13:14
2012
@@ -333,6 +333,7 @@ def blame_eol_styles(sbox):
 
   # do the test for each eol-style
   for eol in ['CR', 'LF', 'CRLF', 'native']:
+    svntest.main.run_svn(None, 'propdel', 'svn:eol-style', file_path)
     svntest.main.file_write(file_path, "This is no longer the file 'iota'.\n")
 
     for i in range(1,3):



Mime
View raw message