You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2012/08/13 15:28:11 UTC
svn commit: r1372418 - in /subversion/branches/master-passphrase: ./ build/
build/ac-macros/ build/generator/ build/generator/templates/ subversion/
subversion/include/ subversion/libsvn_subr/ subversion/svn/
subversion/svnadmin/ subversion/svndumpfilt...
Author: cmpilato
Date: Mon Aug 13 13:28:09 2012
New Revision: 1372418
URL: http://svn.apache.org/viewvc?rev=1372418&view=rev
Log:
On the 'master-passphrase' branch: sync with recent trunk changes.
(Merged /subversion/trunk:r1370242-1372417.)
Added:
subversion/branches/master-passphrase/build/ac-macros/macosx.m4
- copied unchanged from r1372417, subversion/trunk/build/ac-macros/macosx.m4
subversion/branches/master-passphrase/build/transform_config_hw.py
- copied unchanged from r1372417, subversion/trunk/build/transform_config_hw.py
subversion/branches/master-passphrase/subversion/libsvn_subr/sysinfo.c
- copied unchanged from r1372417, subversion/trunk/subversion/libsvn_subr/sysinfo.c
subversion/branches/master-passphrase/subversion/libsvn_subr/sysinfo.h
- copied unchanged from r1372417, subversion/trunk/subversion/libsvn_subr/sysinfo.h
Modified:
subversion/branches/master-passphrase/ (props changed)
subversion/branches/master-passphrase/CHANGES
subversion/branches/master-passphrase/INSTALL
subversion/branches/master-passphrase/aclocal.m4
subversion/branches/master-passphrase/build.conf
subversion/branches/master-passphrase/build/generator/gen_vcnet_vcproj.py
subversion/branches/master-passphrase/build/generator/gen_win.py
subversion/branches/master-passphrase/build/generator/templates/serf.vcproj.ezt
subversion/branches/master-passphrase/build/generator/templates/serf.vcxproj.ezt
subversion/branches/master-passphrase/build/generator/templates/svn_config.vcproj.ezt
subversion/branches/master-passphrase/build/generator/templates/svn_config.vcxproj.ezt
subversion/branches/master-passphrase/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/master-passphrase/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/master-passphrase/configure.ac
subversion/branches/master-passphrase/gen-make.py
subversion/branches/master-passphrase/subversion/include/svn_opt.h
subversion/branches/master-passphrase/subversion/libsvn_subr/deprecated.c
subversion/branches/master-passphrase/subversion/libsvn_subr/opt.c
subversion/branches/master-passphrase/subversion/libsvn_subr/opt.h
subversion/branches/master-passphrase/subversion/svn/help-cmd.c
subversion/branches/master-passphrase/subversion/svn/main.c
subversion/branches/master-passphrase/subversion/svn_private_config.hw
subversion/branches/master-passphrase/subversion/svnadmin/main.c
subversion/branches/master-passphrase/subversion/svndumpfilter/main.c
subversion/branches/master-passphrase/subversion/svnlook/main.c
subversion/branches/master-passphrase/subversion/svnmucc/svnmucc.c
subversion/branches/master-passphrase/subversion/svnrdump/svnrdump.c
subversion/branches/master-passphrase/subversion/svnserve/main.c
subversion/branches/master-passphrase/subversion/svnsync/main.c
subversion/branches/master-passphrase/subversion/svnversion/main.c
subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tests.py
subversion/branches/master-passphrase/subversion/tests/cmdline/prop_tests.py
subversion/branches/master-passphrase/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/master-passphrase/tools/dev/svnraisetreeconflict/main.c
subversion/branches/master-passphrase/tools/server-side/svn-rep-sharing-stats.c
Propchange: subversion/branches/master-passphrase/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1370242-1372417
Modified: subversion/branches/master-passphrase/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/CHANGES?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/CHANGES (original)
+++ subversion/branches/master-passphrase/CHANGES Mon Aug 13 13:28:09 2012
@@ -27,6 +27,7 @@ http://svn.apache.org/repos/asf/subversi
* 'svn mergeinfo' now honors the --revision (-r) option (issue #4199)
* new --search and --isearch options for 'svn log' (r1354666, -830)
* new built-in interactive text conflict merge tool (r1357864, et al)
+ * new 'svn --version --verbose' option shows runtime environment info
- Client-side bugfixes:
*
@@ -49,7 +50,7 @@ http://svn.apache.org/repos/asf/subversi
Version 1.7.6
-(XX YYY 2012, from /branches/1.7.x)
+(15 Aug 2012, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.6
User-visible changes:
@@ -73,6 +74,7 @@ http://svn.apache.org/repos/asf/subversi
* fix ra_serf XML namespace handling against malicious server (r1337441)
* fix relocate with server-relative externals (issue 4216)
* change two asserts into errors for TortoiseSVN (r1368128, r1368065)
+ * don't attempt to anchor an operation outside a wc root (r1361341)
- Server-side bugfixes:
* partial sync drops properties when converting to adds (issue #4184)
@@ -81,6 +83,7 @@ http://svn.apache.org/repos/asf/subversi
* make FSFS revision files independent of APR hash order (r1367498)
- Other tool improvements and bugfixes:
+ * move mod_dontdothat to install-tools (r1307177)
Developer-visible changes:
- General:
Modified: subversion/branches/master-passphrase/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/INSTALL?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/INSTALL (original)
+++ subversion/branches/master-passphrase/INSTALL Mon Aug 13 13:28:09 2012
@@ -807,7 +807,7 @@ II. INSTALLATION
* Python 2.5 or higher, downloaded from http://www.python.org/ which is
used to generate the project files.
* Perl 5.8 or higher from http://www.activestate.com/
- * Awk (from http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe) is
+ * Awk (from http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
needed to compile Apache or APR. Note that this is the actual awk
program, not an installer - just rename it to awk.exe and it is
ready to use.
Modified: subversion/branches/master-passphrase/aclocal.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/aclocal.m4?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/aclocal.m4 (original)
+++ subversion/branches/master-passphrase/aclocal.m4 Mon Aug 13 13:28:09 2012
@@ -46,6 +46,7 @@ sinclude(build/ac-macros/sqlite.m4)
sinclude(build/ac-macros/swig.m4)
sinclude(build/ac-macros/zlib.m4)
sinclude(build/ac-macros/kwallet.m4)
+sinclude(build/ac-macros/macosx.m4)
# Include the libtool macros
sinclude(build/libtool.m4)
Modified: subversion/branches/master-passphrase/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build.conf?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build.conf (original)
+++ subversion/branches/master-passphrase/build.conf Mon Aug 13 13:28:09 2012
@@ -296,7 +296,8 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_subr
libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic
-msvc-libs = advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib
+msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
+ crypt32.lib version.lib psapi.lib
msvc-export =
svn_auth.h svn_base64.h svn_cache_config.h svn_checksum.h svn_cmdline.h
svn_compat.h svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h
Modified: subversion/branches/master-passphrase/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/generator/gen_vcnet_vcproj.py?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/master-passphrase/build/generator/gen_vcnet_vcproj.py Mon Aug 13 13:28:09 2012
@@ -138,14 +138,14 @@ class Generator(gen_win.WinGeneratorBase
key=lambda t: t[0]):
sql.append(_eztdata(header=hdrfile.replace('/', '\\'),
source=sqlfile[0].replace('/', '\\'),
- dependencies=[x.replace('/', '\\') for x in sqlfile[1:]],
- svn_python=sys.executable))
+ dependencies=[x.replace('/', '\\') for x in sqlfile[1:]]))
# apr doesn't supply vcproj files, the user must convert them
# manually before loading the generated solution
self.move_proj_file(self.projfilesdir,
'svn_config' + self.vcproj_extension,
(
+ ('svn_python', sys.executable),
('sql', sql),
('project_guid', self.makeguid('__CONFIG__')),
)
Modified: subversion/branches/master-passphrase/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/generator/gen_win.py?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/generator/gen_win.py (original)
+++ subversion/branches/master-passphrase/build/generator/gen_win.py Mon Aug 13 13:28:09 2012
@@ -94,6 +94,7 @@ class GeneratorBase(gen_base.GeneratorBa
# Instrumentation options
self.disable_shared = None
self.static_apr = None
+ self.static_openssl = None
self.instrument_apr_pools = None
self.instrument_purify_quantify = None
self.configure_apr_util = None
@@ -155,6 +156,8 @@ class GeneratorBase(gen_base.GeneratorBa
self.disable_shared = 1
elif opt == '--with-static-apr':
self.static_apr = 1
+ elif opt == '--with-static-openssl':
+ self.static_openssl = 1
elif opt == '--vsnet-version':
if val == '2002' or re.match('7(\.\d+)?', val):
self.vs_version = '2002'
@@ -962,7 +965,11 @@ class WinGeneratorBase(GeneratorBase):
def get_win_lib_dirs(self, target, cfg):
"Return the list of library directories for target"
- libcfg = cfg.replace("Debug", "LibD").replace("Release", "LibR")
+ expatlibcfg = cfg.replace("Debug", "LibD").replace("Release", "LibR")
+ if self.static_apr:
+ libcfg = expatlibcfg
+ else:
+ libcfg = cfg
fakelibdirs = [ self.apath(self.bdb_path, "lib"),
self.apath(self.zlib_path),
@@ -976,10 +983,10 @@ class WinGeneratorBase(GeneratorBase):
if self.serf_lib:
fakelibdirs.append(self.apath(msvc_path_join(self.serf_path, cfg)))
- fakelibdirs.append(self.apath(self.apr_path, cfg))
- fakelibdirs.append(self.apath(self.apr_util_path, cfg))
+ fakelibdirs.append(self.apath(self.apr_path, libcfg))
+ fakelibdirs.append(self.apath(self.apr_util_path, libcfg))
fakelibdirs.append(self.apath(self.apr_util_path, 'xml', 'expat',
- 'lib', libcfg))
+ 'lib', expatlibcfg))
if isinstance(target, gen_base.TargetApacheMod):
fakelibdirs.append(self.apath(self.httpd_path, cfg))
@@ -1160,6 +1167,8 @@ class WinGeneratorBase(GeneratorBase):
else:
serflib = 'serf.lib'
+ apr_static = self.static_apr and 'APR_STATIC=1' or ''
+ openssl_static = self.static_openssl and 'OPENSSL_STATIC=1' or ''
self.move_proj_file(self.serf_path, name,
(('serf_sources', serf_sources),
('serf_headers', serf_headers),
@@ -1172,7 +1181,8 @@ class WinGeneratorBase(GeneratorBase):
('apr_util_path', os.path.relpath(self.apr_util_path,
self.serf_path)),
('project_guid', self.makeguid('serf')),
- ('apr_static', self.static_apr),
+ ('apr_static', apr_static),
+ ('openssl_static', openssl_static),
('serf_lib', serflib),
))
Modified: subversion/branches/master-passphrase/build/generator/templates/serf.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/generator/templates/serf.vcproj.ezt?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/generator/templates/serf.vcproj.ezt (original)
+++ subversion/branches/master-passphrase/build/generator/templates/serf.vcproj.ezt Mon Aug 13 13:28:09 2012
@@ -40,9 +40,9 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
+ ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
+ CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
Output="$(OutDir)\[serf_lib]"/>
</Configuration>
<Configuration
@@ -56,9 +56,9 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCNMakeTool"
- BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
+ ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
+ CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]"
Output="$(OutDir)\[serf_lib]"/>
</Configuration>
[end] </Configurations>
Modified: subversion/branches/master-passphrase/build/generator/templates/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/generator/templates/serf.vcxproj.ezt?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/generator/templates/serf.vcxproj.ezt (original)
+++ subversion/branches/master-passphrase/build/generator/templates/serf.vcxproj.ezt Mon Aug 13 13:28:09 2012
@@ -46,9 +46,9 @@
<PropertyGroup>
[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[configs]</IntDir>
- <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
+ <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [apr_static] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path] [openssl_static][end]</NMakeCleanCommandLine>
<NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\[serf_lib]</NMakeOutput>
[end][end] </PropertyGroup>
<ItemDefinitionGroup>
Modified: subversion/branches/master-passphrase/build/generator/templates/svn_config.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/generator/templates/svn_config.vcproj.ezt?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/generator/templates/svn_config.vcproj.ezt (original)
+++ subversion/branches/master-passphrase/build/generator/templates/svn_config.vcproj.ezt Mon Aug 13 13:28:09 2012
@@ -33,7 +33,7 @@
Name="[configs]|[platforms]"
OutputDirectory="."
BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
- IntermediateDirectory="..\..\$(ConfigurationName)"
+ IntermediateDirectory="..\..\..\[configs]"
ConfigurationType="10"
UseOfMFC="0"
DeleteExtensionsOnClean="*.obj;*.ilk;*.pdb;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;$(TargetPath)"
@@ -53,7 +53,7 @@
</Configurations>
<Files>
<File
- RelativePath="..\..\subversion\svn_private_config.h">
+ RelativePath="$(IntDir)\svn_private_config.h">
[for platforms][for configs] <FileConfiguration
Name="[configs]|[platforms]"
ExcludedFromBuild="TRUE">
@@ -62,25 +62,33 @@
</FileConfiguration>
[end][end] </File>
<File
- RelativePath="..\..\subversion\svn_private_config.hw">
+ RelativePath="..\..\..\subversion\svn_private_config.hw">
[for platforms][for configs] <FileConfiguration
Name="[configs]|[platforms]">
<Tool
Name="VCCustomBuildTool"
Description="Creating svn_private_config.h from svn_private_config.hw."
- CommandLine="copy ..\..\..\subversion\svn_private_config.hw ..\..\..\subversion\svn_private_config.h > nul
-"
- Outputs="..\..\subversion\svn_private_config.h"/>
+ CommandLine=""[svn_python]" "$(SolutionDir)\build\transform_config_hw.py" [platforms] "$(InputPath)" "$(IntDir)\svn_private_config.h""
+ Outputs="$(IntDir)\svn_private_config.h"/>
</FileConfiguration>
[end][end] </File>
[for sql] <File
+ RelativePath="$(SolutionDir)\[sql.header]">
+[for platforms][for configs] <FileConfiguration
+ Name="[configs]|[platforms]"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+[end][end] </File>
+ <File
RelativePath="../../../[sql.source]">
[for platforms][for configs] <FileConfiguration
Name="[configs]|[platforms]">
<Tool
Name="VCCustomBuildTool"
Description="Generating [sql.header]"
- CommandLine=""[sql.svn_python]" "$(SolutionDir)\build\transform_sql.py" "$(InputPath)" "$(SolutionDir)\[sql.header]""
+ CommandLine=""[svn_python]" "$(SolutionDir)\build\transform_sql.py" "$(InputPath)" "$(SolutionDir)\[sql.header]""
AdditionalDependencies="[for sql.dependencies]$(SolutionDir)\[sql.dependencies];[end]"
Outputs="$(SolutionDir)\[sql.header]"
/>
@@ -91,4 +99,3 @@
<Globals>
</Globals>
</VisualStudioProject>
-
Modified: subversion/branches/master-passphrase/build/generator/templates/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/generator/templates/svn_config.vcxproj.ezt?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/branches/master-passphrase/build/generator/templates/svn_config.vcxproj.ezt Mon Aug 13 13:28:09 2012
@@ -46,10 +46,10 @@
[end][end] <PropertyGroup Label="UserMacros" />
<PropertyGroup>
[for configs][for platforms] <OutDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">.\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\$(Configuration)\</IntDir>
[end][end] </PropertyGroup>
<ItemGroup>
- <CustomBuild Include="$(SolutionDir)\subversion\svn_private_config.h">
+ <CustomBuild Include="$(IntDir)svn_private_config.h">
[for configs][for platforms] <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">true</ExcludedFromBuild>
[end][end] </CustomBuild>
</ItemGroup>
@@ -57,13 +57,16 @@
<CustomBuild Include="$(SolutionDir)\subversion\svn_private_config.hw">
<FileType>Document</FileType>
[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Creating svn_private_config.h from svn_private_config.hw.</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">copy $(SolutionDir)\subversion\svn_private_config.hw $(SolutionDir)\subversion\svn_private_config.h > nul:</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\subversion\svn_private_config.h;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[svn_python]" "$(SolutionDir)\build\transform_config_hw.py" $(Platform) "%(FullPath)" "$(IntDir)svn_private_config.h"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(IntDir)svn_private_config.h;%(Outputs)</Outputs>
[end][end] </CustomBuild>
-[for sql] <CustomBuild Include="$(SolutionDir)\[sql.source]">
+[for sql] <CustomBuild Include="$(SolutionDir)\[sql.header]">
+[for configs][for platforms] <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">true</ExcludedFromBuild>
+[end][end] </CustomBuild>
+ <CustomBuild Include="$(SolutionDir)\[sql.source]">
<FileType>Document</FileType>
[for configs][for platforms] <Message Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">Generating [sql.header].</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[sql.svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"[svn_python]" "$(SolutionDir)\build\transform_sql.py" "%(FullPath)" "$(SolutionDir)\[sql.header]"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(SolutionDir)\[sql.header];%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">[for sql.dependencies]$(SolutionDir)\[sql.dependencies];[end]%(AdditionalInputs)</AdditionalInputs>
[end][end]
Modified: subversion/branches/master-passphrase/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/generator/templates/vcnet_vcproj.ezt?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/master-passphrase/build/generator/templates/vcnet_vcproj.ezt Mon Aug 13 13:28:09 2012
@@ -45,7 +45,7 @@
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
-[end] AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
+[end] AdditionalIncludeDirectories="..\..\..\[configs.name];[for includes][includes][if-index includes last][else];[end][end]"
PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
[is configs.name "Debug"] MinimalRebuild="TRUE"
RuntimeLibrary="3"
Modified: subversion/branches/master-passphrase/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/generator/templates/vcnet_vcxproj.ezt?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/master-passphrase/build/generator/templates/vcnet_vcxproj.ezt Mon Aug 13 13:28:09 2012
@@ -57,7 +57,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<StringPooling>true</StringPooling>
-[end] <AdditionalIncludeDirectories>[for includes][includes];[end]%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+[end] <AdditionalIncludeDirectories>$(SolutionDir)[configs.name];[for includes][includes];[end];%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines];[end]%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Modified: subversion/branches/master-passphrase/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/configure.ac?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/configure.ac (original)
+++ subversion/branches/master-passphrase/configure.ac Mon Aug 13 13:28:09 2012
@@ -146,7 +146,9 @@ SVN_FIND_APACHE(20020903)
dnl Search for SQLite
SQLITE_MINIMUM_VER="3.7.12"
SQLITE_RECOMMENDED_VER="3.7.12"
-SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER}.tar.gz"
+SQLITE_RECOMMENDED_VER_URL="3071200"
+SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER_URL}.zip"
+
SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
${SQLITE_URL})
@@ -477,43 +479,10 @@ if test "$svn_lib_sasl" = "yes"; then
[Defined if Cyrus SASL v2 is present on the system])
fi
-dnl Mac OS KeyChain -------------------
-
-AC_ARG_ENABLE(keychain,
- AS_HELP_STRING([--disable-keychain],
- [Disable use of Mac OS KeyChain for auth credentials]),
- [enable_keychain=$enableval],[enable_keychain=yes])
-
-AC_MSG_CHECKING([for Mac OS KeyChain Services])
-
-if test "$enable_keychain" = "yes"; then
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <AvailabilityMacros.h>
-#if !DARWIN || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2)
-#error KeyChain API unavailable.
-#endif]], [[]])],[],[enable_keychain=no])
-fi
-
-if test "$enable_keychain" = "yes"; then
- dnl ### Hack. We should only need to pass the -framework options when
- dnl linking libsvn_subr, since it is the only library that uses Keychain.
- dnl
- dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for
- dnl OS X frameworks like it does for normal libraries, so we need to
- dnl explicitly pass the option to all the users of libsvn_subr to allow
- dnl static builds to link successfully.
- dnl
- dnl This does mean that all executables we link will be linked directly
- dnl to these frameworks - even when building shared libraries - but that
- dnl shouldn't cause any problems.
- LIBS="$LIBS -framework Security"
- LIBS="$LIBS -framework CoreFoundation"
- LIBS="$LIBS -framework CoreServices"
- AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabled?])
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
+dnl Mac OS soecufuc features -------------------
+SVN_LIB_MACOS_PLIST
+SVN_LIB_MACOS_KEYCHAIN
dnl APR_HAS_DSO -------------------
@@ -699,13 +668,23 @@ if test "$enable_nls" = "yes"; then
fi
fi
-AH_BOTTOM(
+AH_BOTTOM([
+/* Indicate to translators that string X should be translated. Do not look
+ up the translation at run time; just expand to X. This macro is suitable
+ for use where a constant string is required at compile time. */
#define N_(x) x
+/* Indicate to translators that we have decided the string X should not be
+ translated. Expand to X. */
#define U_(x) x
#ifdef ENABLE_NLS
#include <locale.h>
#include <libintl.h>
+/* Indicate to translators that string X should be translated. At run time,
+ look up and return the translation of X. */
#define _(x) dgettext(PACKAGE_NAME, x)
+/* Indicate to translators that strings X1 and X2 are singular and plural
+ forms of the same message, and should be translated. At run time, return
+ an appropriate translation depending on the number N. */
#define Q_(x1, x2, n) dngettext(PACKAGE_NAME, x1, x2, n)
#else
#define _(x) (x)
@@ -713,7 +692,7 @@ AH_BOTTOM(
#define gettext(x) (x)
#define dgettext(domain, x) (x)
#endif
-)
+])
dnl Used to simulate makefile conditionals.
GETTEXT_CODESET=\#
@@ -877,6 +856,8 @@ AC_FUNC_VPRINTF
dnl check for functions needed in special file handling
AC_CHECK_FUNCS(symlink readlink)
+dnl check for uname
+AC_CHECK_HEADERS(sys/utsname.h, [AC_CHECK_FUNCS(uname)], [])
dnl Process some configuration options ----------
Modified: subversion/branches/master-passphrase/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/gen-make.py?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/gen-make.py (original)
+++ subversion/branches/master-passphrase/gen-make.py Mon Aug 13 13:28:09 2012
@@ -204,6 +204,9 @@ def _usage_exit(err=None):
print(" --with-static-apr")
print(" Use static apr and apr-util")
print("")
+ print(" --with-static-openssl")
+ print(" Use static openssl")
+ print("")
print(" --vsnet-version=VER")
print(" generate for VS.NET version VER (2002, 2003, 2005, 2008, 2010 or 2012)")
print(" [only valid in combination with '-t vcproj']")
@@ -248,6 +251,7 @@ if __name__ == '__main__':
'with-sasl=',
'with-apr_memcache=',
'with-static-apr',
+ 'with-static-openssl',
'enable-pool-debug',
'enable-purify',
'enable-quantify',
Modified: subversion/branches/master-passphrase/subversion/include/svn_opt.h
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/include/svn_opt.h?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/include/svn_opt.h (original)
+++ subversion/branches/master-passphrase/subversion/include/svn_opt.h Mon Aug 13 13:28:09 2012
@@ -680,7 +680,8 @@ svn_opt_parse_path(svn_opt_revision_t *r
* Else, if @a print_version is TRUE, then print version info, in
* brief form if @a quiet is also TRUE; if @a quiet is FALSE, then if
* @a version_footer is non-NULL, print it following the version
- * information.
+ * information. If @a verbose is TRUE, also print information about
+ * the running system and loaded shared libraries, where available.
*
* Else, if @a os is not @c NULL and does not contain arguments, print
* generic help, via svn_opt_print_generic_help2() with the @a header,
@@ -695,8 +696,30 @@ svn_opt_parse_path(svn_opt_revision_t *r
* --version flag *and* subcommand arguments on a help command line.
* The logic for handling such a situation should be in one place.
*
- * @since New in 1.5.
+ * @since New in 1.8.
*/
+
+svn_error_t *
+svn_opt_print_help4(apr_getopt_t *os,
+ const char *pgm_name,
+ svn_boolean_t print_version,
+ svn_boolean_t quiet,
+ svn_boolean_t verbose,
+ const char *version_footer,
+ const char *header,
+ const svn_opt_subcommand_desc2_t *cmd_table,
+ const apr_getopt_option_t *option_table,
+ const int *global_options,
+ const char *footer,
+ apr_pool_t *pool);
+
+/**
+ * Same as svn_opt_print_help4(), but with @a verbose always @c FALSE.
+ *
+ * @deprecated Provided for backward compatibility with the 1.7 API.
+ */
+
+SVN_DEPRECATED
svn_error_t *
svn_opt_print_help3(apr_getopt_t *os,
const char *pgm_name,
Modified: subversion/branches/master-passphrase/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/libsvn_subr/deprecated.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/master-passphrase/subversion/libsvn_subr/deprecated.c Mon Aug 13 13:28:09 2012
@@ -524,6 +524,33 @@ svn_opt_args_to_target_array(apr_array_h
}
svn_error_t *
+svn_opt_print_help3(apr_getopt_t *os,
+ const char *pgm_name,
+ svn_boolean_t print_version,
+ svn_boolean_t quiet,
+ const char *version_footer,
+ const char *header,
+ const svn_opt_subcommand_desc2_t *cmd_table,
+ const apr_getopt_option_t *option_table,
+ const int *global_options,
+ const char *footer,
+ apr_pool_t *pool)
+{
+ return svn_error_trace(svn_opt_print_help4(os,
+ pgm_name,
+ print_version,
+ quiet,
+ FALSE,
+ version_footer,
+ header,
+ cmd_table,
+ option_table,
+ global_options,
+ footer,
+ pool));
+}
+
+svn_error_t *
svn_opt_print_help2(apr_getopt_t *os,
const char *pgm_name,
svn_boolean_t print_version,
@@ -535,10 +562,11 @@ svn_opt_print_help2(apr_getopt_t *os,
const char *footer,
apr_pool_t *pool)
{
- return svn_error_trace(svn_opt_print_help3(os,
+ return svn_error_trace(svn_opt_print_help4(os,
pgm_name,
print_version,
quiet,
+ FALSE,
version_footer,
header,
cmd_table,
@@ -576,8 +604,8 @@ svn_opt_print_help(apr_getopt_t *os,
}
}
else if (print_version) /* just --version */
- SVN_ERR(svn_opt__print_version_info(pgm_name, version_footer, quiet,
- pool));
+ SVN_ERR(svn_opt__print_version_info(pgm_name, version_footer,
+ quiet, FALSE, pool));
else if (os && !targets->nelts) /* `-h', `--help', or `help' */
svn_opt_print_generic_help(header,
cmd_table,
Modified: subversion/branches/master-passphrase/subversion/libsvn_subr/opt.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/libsvn_subr/opt.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/libsvn_subr/opt.c (original)
+++ subversion/branches/master-passphrase/subversion/libsvn_subr/opt.c Mon Aug 13 13:28:09 2012
@@ -49,6 +49,7 @@
#include "private/svn_opt_private.h"
#include "opt.h"
+#include "sysinfo.h"
#include "svn_private_config.h"
@@ -1105,6 +1106,7 @@ svn_error_t *
svn_opt__print_version_info(const char *pgm_name,
const char *footer,
svn_boolean_t quiet,
+ svn_boolean_t verbose,
apr_pool_t *pool)
{
if (quiet)
@@ -1128,15 +1130,38 @@ svn_opt__print_version_info(const char *
SVN_ERR(svn_cmdline_printf(pool, "%s\n", footer));
}
+ if (verbose)
+ {
+ const char *const host = svn_sysinfo__canonical_host(pool);
+ const char *const relname = svn_sysinfo__release_name(pool);
+ const char *const dlibs = svn_sysinfo__loaded_libs(pool);
+
+ SVN_ERR(svn_cmdline_fputs(_("System information:\n\n"), stdout, pool));
+ if (relname)
+ SVN_ERR(svn_cmdline_printf(pool, _("* running on %s\n"
+ " - %s\n"),
+ host, relname));
+ else
+ SVN_ERR(svn_cmdline_printf(pool, _("* running on %s\n"), host));
+
+ if (dlibs)
+ {
+ SVN_ERR(svn_cmdline_fputs(_("* loaded shared libraries:\n"),
+ stdout, pool));
+ SVN_ERR(svn_cmdline_fputs(dlibs, stdout, pool));
+ }
+ }
+
return SVN_NO_ERROR;
}
svn_error_t *
-svn_opt_print_help3(apr_getopt_t *os,
+svn_opt_print_help4(apr_getopt_t *os,
const char *pgm_name,
svn_boolean_t print_version,
svn_boolean_t quiet,
+ svn_boolean_t verbose,
const char *version_footer,
const char *header,
const svn_opt_subcommand_desc2_t *cmd_table,
@@ -1162,8 +1187,8 @@ svn_opt_print_help3(apr_getopt_t *os,
}
}
else if (print_version) /* just --version */
- SVN_ERR(svn_opt__print_version_info(pgm_name, version_footer, quiet,
- pool));
+ SVN_ERR(svn_opt__print_version_info(pgm_name, version_footer,
+ quiet, verbose, pool));
else if (os && !targets->nelts) /* `-h', `--help', or `help' */
svn_opt_print_generic_help2(header,
cmd_table,
Modified: subversion/branches/master-passphrase/subversion/libsvn_subr/opt.h
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/libsvn_subr/opt.h?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/libsvn_subr/opt.h (original)
+++ subversion/branches/master-passphrase/subversion/libsvn_subr/opt.h Mon Aug 13 13:28:09 2012
@@ -33,7 +33,7 @@ extern "C" {
/* Print version info for PGM_NAME. If QUIET is true, print in
* brief. Else if QUIET is not true, print the version more
* verbosely, and if FOOTER is non-null, print it following the
- * version information.
+ * version information. If VERBOSE is true, print running system info.
*
* Use POOL for temporary allocations.
*/
@@ -41,6 +41,7 @@ svn_error_t *
svn_opt__print_version_info(const char *pgm_name,
const char *footer,
svn_boolean_t quiet,
+ svn_boolean_t verbose,
apr_pool_t *pool);
#ifdef __cplusplus
Modified: subversion/branches/master-passphrase/subversion/svn/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svn/help-cmd.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svn/help-cmd.c (original)
+++ subversion/branches/master-passphrase/subversion/svn/help-cmd.c Mon Aug 13 13:28:09 2012
@@ -79,10 +79,11 @@ svn_cl__help(apr_getopt_t *os,
version_footer = svn_stringbuf_create(ra_desc_start, pool);
SVN_ERR(svn_ra_print_modules(version_footer, pool));
- return svn_opt_print_help3(os,
+ return svn_opt_print_help4(os,
"svn", /* ### erm, derive somehow? */
opt_state ? opt_state->version : FALSE,
opt_state ? opt_state->quiet : FALSE,
+ opt_state ? opt_state->verbose : FALSE,
version_footer->data,
help_header, /* already gettext()'d */
svn_cl__cmd_table,
Modified: subversion/branches/master-passphrase/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svn/main.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svn/main.c (original)
+++ subversion/branches/master-passphrase/subversion/svn/main.c Mon Aug 13 13:28:09 2012
@@ -313,7 +313,7 @@ const apr_getopt_option_t svn_cl__option
" "
"('merged', 'eligible')")},
{"reintegrate", opt_reintegrate, 0,
- N_("merge a branch back into its parent branch")},
+ N_("deprecated")},
{"strip", opt_strip, 1,
N_("number of leading path components to strip from\n"
" "
@@ -735,22 +735,16 @@ const svn_opt_subcommand_desc2_t svn_cl_
" (the 'sync' merge)\n"
" 2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
" (the 'cherry-pick' merge)\n"
-" 3. merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
-" (the 'reintegrate' merge)\n"
-" 4. merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
+" 3. merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
" (the '2-URL' merge)\n"
"\n"
-" 1. This form is called a 'sync' (or 'catch-up') merge:\n"
+" 1. This form, with one source path and no revision range:\n"
"\n"
" svn merge SOURCE[@REV] [TARGET_WCPATH]\n"
"\n"
-" A sync merge is used to fetch all the latest changes made on a parent\n"
-" branch. In other words, the target branch has originally been created\n"
-" by copying the source branch, and any changes committed on the source\n"
-" branch since branching are applied to the target branch. This uses\n"
-" merge tracking to skip all those revisions that have already been\n"
-" merged, so a sync merge can be repeated periodically to stay up-to-\n"
-" date with the source branch.\n"
+" finds all the changes on the source branch that have not already been\n"
+" merged to the target branch, and merges them. Merge tracking is used\n"
+" to know which changes have already been merged.\n"
"\n"
" SOURCE specifies the branch from where the changes will be pulled, and\n"
" TARGET_WCPATH specifies a working copy of the target branch to which\n"
@@ -766,22 +760,44 @@ const svn_opt_subcommand_desc2_t svn_cl_
" used, and the default value of 'REV' is the base revision (usually the\n"
" revision last updated to).\n"
"\n"
-" TARGET_WCPATH is a working copy path; if omitted, '.' is assumed.\n"
+" TARGET_WCPATH is a working copy path; if omitted, '.' is assumed. In\n"
+" normal usage the working copy should be up to date, at a single\n"
+" revision, with no local modifications and no switched subtrees.\n"
+"\n"
+" - The 'Feature Branch' Merging Pattern -\n"
+"\n"
+" In this commonly used pattern of merging, a developer is working on\n"
+" a feature development branch, committing a series of changes that\n"
+" implement the feature. The developer periodically merges all the\n"
+" latest changes from the 'parent' branch (from which the feature branch\n"
+" is branched off). When the feature development is complete, the\n"
+" developer integrates the feature back into the parent branch by\n"
+" merging the other way, into a trunk working copy.\n"
+"\n"
+" trunk --+----------o------o-o-------------o--\n"
+" \\ \\ \\ /\n"
+" \\ merge merge merge\n"
+" \\ \\ \\ /\n"
+" feature +--o-o-------o----o-o----o-------\n"
+"\n"
+" In this pattern, a merge from the parent branch to the feature branch\n"
+" is known as a 'sync' merge (or 'catch-up' merge), and a merge from the\n"
+" feature branch to the parent branch may be called a 'reintegrate'\n"
+" merge. The 'sync' merges are normally low-risk because the parent\n"
+" branch is considered to be more 'stable' than the feature branch, in\n"
+" the sense of being less likely to contain incomplete or broken work.\n"
+" By syncing often, these merges can be kept small, avoiding the need\n"
+" for a difficult 'big bang' merge at reintegration time.\n"
"\n"
" - Sync Merge Example -\n"
-"\n"
-" A feature is being developed on a branch called 'feature', which has\n"
-" originally been a copy of trunk. The feature branch has been regularly\n"
-" synced with trunk to keep up with the changes made there. The previous\n"
-" sync merges are not shown on this diagram, and the last of them was\n"
-" done when HEAD was r100. Currently, HEAD is r200.\n"
-"\n"
-" feature +------------------------o-----\n"
-" / ^\n"
-" / ............ |\n"
-" / . . /\n"
-" trunk ------+------------L--------------R------\n"
-" r100 r200\n"
+" ............\n"
+" . .\n"
+" trunk --+------------L--------------R------\n"
+" \\ \\\n"
+" \\ |\n"
+" \\ v\n"
+" feature +------------------------o-----\n"
+" r100 r200\n"
"\n"
" Subversion will locate all the changes on 'trunk' that have not yet\n"
" been merged into the 'feature' branch. In this case that is a single\n"
@@ -802,6 +818,40 @@ const svn_opt_subcommand_desc2_t svn_cl_
" conflicts before you commit the merge.\n"
"\n"
"\n"
+" - Reintegrate Merge Example -\n"
+"\n"
+" The feature branch was last synced with trunk up to revision X. So the\n"
+" difference between trunk@X and feature@HEAD contains the complete set\n"
+" of changes that implement the feature, and no other changes. These\n"
+" changes are applied to trunk.\n"
+"\n"
+" rW rX\n"
+" trunk ------+--------------------L------------------o\n"
+" \\ . ^\n"
+" \\ ............. /\n"
+" \\ . /\n"
+" feature +--------------------------------R\n"
+"\n"
+" In the diagram above, L marks the left side (trunk@X) and R marks the\n"
+" right side (feature@HEAD) of the merge. The difference between the\n"
+" left and right side is merged into trunk, the target.\n"
+"\n"
+" To perform the merge, have a clean working copy of trunk and run the\n"
+" following command in its top-level directory:\n"
+"\n"
+" svn merge ^/feature\n"
+"\n"
+" To prevent unnecessary merge conflicts, a reintegrate merge requires\n"
+" that TARGET_WCPATH is not a mixed-revision working copy, has no local\n"
+" modifications, and has no switched subtrees.\n"
+"\n"
+" A reintegrate merge also requires that the source branch is coherently\n"
+" synced with the target -- in the above example, this means that all\n"
+" revisions between the branch point W and the last merged revision X\n"
+" are merged to the feature branch, so that there are no unmerged\n"
+" revisions in-between.\n"
+"\n"
+"\n"
" 2. This form is called a 'cherry-pick' merge:\n"
"\n"
" svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
@@ -871,66 +921,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" svn merge -c50,54,60 -r65:68 ^/trunk\n"
"\n"
"\n"
-" 3. This form is called a 'reintegrate merge':\n"
-"\n"
-" svn merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
-"\n"
-" In a reintegrate merge, an (e.g. feature) branch is merged back to its\n"
-" originating branch. In other words, the source branch has originally\n"
-" been created by copying the target branch, development has concluded\n"
-" on the source branch and it should now be merged back into the target\n"
-" branch.\n"
-" \n"
-" SOURCE is the URL of a branch to be merged back. If REV is specified,\n"
-" it is used as the peg revision for SOURCE; if REV is not specified,\n"
-" the HEAD revision is assumed.\n"
-"\n"
-" TARGET_WCPATH is a working copy of the branch the changes will be\n"
-" applied to.\n"
-"\n"
-" - Reintegrate Merge Example -\n"
-"\n"
-" A feature has been developed on a branch called 'feature'. The feature\n"
-" branch started as a copy of trunk@W. Work on the feature has completed\n"
-" and it should be merged back into the trunk.\n"
-"\n"
-" The feature branch was last synced with trunk up to revision X. So the\n"
-" difference between trunk@X and feature@HEAD contains the complete set\n"
-" of changes that implement the feature, and no other changes. These\n"
-" changes are applied to trunk.\n"
-"\n"
-" feature +--------------------------------R\n"
-" / . \\\n"
-" / ............. \\\n"
-" / . v\n"
-" trunk ------+--------------------L------------------o\n"
-" rW rX\n"
-"\n"
-" In the diagram above, L marks the left side (trunk@X) and R marks the\n"
-" right side (feature@HEAD) of the merge. The difference between the\n"
-" left and right side is merged into trunk, the target.\n"
-"\n"
-" To perform the merge, have a clean working copy of trunk and run the\n"
-" following command in its top-level directory:\n"
-"\n"
-" svn merge --reintegrate ^/feature\n"
-"\n"
-" To prevent unnecessary merge conflicts, a reintegrate merge requires\n"
-" that TARGET_WCPATH is not a mixed-revision working copy, has no local\n"
-" modifications, and has no switched subtrees.\n"
-"\n"
-" A reintegrate merge also requires that the source branch is coherently\n"
-" synced with the target -- in the above example, this means that all\n"
-" revisions between the branch point W and the last merged revision X\n"
-" are merged to the feature branch, so that there are no unmerged\n"
-" revisions in-between.\n"
-"\n"
-" After the reintegrate merge, the feature branch cannot be synced to\n"
-" the trunk again without merge conflicts. If further work must be done\n"
-" on the feature branch, it should be deleted and then re-created.\n"
-"\n"
-"\n"
-" 4. This form is called a '2-URL merge':\n"
+" 3. This form is called a '2-URL merge':\n"
"\n"
" svn merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
"\n"
@@ -2187,6 +2178,7 @@ sub_main(int argc, const char *argv[], a
{ "--version", svn_cl__help, {0}, "",
{opt_version, /* must accept its own option */
'q', /* brief output */
+ 'v', /* verbose output */
opt_config_dir /* all commands accept this */
} };
Modified: subversion/branches/master-passphrase/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svn_private_config.hw?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svn_private_config.hw (original)
+++ subversion/branches/master-passphrase/subversion/svn_private_config.hw Mon Aug 13 13:28:09 2012
@@ -31,7 +31,6 @@
/* Define to a Windows-specific equivalent of config.guess output */
-/* ### Replace CPU type and Windows version during build script generation */
#define SVN_BUILD_HOST "x86-microsoft-windows"
/* The minimal version of Berkeley DB we want */
Modified: subversion/branches/master-passphrase/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svnadmin/main.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svnadmin/main.c (original)
+++ subversion/branches/master-passphrase/subversion/svnadmin/main.c Mon Aug 13 13:28:09 2012
@@ -990,9 +990,10 @@ subcommand_help(apr_getopt_t *os, void *
version_footer = svn_stringbuf_create(fs_desc_start, pool);
SVN_ERR(svn_fs_print_modules(version_footer, pool));
- SVN_ERR(svn_opt_print_help3(os, "svnadmin",
+ SVN_ERR(svn_opt_print_help4(os, "svnadmin",
opt_state ? opt_state->version : FALSE,
opt_state ? opt_state->quiet : FALSE,
+ /*###opt_state ? opt_state->verbose :*/ FALSE,
version_footer->data,
header, cmd_table, options_table, NULL, NULL,
pool));
Modified: subversion/branches/master-passphrase/subversion/svndumpfilter/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svndumpfilter/main.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svndumpfilter/main.c (original)
+++ subversion/branches/master-passphrase/subversion/svndumpfilter/main.c Mon Aug 13 13:28:09 2012
@@ -1135,11 +1135,12 @@ subcommand_help(apr_getopt_t *os, void *
"\n"
"Available subcommands:\n");
- SVN_ERR(svn_opt_print_help3(os, "svndumpfilter",
+ SVN_ERR(svn_opt_print_help4(os, "svndumpfilter",
opt_state ? opt_state->version : FALSE,
- opt_state ? opt_state->quiet : FALSE, NULL,
- header, cmd_table, options_table, NULL,
- NULL, pool));
+ opt_state ? opt_state->quiet : FALSE,
+ /*###opt_state ? opt_state->verbose :*/ FALSE,
+ NULL, header, cmd_table, options_table,
+ NULL, NULL, pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/master-passphrase/subversion/svnlook/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svnlook/main.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svnlook/main.c (original)
+++ subversion/branches/master-passphrase/subversion/svnlook/main.c Mon Aug 13 13:28:09 2012
@@ -2049,9 +2049,10 @@ subcommand_help(apr_getopt_t *os, void *
version_footer = svn_stringbuf_create(fs_desc_start, pool);
SVN_ERR(svn_fs_print_modules(version_footer, pool));
- SVN_ERR(svn_opt_print_help3(os, "svnlook",
+ SVN_ERR(svn_opt_print_help4(os, "svnlook",
opt_state ? opt_state->version : FALSE,
opt_state ? opt_state->quiet : FALSE,
+ opt_state ? opt_state->verbose : FALSE,
version_footer->data,
header, cmd_table, options_table, NULL,
NULL, pool));
@@ -2447,7 +2448,7 @@ main(int argc, const char *argv[])
static const svn_opt_subcommand_desc2_t pseudo_cmd =
{ "--version", subcommand_help, {0}, "",
{svnlook__version, /* must accept its own option */
- 'q',
+ 'q', 'v',
} };
subcommand = &pseudo_cmd;
Modified: subversion/branches/master-passphrase/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svnmucc/svnmucc.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svnmucc/svnmucc.c (original)
+++ subversion/branches/master-passphrase/subversion/svnmucc/svnmucc.c Mon Aug 13 13:28:09 2012
@@ -940,7 +940,8 @@ display_version(apr_getopt_t *os, apr_po
version_footer = svn_stringbuf_create(ra_desc_start, pool);
SVN_ERR(svn_ra_print_modules(version_footer, pool));
- SVN_ERR(svn_opt_print_help3(os, "svnmucc", TRUE, FALSE, version_footer->data,
+ SVN_ERR(svn_opt_print_help4(os, "svnmucc", TRUE, FALSE, FALSE,
+ version_footer->data,
NULL, NULL, NULL, NULL, NULL, pool));
return SVN_NO_ERROR;
Modified: subversion/branches/master-passphrase/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svnrdump/svnrdump.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svnrdump/svnrdump.c (original)
+++ subversion/branches/master-passphrase/subversion/svnrdump/svnrdump.c Mon Aug 13 13:28:09 2012
@@ -505,8 +505,8 @@ version(const char *progname,
pool);
SVN_ERR(svn_ra_print_modules(version_footer, pool));
- return svn_opt_print_help3(NULL, ensure_appname(progname, pool),
- TRUE, quiet, version_footer->data,
+ return svn_opt_print_help4(NULL, ensure_appname(progname, pool),
+ TRUE, quiet, FALSE, version_footer->data,
NULL, NULL, NULL, NULL, NULL, pool);
}
@@ -579,9 +579,9 @@ help_cmd(apr_getopt_t *os,
"\n"
"Available subcommands:\n");
- return svn_opt_print_help3(os, "svnrdump", FALSE, FALSE, NULL, header,
- svnrdump__cmd_table, svnrdump__options, NULL,
- NULL, pool);
+ return svn_opt_print_help4(os, "svnrdump", FALSE, FALSE, FALSE, NULL,
+ header, svnrdump__cmd_table, svnrdump__options,
+ NULL, NULL, pool);
}
/* Examine the OPT_BATON's 'start_revision' and 'end_revision'
Modified: subversion/branches/master-passphrase/subversion/svnserve/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svnserve/main.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svnserve/main.c (original)
+++ subversion/branches/master-passphrase/subversion/svnserve/main.c Mon Aug 13 13:28:09 2012
@@ -327,7 +327,8 @@ static svn_error_t * version(svn_boolean
_("\nCyrus SASL authentication is available.\n"));
#endif
- return svn_opt_print_help3(NULL, "svnserve", TRUE, quiet, version_footer->data,
+ return svn_opt_print_help4(NULL, "svnserve", TRUE, quiet, FALSE,
+ version_footer->data,
NULL, NULL, NULL, NULL, NULL, pool);
}
Modified: subversion/branches/master-passphrase/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svnsync/main.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svnsync/main.c (original)
+++ subversion/branches/master-passphrase/subversion/svnsync/main.c Mon Aug 13 13:28:09 2012
@@ -1857,9 +1857,10 @@ help_cmd(apr_getopt_t *os, void *baton,
SVN_ERR(svn_ra_print_modules(version_footer, pool));
- SVN_ERR(svn_opt_print_help3(os, "svnsync",
+ SVN_ERR(svn_opt_print_help4(os, "svnsync",
opt_baton ? opt_baton->version : FALSE,
opt_baton ? opt_baton->quiet : FALSE,
+ /*###opt_state ? opt_state->verbose :*/ FALSE,
version_footer->data, header,
svnsync_cmd_table, svnsync_options, NULL,
NULL, pool));
Modified: subversion/branches/master-passphrase/subversion/svnversion/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/svnversion/main.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/svnversion/main.c (original)
+++ subversion/branches/master-passphrase/subversion/svnversion/main.c Mon Aug 13 13:28:09 2012
@@ -37,8 +37,8 @@
static svn_error_t *
version(svn_boolean_t quiet, apr_pool_t *pool)
{
- return svn_opt_print_help3(NULL, "svnversion", TRUE, quiet, NULL, NULL,
- NULL, NULL, NULL, NULL, pool);
+ return svn_opt_print_help4(NULL, "svnversion", TRUE, quiet, FALSE,
+ NULL, NULL, NULL, NULL, NULL, NULL, pool);
}
static void
Modified: subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tests.py?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tests.py Mon Aug 13 13:28:09 2012
@@ -6541,7 +6541,7 @@ def avoid_reflected_revs(sbox):
bfile2_content = "This is bfile2\n"
# We'll consider A as the trunk and A_COPY as the feature branch
- # Create a tfile1 in A
+ # r3 - Create a tfile1 in A
svntest.main.file_write(tfile1_path, tfile1_content)
svntest.actions.run_and_verify_svn(None, None, [], 'add', tfile1_path)
expected_output = wc.State(wc_dir, {'A/tfile1' : Item(verb='Adding')})
@@ -6549,7 +6549,7 @@ def avoid_reflected_revs(sbox):
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
wc_status, None, wc_dir)
- # Create a bfile1 in A_COPY
+ # r4 - Create a bfile1 in A_COPY
svntest.main.file_write(bfile1_path, bfile1_content)
svntest.actions.run_and_verify_svn(None, None, [], 'add', bfile1_path)
expected_output = wc.State(wc_dir, {'A_COPY/bfile1' : Item(verb='Adding')})
@@ -6557,7 +6557,7 @@ def avoid_reflected_revs(sbox):
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
wc_status, None, wc_dir)
- # Create one more file in A
+ # r5 - Create one more file in A
svntest.main.file_write(tfile2_path, tfile2_content)
svntest.actions.run_and_verify_svn(None, None, [], 'add', tfile2_path)
expected_output = wc.State(wc_dir, {'A/tfile2' : Item(verb='Adding')})
@@ -6634,7 +6634,6 @@ def avoid_reflected_revs(sbox):
None, A_COPY_path,
'--allow-mixed-revisions')
- # Sync up with the trunk ie., A
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
expected_output = wc.State(wc_dir, {
'A_COPY' : Item(verb='Sending'),
@@ -6675,7 +6674,6 @@ def avoid_reflected_revs(sbox):
None, A_COPY_path,
'--allow-mixed-revisions')
-
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
expected_output = wc.State(wc_dir, {
'A_COPY' : Item(verb='Sending'),
@@ -6684,7 +6682,7 @@ def avoid_reflected_revs(sbox):
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
None, None, wc_dir)
- # Add bfile2 to A_COPY
+ # r8 - Add bfile2 to A_COPY
svntest.main.file_write(bfile2_path, bfile2_content)
svntest.actions.run_and_verify_svn(None, None, [], 'add', bfile2_path)
expected_output = wc.State(wc_dir, {'A_COPY/bfile2' : Item(verb='Adding')})
@@ -6700,7 +6698,6 @@ def avoid_reflected_revs(sbox):
# Merge 2:8 from A_COPY(feature branch) to A(trunk).
expected_output = wc.State(A_path, {
- '' : Item(status='C '),
'bfile2' : Item(status='A '),
'bfile1' : Item(status='A '),
})
@@ -6710,7 +6707,7 @@ def avoid_reflected_revs(sbox):
expected_elision_output = wc.State(A_path, {
})
expected_status = wc.State(A_path, {
- '' : Item(status='CM', wc_rev=6),
+ '' : Item(status=' M', wc_rev=6),
'bfile2' : Item(status='A ', wc_rev='-', copied='+'),
'bfile1' : Item(status='A ', wc_rev='-', copied='+'),
'tfile2' : Item(status=' ', wc_rev=6),
@@ -11063,7 +11060,6 @@ def reverse_merge_away_all_mergeinfo(sbo
# merge'. Specifically see
# http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc5
@SkipUnless(server_has_mergeinfo)
-@XFail()
@Issues(3138,3067,4217)
def dont_merge_revs_into_subtree_that_predate_it(sbox):
"dont merge revs into a subtree that predate it"
@@ -11194,13 +11190,12 @@ def dont_merge_revs_into_subtree_that_pr
H_COPY_path)
# H_COPY needs r6-9 applied while H_COPY/nu needs only 6,8-9.
- # This means r6 will be done as a separate editor drive targeted
- # on H_COPY. But r6 was only the copy of A/D/H to H_COPY and
- # so is a no-op and there will no notification for r6.
svntest.actions.run_and_verify_svn(
None,
expected_merge_output(
- [[6,9]], ['U ' + os.path.join(H_COPY_path, "psi") + '\n',
+ [[7,9], # Merge notification
+ [6,9]], # Mergeinfo notification
+ ['U ' + os.path.join(H_COPY_path, "psi") + '\n',
'D ' + os.path.join(H_COPY_path, "nu") + '\n',
' U ' + H_COPY_path + '\n',]),
[], 'merge', sbox.repo_url + '/A/D/H', H_COPY_path, '--force')
Modified: subversion/branches/master-passphrase/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/tests/cmdline/prop_tests.py?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/master-passphrase/subversion/tests/cmdline/prop_tests.py Mon Aug 13 13:28:09 2012
@@ -2268,7 +2268,7 @@ def propget_redirection(sbox):
# Run propget -vR svn:mergeinfo, redirecting the stdout to a file.
arglist = [svntest.main.svn_binary, 'propget', SVN_PROP_MERGEINFO, '-vR',
- wc_dir]
+ '--config-dir', svntest.main.default_config_dir, wc_dir]
redir_file = open(redirect_file, 'wb')
pg_proc = subprocess.Popen(arglist, stdout=redir_file)
pg_proc.wait()
Modified: subversion/branches/master-passphrase/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/tests/cmdline/svnadmin_tests.py?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/master-passphrase/subversion/tests/cmdline/svnadmin_tests.py Mon Aug 13 13:28:09 2012
@@ -1821,6 +1821,11 @@ def mergeinfo_race(sbox):
raise svntest.Failure("one or both commits failed")
+@Issue(4213)
+def recover_old(sbox):
+ "recover --pre-1.4-compatible"
+ sbox.build(create_wc=False)
+ svntest.main.run_svnadmin("recover", sbox.repo_dir)
########################################################################
@@ -1858,6 +1863,7 @@ test_list = [ None,
hotcopy_incremental_packed,
locking,
mergeinfo_race,
+ recover_old,
]
if __name__ == '__main__':
Modified: subversion/branches/master-passphrase/tools/dev/svnraisetreeconflict/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/tools/dev/svnraisetreeconflict/main.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/tools/dev/svnraisetreeconflict/main.c (original)
+++ subversion/branches/master-passphrase/tools/dev/svnraisetreeconflict/main.c Mon Aug 13 13:28:09 2012
@@ -67,8 +67,8 @@
static svn_error_t *
version(apr_pool_t *pool)
{
- return svn_opt_print_help3(NULL, "svnraisetreeconflict", TRUE, FALSE, NULL,
- NULL, NULL, NULL, NULL, NULL, pool);
+ return svn_opt_print_help4(NULL, "svnraisetreeconflict", TRUE, FALSE, FALSE,
+ NULL, NULL, NULL, NULL, NULL, NULL, pool);
}
static void
Modified: subversion/branches/master-passphrase/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/tools/server-side/svn-rep-sharing-stats.c?rev=1372418&r1=1372417&r2=1372418&view=diff
==============================================================================
--- subversion/branches/master-passphrase/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/branches/master-passphrase/tools/server-side/svn-rep-sharing-stats.c Mon Aug 13 13:28:09 2012
@@ -42,8 +42,8 @@
static svn_error_t *
version(apr_pool_t *pool)
{
- return svn_opt_print_help3(NULL, "svn-rep-sharing-stats", TRUE, FALSE, NULL,
- NULL, NULL, NULL, NULL, NULL, pool);
+ return svn_opt_print_help4(NULL, "svn-rep-sharing-stats", TRUE, FALSE, FALSE,
+ NULL, NULL, NULL, NULL, NULL, NULL, pool);
}
static void