subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1662917 - in /subversion/branches/1.9.x: ./ build/run_tests.py subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java subversion/include/svn_version.h subversion/tests/cmdline/svntest/main.py
Date Sat, 28 Feb 2015 10:44:41 GMT
Author: brane
Date: Sat Feb 28 10:44:40 2015
New Revision: 1662917

URL: http://svn.apache.org/r1662917
Log:
On the 1.9.x branch: Reverse-merge r1660548 from trunk to adjust the
version number back to 1.9.0-dev. This fixes fallout from r1662916.

* subversion/include/svn_version.h: Decrement minor version number.

* subversion/tests/cmdline/svntest/main.py (SVN_VER_MINOR),
  build/run_tests.py (SVN_VER_MINOR):
    Decrement minor version number.

* subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
  (NativeResources.init): Decrement required library minor version.

Modified:
    subversion/branches/1.9.x/   (props changed)
    subversion/branches/1.9.x/build/run_tests.py
    subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
    subversion/branches/1.9.x/subversion/include/svn_version.h
    subversion/branches/1.9.x/subversion/tests/cmdline/svntest/main.py

Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 28 10:44:40 2015
@@ -89,4 +89,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1662901
+/subversion/trunk:1660545-1660547,1660549-1662901

Modified: subversion/branches/1.9.x/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/build/run_tests.py?rev=1662917&r1=1662916&r2=1662917&view=diff
==============================================================================
--- subversion/branches/1.9.x/build/run_tests.py (original)
+++ subversion/branches/1.9.x/build/run_tests.py Sat Feb 28 10:44:40 2015
@@ -45,7 +45,7 @@ separated list of test numbers; the defa
 '''
 
 # A few useful constants
-SVN_VER_MINOR = 10
+SVN_VER_MINOR = 9
 
 import os, re, subprocess, sys, imp, threading, traceback, exceptions
 from datetime import datetime

Modified: subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java?rev=1662917&r1=1662916&r2=1662917&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
(original)
+++ subversion/branches/1.9.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
Sat Feb 28 10:44:40 2015
@@ -142,10 +142,10 @@ public class NativeResources
     private static final void init()
     {
         version = new Version();
-        if (!version.isAtLeast(1, 10, 0))
+        if (!version.isAtLeast(1, 9, 0))
         {
             throw new LinkageError("Native library version must be at least " +
-                                   "1.10.0, but is only " + version);
+                                   "1.9.0, but is only " + version);
         }
 
         runtimeVersion = new RuntimeVersion();

Modified: subversion/branches/1.9.x/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/svn_version.h?rev=1662917&r1=1662916&r2=1662917&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/svn_version.h (original)
+++ subversion/branches/1.9.x/subversion/include/svn_version.h Sat Feb 28 10:44:40 2015
@@ -61,7 +61,7 @@ extern "C" {
  * Modify when new functionality is added or new interfaces are
  * defined, but all changes are backward compatible.
  */
-#define SVN_VER_MINOR      10
+#define SVN_VER_MINOR      9
 
 /**
  * Patch number.

Modified: subversion/branches/1.9.x/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/tests/cmdline/svntest/main.py?rev=1662917&r1=1662916&r2=1662917&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/1.9.x/subversion/tests/cmdline/svntest/main.py Sat Feb 28 10:44:40
2015
@@ -54,7 +54,7 @@ import svntest
 from svntest import Failure
 from svntest import Skip
 
-SVN_VER_MINOR = 10
+SVN_VER_MINOR = 9
 
 ######################################################################
 #



Mime
View raw message