Author: danielsh Date: Thu Jul 28 00:17:28 2011 New Revision: 1151686 URL: http://svn.apache.org/viewvc?rev=1151686&view=rev Log: On the revprop-packing branch, merge r1151672 and r1151680 from trunk, dquote> using a 1.7.0-beta1 client.
Modified: subversion/branches/revprop-packing/ (props changed) subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py Propchange: subversion/branches/revprop-packing/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 28 00:17:28 2011 @@ -52,4 +52,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1143817-1148765 +/subversion/trunk:1143817-1148765,1151672,1151680 Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py?rev=1151686&r1=1151685&r2=1151686&view=diff ============================================================================== --- subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py Thu Jul 28 00:17:28 2011 @@ -1521,7 +1521,7 @@ def _create_parser(): # most of the defaults are None, but some are other values, set them here parser.set_defaults( - server_minor_version=7, + server_minor_version=float('+inf'), # positive infinity url=file_scheme_prefix + pathname2url(os.path.abspath(os.getcwd())), http_library=_default_http_library) @@ -1545,7 +1545,8 @@ def _parse_options(arglist=sys.argv[1:]) # If you change the below condition then change # ../../../../build/run_tests.py too. - if options.server_minor_version < 3 or options.server_minor_version > 7: + if (options.server_minor_version < 3 or options.server_minor_version > 7) \ + and options.server_minor_version != float('inf'): parser.error("test harness only supports server minor versions 3-7") if options.url: