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 2009/12/15 07:15:17 UTC
svn commit: r890658 [3/27] - in /subversion/branches/issue-3242-dev: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6.x-...
Modified: subversion/branches/issue-3242-dev/build/generator/svn_config.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/generator/svn_config.vcproj.ezt?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/generator/svn_config.vcproj.ezt (original)
+++ subversion/branches/issue-3242-dev/build/generator/svn_config.vcproj.ezt Tue Dec 15 06:14:36 2009
@@ -1,9 +1,28 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+[define COPYRIGHT]
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+[end]<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="[version]"
Name="__CONFIG__"
- ProjectGUID="{638FEA9B-E592-4B88-93B7-08B8A32CAD1F}"
+ ProjectGUID="[project_guid]"
Keyword="MakeFileProj">
<Platforms>
[for platforms] <Platform
@@ -13,6 +32,7 @@
[for platforms][for configs] <Configuration
Name="[configs]|[platforms]"
OutputDirectory="."
+ BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
IntermediateDirectory="."
ConfigurationType="10"
UseOfMFC="0"
Modified: subversion/branches/issue-3242-dev/build/generator/svn_locale.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/generator/svn_locale.vcproj.ezt?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/generator/svn_locale.vcproj.ezt (original)
+++ subversion/branches/issue-3242-dev/build/generator/svn_locale.vcproj.ezt Tue Dec 15 06:14:36 2009
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+[define COPYRIGHT]
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+[end]<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="[version]"
@@ -13,6 +32,7 @@
[for platforms][for configs] <Configuration
Name="[configs]|[platforms]"
OutputDirectory="..\..\[configs]\mo"
+ BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
IntermediateDirectory="..\..\[configs]\mo"
ConfigurationType="0"
UseOfMFC="0"
Modified: subversion/branches/issue-3242-dev/build/generator/swig/__init__.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/generator/swig/__init__.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/generator/swig/__init__.py (original)
+++ subversion/branches/issue-3242-dev/build/generator/swig/__init__.py Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# generator.swig: Base class for SWIG-related generators
#
Modified: subversion/branches/issue-3242-dev/build/generator/swig/checkout_swig_header.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/generator/swig/checkout_swig_header.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/generator/swig/checkout_swig_header.py (original)
+++ subversion/branches/issue-3242-dev/build/generator/swig/checkout_swig_header.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# Checkout files from the SWIG library into Subversion's proxy directory
#
Modified: subversion/branches/issue-3242-dev/build/generator/swig/external_runtime.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/generator/swig/external_runtime.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/generator/swig/external_runtime.py (original)
+++ subversion/branches/issue-3242-dev/build/generator/swig/external_runtime.py Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
#
# external_runtime.py: Generate external runtime files for SWIG
Modified: subversion/branches/issue-3242-dev/build/generator/swig/header_wrappers.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/generator/swig/header_wrappers.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/generator/swig/header_wrappers.py (original)
+++ subversion/branches/issue-3242-dev/build/generator/swig/header_wrappers.py Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
#
# header_wrappers.py: Generates SWIG proxy wrappers around Subversion
Modified: subversion/branches/issue-3242-dev/build/generator/util/executable.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/generator/util/executable.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/generator/util/executable.py (original)
+++ subversion/branches/issue-3242-dev/build/generator/util/executable.py Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# executable.py -- Utilities for dealing with external executables
#
Modified: subversion/branches/issue-3242-dev/build/generator/zlib.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/generator/zlib.vcproj.ezt?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/generator/zlib.vcproj.ezt (original)
+++ subversion/branches/issue-3242-dev/build/generator/zlib.vcproj.ezt Tue Dec 15 06:14:36 2009
@@ -1,9 +1,28 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+[define COPYRIGHT]
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+[end]<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="[version]"
Name="zlib"
- ProjectGUID="{41FE336A-F191-4F4E-A17C-602C627EA1E1}"
+ ProjectGUID="[project_guid]"
Keyword="MakeFileProj">
<Platforms>
[for platforms] <Platform
@@ -13,6 +32,7 @@
[for platforms] <Configuration
Name="Debug|[platforms]"
OutputDirectory="[zlib_path]\Debug"
+ BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
IntermediateDirectory="[zlib_path]\Debug"
ConfigurationType="0"
ManagedExtensions="1"
@@ -28,6 +48,7 @@
<Configuration
Name="Release|[platforms]"
OutputDirectory="[zlib_path]\Release"
+ BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
IntermediateDirectory="[zlib_path]\Release"
ConfigurationType="0"
ManagedExtensions="1"
Modified: subversion/branches/issue-3242-dev/build/get-py-info.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/get-py-info.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/get-py-info.py (original)
+++ subversion/branches/issue-3242-dev/build/get-py-info.py Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
# get-py-info.py: get various Python info (for building)
#
######################################################################
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/build/getversion.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/getversion.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/getversion.py (original)
+++ subversion/branches/issue-3242-dev/build/getversion.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# getversion.py - Parse version numbers from C header files.
#
Modified: subversion/branches/issue-3242-dev/build/run_ctypesgen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/run_ctypesgen.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/run_ctypesgen.sh (original)
+++ subversion/branches/issue-3242-dev/build/run_ctypesgen.sh Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/bin/sh
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# Helper script to generate the ctypesgen wrappers
#
@@ -14,8 +34,8 @@
abs_builddir="$7"
svn_libdir="$8"
-apr_prefix="$9"
-apu_prefix="${10}"
+apr_config="$9"
+apu_config="${10}"
cp_relpath="subversion/bindings/ctypes-python"
output="$cp_relpath/svn_all.py"
@@ -29,9 +49,6 @@
fi
### most of this should be done at configure time and passed in
-apr_config="$apr_prefix/bin/apr-1-config"
-apu_config="$apr_prefix/bin/apu-1-config"
-
apr_cppflags="`$apr_config --includes --cppflags`"
apr_include_dir="`$apr_config --includedir`"
apr_ldflags="`$apr_config --ldflags --link-ld`"
Modified: subversion/branches/issue-3242-dev/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/run_tests.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/run_tests.py (original)
+++ subversion/branches/issue-3242-dev/build/run_tests.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# run_tests.py - run the tests in the regression test suite.
#
Modified: subversion/branches/issue-3242-dev/build/strip-po-charset.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/strip-po-charset.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/strip-po-charset.py (original)
+++ subversion/branches/issue-3242-dev/build/strip-po-charset.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# strip-po-charset.py
#
Modified: subversion/branches/issue-3242-dev/build/transform_libtool_scripts.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/transform_libtool_scripts.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/transform_libtool_scripts.sh (original)
+++ subversion/branches/issue-3242-dev/build/transform_libtool_scripts.sh Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# Dependencies of libraries
subr="subr"
Modified: subversion/branches/issue-3242-dev/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/transform_sql.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/transform_sql.py (original)
+++ subversion/branches/issue-3242-dev/build/transform_sql.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# transform_sql.py -- create a header file with the appropriate SQL variables
# from an SQL file
#
Propchange: subversion/branches/issue-3242-dev/build/win32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec 15 06:14:36 2009
@@ -6,6 +6,7 @@
*.dsp
msvc-dsp
*.vcproj
+*.vcxproj
vcnet-vcproj
*.user
BuildLog.htm
Modified: subversion/branches/issue-3242-dev/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/win32/make_dist.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/win32/make_dist.py (original)
+++ subversion/branches/issue-3242-dev/build/win32/make_dist.py Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
import os
import sys
import shutil
Modified: subversion/branches/issue-3242-dev/build/win32/make_gem.rb
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/win32/make_gem.rb?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/win32/make_gem.rb (original)
+++ subversion/branches/issue-3242-dev/build/win32/make_gem.rb Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
#!/usr/bin/env ruby
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
require 'optparse'
require 'ostruct'
Modified: subversion/branches/issue-3242-dev/build/win32/svn.rc
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/build/win32/svn.rc?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/build/win32/svn.rc (original)
+++ subversion/branches/issue-3242-dev/build/win32/svn.rc Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
/* svn.rc: Resource definitions for Subversion programs
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -62,11 +62,11 @@
BEGIN
BLOCK "040904B0"
BEGIN
- VALUE "CompanyName", "http://subversion.tigris.org/\0"
+ VALUE "CompanyName", "http://subversion.apache.org/\0"
VALUE "FileDescription", APR_STRINGIFY(SVN_FILE_DESCRIPTION) "\0"
VALUE "FileVersion", SVN_VER_NUMBER "\0"
VALUE "InternalName", "SVN\0"
- VALUE "LegalCopyright", "Copyright (c) 2009 Subversion Corporation\0"
+ VALUE "LegalCopyright", "Copyright (c) 2009 The Apache Software Foundation\0"
VALUE "OriginalFilename", APR_STRINGIFY(SVN_FILE_NAME) "\0"
VALUE "ProductName", "Subversion\0"
VALUE "ProductVersion", SVN_VERSION "\0"
Modified: subversion/branches/issue-3242-dev/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/configure.ac?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/configure.ac (original)
+++ subversion/branches/issue-3242-dev/configure.ac Tue Dec 15 06:14:36 2009
@@ -1,3 +1,20 @@
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+
dnl configure.ac: Autoconfiscation for Subversion
dnl Process this file with autoconf to produce a configure script.
Modified: subversion/branches/issue-3242-dev/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/contrib/client-side/emacs/dsvn.el?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/issue-3242-dev/contrib/client-side/emacs/dsvn.el Tue Dec 15 06:14:36 2009
@@ -1,12 +1,11 @@
;;; dsvn.el --- Subversion interface
-;; Copyright 2006-2008 Virtutech AB
+;; Copyright 2006-2009 Virtutech AB
;; Author: David Kågedal <da...@virtutech.com>
;; Mattias Engdegård <ma...@virtutech.com>
;; Maintainer: Mattias Engdegård <ma...@virtutech.com>
;; Created: 27 Jan 2006
-;; Version: 1.8
;; Keywords: docs
;; This program is free software; you can redistribute it and/or
@@ -2002,7 +2001,7 @@
(defun svn-merge-columns-list (columns fmt)
(let ((first-lines (mapcar #'car columns)))
- (and (eval `(or ',@first-lines))
+ (and (eval `(or ,@first-lines))
(cons (mapconcat (lambda (str) (format fmt (or str "")))
first-lines " | ")
(svn-merge-columns-list (mapcar #'cdr columns) fmt)))))
@@ -2013,51 +2012,36 @@
"\n"))
(defun svn-status-help ()
- "Display keyboard help for svn status buffer."
+ "Display keyboard help for the svn-status buffer."
(interactive)
- (let* ((buf (get-buffer-create "*svn-keyboard-help*"))
- (help-text
- (svn-merge-columns
- (list (svn-format-help-column
- '((svn-commit "commit marked files")
- (svn-add-file "add marked files")
- (svn-remove-file "remove marked files")
- (svn-revert "revert marked files")
- (svn-update-current "update working copy")
- (svn-resolve "resolve conflicts")
- (svn-move "rename/move files")
- (svn-switch "switch working tree")
- (svn-merge "merge into WC")
- (svn-propedit "edit properties")))
- (svn-format-help-column
- '((svn-mark-forward "mark and go down")
- (svn-unmark-backward "go up and unmark")
- (svn-unmark-forward "unmark and go down")
- (svn-toggle-mark "toggle mark")
- (svn-unmark-all "unmark all")))
- (svn-format-help-column
- '((svn-find-file "visit file")
- (svn-find-file-other-window "visit file other win")
- (svn-diff-file "show file diff")
- (svn-file-log "show file log")
- (svn-refresh "refresh all files")
- (svn-refresh-file "refresh marked files")
- (svn-refresh-one "refresh named file")
- (svn-expunge "expunge unchanged"))))
- 24)))
- (with-current-buffer buf
- (setq buffer-read-only t)
- (let ((inhibit-read-only t))
- (erase-buffer)
- (insert help-text)
- (goto-char 1))
- (set-buffer-modified-p nil))
- (unless (get-buffer-window buf)
- (let ((nlines (with-current-buffer buf
- (count-lines 1 (buffer-size)))))
- (set-window-buffer
- (split-window-vertically (- 0 nlines 1))
- buf)))))
+ (message (svn-merge-columns
+ (list (svn-format-help-column
+ '((svn-commit "commit marked files")
+ (svn-add-file "add marked files")
+ (svn-remove-file "remove marked files")
+ (svn-revert "revert marked files")
+ (svn-update-current "update working copy")
+ (svn-resolve "resolve conflicts")
+ (svn-move "rename/move files")
+ (svn-switch "switch working tree")
+ (svn-merge "merge into WC")
+ (svn-propedit "edit properties")))
+ (svn-format-help-column
+ '((svn-mark-forward "mark and go down")
+ (svn-unmark-backward "go up and unmark")
+ (svn-unmark-forward "unmark and go down")
+ (svn-toggle-mark "toggle mark")
+ (svn-unmark-all "unmark all")))
+ (svn-format-help-column
+ '((svn-find-file "visit file")
+ (svn-find-file-other-window "visit file other win")
+ (svn-diff-file "show file diff")
+ (svn-file-log "show file log")
+ (svn-refresh "refresh all files")
+ (svn-refresh-file "refresh marked files")
+ (svn-refresh-one "refresh named file")
+ (svn-expunge "expunge unchanged"))))
+ 24)))
;;; Hooks
Modified: subversion/branches/issue-3242-dev/doc/user/cvs-crossover-guide.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/doc/user/cvs-crossover-guide.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/doc/user/cvs-crossover-guide.html (original)
+++ subversion/branches/issue-3242-dev/doc/user/cvs-crossover-guide.html Tue Dec 15 06:14:36 2009
@@ -1,7 +1,30 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<title>CVS to SVN Crossover Guide</title>
-<style>
+<style type="text/css">
body {
font-family: sans-serif;
}
@@ -210,11 +233,10 @@
the repository, to hold tags and branches later on. Then we
import the contents of the local <tt>myproj/</tt> directory into
a newly created <tt>/trunk</tt> directory in the
- repository.</tt>
+ repository.</dd>
</dl>
</td>
</tr>
-<tr>
</table>
<dl class="bookref">
@@ -310,7 +332,7 @@
the <tt>--username</tt> and <tt>--password</tt> options are
merely values to be used <em>if</em> the server issues a
challenge; they do not "push" the credentials at the
- server.)</tt> </dd>
+ server.)</dd>
</dl>
</td>
Modified: subversion/branches/issue-3242-dev/doc/user/svn-best-practices.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/doc/user/svn-best-practices.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/doc/user/svn-best-practices.html (original)
+++ subversion/branches/issue-3242-dev/doc/user/svn-best-practices.html Tue Dec 15 06:14:36 2009
@@ -1,13 +1,40 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<title>Subversion Best Practices</title>
+<style type="text/css">
+h1 {
+ text-align: center;
+}
+</style>
</head>
<body>
-<center>
- <h1>Subversion Best Practices</h1>
-</center>
+<h1>Subversion Best Practices</h1>
<p>This is a quick set of guidelines for making the best use of
Subversion in your day-to-day software development work.</p>
Modified: subversion/branches/issue-3242-dev/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/gen-make.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/gen-make.py (original)
+++ subversion/branches/issue-3242-dev/gen-make.py Tue Dec 15 06:14:36 2009
@@ -1,5 +1,25 @@
#!/usr/bin/env python
#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#
# gen-make.py -- generate makefiles for building Subversion
#
@@ -183,7 +203,7 @@
print(" only build static libraries")
print("")
print(" --vsnet-version=VER")
- print(" generate for VS.NET version VER (2002, 2003, 2005 or 2008)")
+ print(" generate for VS.NET version VER (2002, 2003, 2005, 2008 or 2010)")
print(" [only valid in combination with '-t vcproj']")
print("")
print(" --with-apr_memcache=DIR")
Modified: subversion/branches/issue-3242-dev/notes/obliterate/design-audit.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/obliterate/design-audit.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/notes/obliterate/design-audit.html (original)
+++ subversion/branches/issue-3242-dev/notes/obliterate/design-audit.html Tue Dec 15 06:14:36 2009
@@ -27,10 +27,10 @@
<!--
================================================================
- Licensed to the Subversion Corporation (SVN Corp.) under one
+ Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The SVN Corp. licenses this file
+ regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/notes/obliterate/design-authz.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/obliterate/design-authz.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/notes/obliterate/design-authz.html (original)
+++ subversion/branches/issue-3242-dev/notes/obliterate/design-authz.html Tue Dec 15 06:14:36 2009
@@ -21,10 +21,10 @@
<!--
================================================================
- Licensed to the Subversion Corporation (SVN Corp.) under one
+ Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The SVN Corp. licenses this file
+ regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
@@ -46,6 +46,26 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+<div class="h2" id="introduction" title="#introduction">
+ <h2>Introduction</h2>
+
+ <p>Authorization is by a pre-obliterate hook which can base its decision on
+ the user name and the details of the attempted obliteration.</p>
+
+ <p>A post-obliterate hook will be available for reporting or other purposes,
+ analogous to the post-commit hook. This is not involved in authorization.
+ </p>
+
+ <p>Before a normal commit, two hooks are invoked: start-commit and
+ pre-commit, with only the list of files available to the first one and
+ the entire content of the change available to the second one. As
+ obliteration does not involve transmitting file contents, there is no
+ reason to have separate start-obliterate and pre-obliterate hooks.</p>
+
+</div>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
<div class="h2" id="pre-obliterate" title="#pre-obliterate">
<h2>Pre-obliterate hook</h2>
Modified: subversion/branches/issue-3242-dev/notes/obliterate/design-repos.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/obliterate/design-repos.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/notes/obliterate/design-repos.html (original)
+++ subversion/branches/issue-3242-dev/notes/obliterate/design-repos.html Tue Dec 15 06:14:36 2009
@@ -30,10 +30,10 @@
<!--
================================================================
- Licensed to the Subversion Corporation (SVN Corp.) under one
+ Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The SVN Corp. licenses this file
+ regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
@@ -378,23 +378,34 @@
<div class="h2" id="refs" title="#refs">
<h2>References</h2>
- <p><a href="http://homepages.paradise.net.nz/~ejrh/subversion/mysql/"
- >Diagram of a schema for MYSQL</a> by Edmund Horner, which is like the
+ <p>Diagrams...</p>
+
+ <p>The repository transformations for <a href="fspec-dd1" >fspec-dd1</a> <a
+ href="fspec-dd1/dd1-file-ops.svg" >files</a> and <a
+ href="fspec-dd1/dd1-dir-ops.svg" >dirs</a>, and for <a href="fspec-cc1"
+ >fspec-cc1</a> <a href="fspec-cc1/cc1-file-ops.svg" >files</a> and <a
+ href="fspec-cc1/cc1-dir-ops.svg" >dirs</a>.</p>
+
+ <p>A database <a href="../../subversion/libsvn_fs_base/notes/schema-bdb-1.6.svg"
+ >schema diagram for BDB</a> in Subversion 1.6.</p>
+
+ <p>Diagrams showing the before-and-after content of BDB tables for a "dd1"
+ type of obliteration: <a href="schema-bdb-dd1-before.svg" >before</a> and <a
+ href="schema-bdb-dd1-after.svg" >after</a>.</p>
+
+ <p>A database <a href="http://homepages.paradise.net.nz/~ejrh/subversion/mysql/"
+ >schema diagram for MYSQL</a> by Edmund Horner, which is like the
BDB schema except with exploding of skels into table columns -
transaction_props, transaction_copies, representation_windows.</p>
- <p>FSFS <a
- href="../../subversion/libsvn_fs_fs/structure"
- >structure</a> doc</p>
-
- <p>FS-BDB <a
- href="../../subversion/libsvn_fs_base/notes/structure"
- >structure</a> doc: nodes, node-revs, keys, skels, reps, deltifying, txns,
+ <p><a href="../../subversion/libsvn_fs_fs/structure" >FSFS structure</a> doc</p>
+
+ <p><a href="../../subversion/libsvn_fs_base/notes/structure" >FS-BDB
+ structure</a> doc: nodes, node-revs, keys, skels, reps, deltifying, txns,
changes, copies, locks, merge rules, uuid, summary (structure syntax),
misc-table (forward-delta support)</p>
- <p>FS-BDB <a
- href="../../subversion/libsvn_fs_base/notes/fs-history"
+ <p>FS-BDB <a href="../../subversion/libsvn_fs_base/notes/fs-history"
>fs-history</a> doc: DAG node-revs, node-rev-ids, copies, copy-ids</p>
<p><a
Modified: subversion/branches/issue-3242-dev/notes/obliterate/design-wc.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/obliterate/design-wc.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/notes/obliterate/design-wc.html (original)
+++ subversion/branches/issue-3242-dev/notes/obliterate/design-wc.html Tue Dec 15 06:14:36 2009
@@ -25,10 +25,10 @@
<!--
================================================================
- Licensed to the Subversion Corporation (SVN Corp.) under one
+ Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The SVN Corp. licenses this file
+ regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/notes/obliterate/fspec-cc1/cc1-file-ops.svg
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/obliterate/fspec-cc1/cc1-file-ops.svg?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
Binary files - no diff available.
Modified: subversion/branches/issue-3242-dev/notes/obliterate/fspec-dd1/dd1-file-ops.svg
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/obliterate/fspec-dd1/dd1-file-ops.svg?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
Binary files - no diff available.
Modified: subversion/branches/issue-3242-dev/notes/obliterate/plan-milestones.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/obliterate/plan-milestones.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/notes/obliterate/plan-milestones.html (original)
+++ subversion/branches/issue-3242-dev/notes/obliterate/plan-milestones.html Tue Dec 15 06:14:36 2009
@@ -29,10 +29,10 @@
<!--
================================================================
- Licensed to the Subversion Corporation (SVN Corp.) under one
+ Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
- regarding copyright ownership. The SVN Corp. licenses this file
+ regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/notes/obliterate/req-spec.txt
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/obliterate/req-spec.txt?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/notes/obliterate/req-spec.txt (original)
+++ subversion/branches/issue-3242-dev/notes/obliterate/req-spec.txt Tue Dec 15 06:14:36 2009
@@ -117,6 +117,11 @@
U1 wants to prune old versions of F1 regularly in order to limit server
disk space usage.
+ This use case is not directly what most people consider to be
+ "obliterate". It is really a separate feature that could use the
+ functionality of "obliterate" in its implementation, but could also be
+ implemented in other ways.
+
3. REQUIREMENTS
Modified: subversion/branches/issue-3242-dev/notes/tree-conflicts/all-tests.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/notes/tree-conflicts/all-tests.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/notes/tree-conflicts/all-tests.sh (original)
+++ subversion/branches/issue-3242-dev/notes/tree-conflicts/all-tests.sh Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
# This is a listing of all cmdline tests currently known to check for proper
# tree-conflicts handling. You can use this file as a shell script, just
# go to your subversion/tests/cmdline directory and run this file.
Modified: subversion/branches/issue-3242-dev/packages/python-windows/setup.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/python-windows/setup.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/python-windows/setup.py (original)
+++ subversion/branches/issue-3242-dev/packages/python-windows/setup.py Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
#!/usr/bin/env python
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-3/Makefile
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-3/Makefile?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-3/Makefile (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-3/Makefile Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
##########################################################################
+# #
+# #
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you under the Apache License, Version 2.0 (the #
+# "License"); you may not use this file except in compliance #
+# with the License. You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, #
+# software distributed under the License is distributed on an #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY #
+# KIND, either express or implied. See the License for the #
+# specific language governing permissions and limitations #
+# under the License. #
+# #
+# #
# Build an RPM from the current spec file and subversion directory tree. #
# #
# Note: The RPM and Makefile are set up to GENERATE RPMS as a non-root #
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-3/filter-requires.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-3/filter-requires.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-3/filter-requires.sh (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-3/filter-requires.sh Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
/usr/lib/rpm/perl.req $* | sed -e '/perl(Config::IniFiles)/d'
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-3/find-osrel
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-3/find-osrel?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-3/find-osrel (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-3/find-osrel Tue Dec 15 06:14:36 2009
@@ -1,4 +1,25 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
if [ -f /etc/aurora-release ]; then
case `rpm -q fedora-release` in
fedora-release-2.0*) echo al2;;
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-3/subversion.conf
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-3/subversion.conf?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-3/subversion.conf (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-3/subversion.conf Tue Dec 15 06:14:36 2009
@@ -1,3 +1,24 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
# Needed to do Subversion Apache server.
#LoadModule dav_svn_module modules/mod_dav_svn.so
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-3/subversion.spec
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-3/subversion.spec?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-3/subversion.spec (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-3/subversion.spec Tue Dec 15 06:14:36 2009
@@ -1,3 +1,24 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
%define apache_version 2.0.46-61.1
%define neon_version 0.26.1
%define swig_version 1.3.25
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-4/Makefile
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-4/Makefile?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-4/Makefile (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-4/Makefile Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
##########################################################################
+# #
+# #
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you under the Apache License, Version 2.0 (the #
+# "License"); you may not use this file except in compliance #
+# with the License. You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, #
+# software distributed under the License is distributed on an #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY #
+# KIND, either express or implied. See the License for the #
+# specific language governing permissions and limitations #
+# under the License. #
+# #
+# #
# Build an RPM from the current spec file and subversion directory tree. #
# #
# Note: The RPM and Makefile are set up to GENERATE RPMS as a non-root #
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-4/filter-requires.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-4/filter-requires.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-4/filter-requires.sh (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-4/filter-requires.sh Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
/usr/lib/rpm/perl.req $* | sed -e '/perl(Config::IniFiles)/d'
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-4/find-osrel
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-4/find-osrel?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-4/find-osrel (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-4/find-osrel Tue Dec 15 06:14:36 2009
@@ -1,4 +1,25 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
if [ -f /etc/aurora-release ]; then
case `rpm -q fedora-release` in
fedora-release-2.0*) echo al2;;
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-4/subversion.conf
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-4/subversion.conf?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-4/subversion.conf (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-4/subversion.conf Tue Dec 15 06:14:36 2009
@@ -1,3 +1,24 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
# Needed to do Subversion Apache server.
#LoadModule dav_svn_module modules/mod_dav_svn.so
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-4/subversion.spec
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-4/subversion.spec?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-4/subversion.spec (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-4/subversion.spec Tue Dec 15 06:14:36 2009
@@ -1,3 +1,24 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
%define apache_version 2.0.52
%define apr_version 0.9.7
%define neon_version 0.26.1
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-5/Makefile
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-5/Makefile?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-5/Makefile (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-5/Makefile Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
##########################################################################
+# #
+# #
+# Licensed to the Apache Software Foundation (ASF) under one #
+# or more contributor license agreements. See the NOTICE file #
+# distributed with this work for additional information #
+# regarding copyright ownership. The ASF licenses this file #
+# to you under the Apache License, Version 2.0 (the #
+# "License"); you may not use this file except in compliance #
+# with the License. You may obtain a copy of the License at #
+# #
+# http://www.apache.org/licenses/LICENSE-2.0 #
+# #
+# Unless required by applicable law or agreed to in writing, #
+# software distributed under the License is distributed on an #
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY #
+# KIND, either express or implied. See the License for the #
+# specific language governing permissions and limitations #
+# under the License. #
+# #
+# #
# Build an RPM from the current spec file and subversion directory tree. #
# #
# Note: The RPM and Makefile are set up to GENERATE RPMS as a non-root #
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-5/filter-requires.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-5/filter-requires.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-5/filter-requires.sh (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-5/filter-requires.sh Tue Dec 15 06:14:36 2009
@@ -1,3 +1,23 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
/usr/lib/rpm/perl.req $* | sed -e '/perl(Config::IniFiles)/d'
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-5/find-osrel
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-5/find-osrel?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-5/find-osrel (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-5/find-osrel Tue Dec 15 06:14:36 2009
@@ -1,4 +1,25 @@
#!/bin/sh
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
if [ -f /etc/aurora-release ]; then
case `rpm -q fedora-release` in
fedora-release-2.0*) echo al2;;
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-5/subversion.conf
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-5/subversion.conf?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-5/subversion.conf (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-5/subversion.conf Tue Dec 15 06:14:36 2009
@@ -1,3 +1,24 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
# Needed to do Subversion Apache server.
#LoadModule dav_svn_module modules/mod_dav_svn.so
Modified: subversion/branches/issue-3242-dev/packages/rpm/rhel-5/subversion.spec
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/rpm/rhel-5/subversion.spec?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/rpm/rhel-5/subversion.spec (original)
+++ subversion/branches/issue-3242-dev/packages/rpm/rhel-5/subversion.spec Tue Dec 15 06:14:36 2009
@@ -1,3 +1,24 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
%define apache_version 2.2.3
%define apr_version 1.2.7
%define neon_version 0.26.1
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonSASLFeature.wxi
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonSASLFeature.wxi?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonSASLFeature.wxi (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonSASLFeature.wxi Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonShareFeature.wxi
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonShareFeature.wxi?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonShareFeature.wxi (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonShareFeature.wxi Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonShareFiles.wxi
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonShareFiles.wxi?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonShareFiles.wxi (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CommonShareFiles.wxi Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CreateIcons.wxs
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CreateIcons.wxs?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CreateIcons.wxs (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/CreateIcons.wxs Tue Dec 15 06:14:36 2009
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
Modified: subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/Files.wxs
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/Files.wxs?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/Files.wxs (original)
+++ subversion/branches/issue-3242-dev/packages/windows-WiX/BuildSubversion/Files.wxs Tue Dec 15 06:14:36 2009
@@ -1,8 +1,8 @@
<!--
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
-# regarding copyright ownership. The SVN Corp. licenses this file
+# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at