subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r890658 [26/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...
Date Tue, 15 Dec 2009 06:15:17 GMT
Modified: subversion/branches/issue-3242-dev/tools/dev/svnraisetreeconflict/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/svnraisetreeconflict/main.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/svnraisetreeconflict/main.c (original)
+++ subversion/branches/issue-3242-dev/tools/dev/svnraisetreeconflict/main.c Tue Dec 15 06:14:36 2009
@@ -15,10 +15,10 @@
  * source tree.
  *
  * ====================================================================
- *    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/tools/dev/trails.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/trails.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/trails.py (original)
+++ subversion/branches/issue-3242-dev/tools/dev/trails.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.
+#
+#
 
 ## See the usage() function for operating instructions. ##
 

Modified: subversion/branches/issue-3242-dev/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/unix-build/Makefile.svn?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/issue-3242-dev/tools/dev/unix-build/Makefile.svn Tue Dec 15 06:14:36 2009
@@ -584,7 +584,7 @@
 		co="co"; \
 	fi; \
 	if [ ! -d $(SVN_WC) ]; then \
-		svn $${co} https://svn.collab.net/repos/svn/$${branchdir} \
+		svn $${co} https://svn.apache.org/repos/asf/subversion/$${branchdir} \
 			$(SVN_WC); \
 	fi
 	touch $@

Modified: subversion/branches/issue-3242-dev/tools/dev/verify-history.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/verify-history.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/verify-history.py (original)
+++ subversion/branches/issue-3242-dev/tools/dev/verify-history.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.
+#
+#
 
 # This program is used to verify the FS history code.
 #

Modified: subversion/branches/issue-3242-dev/tools/dev/warn-ignored-err.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/warn-ignored-err.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/warn-ignored-err.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dev/warn-ignored-err.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.
+#
+#
 HELP="\
 Usage: $0 [--remove] [FILE...]
 

Modified: subversion/branches/issue-3242-dev/tools/dev/wc-ng/count-progress.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/wc-ng/count-progress.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/wc-ng/count-progress.py (original)
+++ subversion/branches/issue-3242-dev/tools/dev/wc-ng/count-progress.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.
+#
+#
 
 import os, sys
 

Modified: subversion/branches/issue-3242-dev/tools/dev/wc-ng/gather-data.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/wc-ng/gather-data.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/wc-ng/gather-data.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dev/wc-ng/gather-data.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.
+#
+#
 #/usr/bin/env sh
 # Trap Ctrl-C
 trap 'exit 1' 2

Modified: subversion/branches/issue-3242-dev/tools/dev/wc-ng/graph-data.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/wc-ng/graph-data.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/wc-ng/graph-data.py (original)
+++ subversion/branches/issue-3242-dev/tools/dev/wc-ng/graph-data.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.
+#
+#
 
 import matplotlib.mlab as mlab
 import matplotlib.pyplot as plt

Modified: subversion/branches/issue-3242-dev/tools/dev/which-error.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dev/which-error.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dev/which-error.py (original)
+++ subversion/branches/issue-3242-dev/tools/dev/which-error.py Tue Dec 15 06:14:36 2009
@@ -5,10 +5,10 @@
 #                 their numeric error code values
 #
 # ====================================================================
-#    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/tools/diff/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/diff/diff.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/diff/diff.c (original)
+++ subversion/branches/issue-3242-dev/tools/diff/diff.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
 /* diff-test.c -- test driver for text diffs
  *
  * ====================================================================
- *    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/tools/diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/diff/diff3.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/diff/diff3.c (original)
+++ subversion/branches/issue-3242-dev/tools/diff/diff3.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
 /* diff3-test.c -- test driver for 3-way text merges
  *
  * ====================================================================
- *    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/tools/diff/diff4.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/diff/diff4.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/diff/diff4.c (original)
+++ subversion/branches/issue-3242-dev/tools/diff/diff4.c Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
 /* diff4-test.c -- test driver for 3-way text merges
  *
  * ====================================================================
- *    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/tools/dist/construct-rolling-environment.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/construct-rolling-environment.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/construct-rolling-environment.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dist/construct-rolling-environment.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.
+#
+#
 set -e
 
 AUTOCONF=autoconf-2.64

Modified: subversion/branches/issue-3242-dev/tools/dist/dist.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/dist.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/dist.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dist/dist.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.
+#
+#
 
 # USAGE: ./dist.sh -v VERSION -r REVISION -pr REPOS-PATH
 #                  [-alpha ALPHA_NUM|-beta BETA_NUM|-rc RC_NUM|pre PRE_NUM]
@@ -203,7 +223,7 @@
 echo "Exporting $REPOS_PATH r$REVISION into sandbox..."
 (cd "$DIST_SANDBOX" && \
  ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS -r "$REVISION" \
-     "http://svn.collab.net/repos/svn/$REPOS_PATH" \
+     "http://svn.apache.org/repos/asf/subversion/$REPOS_PATH" \
      "$DISTNAME" --username none --password none)
 
 rm -f "$DISTPATH/STATUS"
@@ -214,7 +234,7 @@
 rm -rf "$DISTPATH/www"
 mkdir "$DISTPATH/www"
 ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS -r "$REVISION" \
-    "http://svn.collab.net/repos/svn/trunk/www/hacking.html" \
+    "http://svn.apache.org/repos/asf/subversion/trunk/www/hacking.html" \
     --username none --password none "$DISTPATH/www/hacking.html"
 
 # Remove contrib/ from our distribution tarball.  Some of it is of
@@ -222,6 +242,10 @@
 # (See http://svn.haxx.se/dev/archive-2009-04/0166.shtml for discussion.)
 rm -rf "$DISTPATH/contrib"
 
+# Remove packages/ from the tarball.
+# (See http://svn.haxx.se/dev/archive-2009-12/0205.shtml)
+rm -rf "$DISTPATH/packages"
+
 install_dependency()
 {
   DEP_NAME=$1

Modified: subversion/branches/issue-3242-dev/tools/dist/download-release.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/download-release.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/download-release.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dist/download-release.sh Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
 #!/bin/bash
+#
+#
+# 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.
+#
+#
 BASEURL=$1
 VERSION=$2
 wget -nc $BASEURL/{{md5,sha1}sums,svn_version.h.dist,subversion{-deps,}-$VERSION.{{zip,tar.bz2}{.asc,},tar.gz.asc}}

Modified: subversion/branches/issue-3242-dev/tools/dist/extract-for-examination.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/extract-for-examination.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/extract-for-examination.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dist/extract-for-examination.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.
+#
+#
 
 for i in *.tar.bz2; do
   base=${i%.tar.bz2}-tar-bz2

Modified: subversion/branches/issue-3242-dev/tools/dist/gen_nightly_ann.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/gen_nightly_ann.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/gen_nightly_ann.py (original)
+++ subversion/branches/issue-3242-dev/tools/dist/gen_nightly_ann.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.
+#
+#
 
 webpagetext = '''<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

Modified: subversion/branches/issue-3242-dev/tools/dist/getsigs.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/getsigs.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/getsigs.py (original)
+++ subversion/branches/issue-3242-dev/tools/dist/getsigs.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.
+#
+#
 
 # Less terrible, ugly hack of a script than getsigs.pl, but similar.  Used to
 # verify the signatures on the release tarballs and produce the list of who

Modified: subversion/branches/issue-3242-dev/tools/dist/nightly.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/nightly.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/nightly.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dist/nightly.sh Tue Dec 15 06:14:36 2009
@@ -1,7 +1,27 @@
 #!/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.
+#
+#
 set -e
 
-repo=http://svn.collab.net/repos/svn
+repo=http://svn.apache.org/repos/asf/subversion
 svn=svn
 
 # Parse our arguments

Modified: subversion/branches/issue-3242-dev/tools/dist/post-to-tigris.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/post-to-tigris.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/post-to-tigris.py (original)
+++ subversion/branches/issue-3242-dev/tools/dist/post-to-tigris.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.
+#
+#
+#
 # Creates entries on the tigris file manager for a release, using the
 # contents of:
 #   md5sums

Modified: subversion/branches/issue-3242-dev/tools/dist/roll.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/roll.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/roll.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dist/roll.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.
+#
+#
 set -e
 
 VERSION=$1
@@ -10,7 +30,7 @@
   BRANCH=trunk
 fi
 
-rs=http://svn.collab.net/repos/svn
+rs=http://svn.apache.org/repos/asf/subversion
 
 if [ "$VERSION" != "trunk" ]; then
   if [ -n "`svn diff --summarize $rs/branches/$BRANCH/CHANGES@$REV $rs/trunk/CHANGES@$REV | grep ^M`" ]; then

Modified: subversion/branches/issue-3242-dev/tools/dist/sample-rc-warning-index.html
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/sample-rc-warning-index.html?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/sample-rc-warning-index.html (original)
+++ subversion/branches/issue-3242-dev/tools/dist/sample-rc-warning-index.html 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.
+
+-->
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>

Modified: subversion/branches/issue-3242-dev/tools/dist/test.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/test.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/test.sh (original)
+++ subversion/branches/issue-3242-dev/tools/dist/test.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.
+#
+#
 set -e
 
 [ -e $HOME/.svndistrc ] && . $HOME/.svndistrc

Modified: subversion/branches/issue-3242-dev/tools/dist/write-announcement.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/dist/write-announcement.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/dist/write-announcement.py (original)
+++ subversion/branches/issue-3242-dev/tools/dist/write-announcement.py Tue Dec 15 06:14:36 2009
@@ -1,4 +1,24 @@
 #!/usr/bin/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.
+#
+#
 
 # Creates release announcement text using the contents of:
 #   md5sums

Modified: subversion/branches/issue-3242-dev/tools/examples/SvnCLBrowse
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/SvnCLBrowse?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/SvnCLBrowse (original)
+++ subversion/branches/issue-3242-dev/tools/examples/SvnCLBrowse Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
 # SvnCLBrowse -- graphical Subversion changelist browser
 #
 # ====================================================================
-#    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/tools/examples/blame.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/blame.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/blame.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/blame.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.
+#
+#
+#
 # USAGE: blame.py [-r REV] repos-path file
 #
 

Modified: subversion/branches/issue-3242-dev/tools/examples/check-modified.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/check-modified.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/check-modified.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/check-modified.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.
+#
+#
+#
 # USAGE: check-modified.py FILE_OR_DIR1 FILE_OR_DIR2 ...
 #
 # prints out the URL associated with each item

Modified: subversion/branches/issue-3242-dev/tools/examples/dumpprops.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/dumpprops.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/dumpprops.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/dumpprops.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.
+#
+#
+#
 # USAGE: dumprops.py [-r REV] repos-path [file]
 #
 # dump out the properties on a given path (recursively if given a dir)

Modified: subversion/branches/issue-3242-dev/tools/examples/get-location-segments.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/get-location-segments.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/get-location-segments.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/get-location-segments.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.
+#
+#
 import sys
 import os
 from svn import client, ra, core

Modified: subversion/branches/issue-3242-dev/tools/examples/getfile.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/getfile.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/getfile.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/getfile.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.
+#
+#
+#
 # USAGE: getfile.py [-r REV] repos-path file
 #
 # gets a file from an SVN repository, puts it to sys.stdout

Modified: subversion/branches/issue-3242-dev/tools/examples/getlocks_test.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/getlocks_test.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/getlocks_test.c (original)
+++ subversion/branches/issue-3242-dev/tools/examples/getlocks_test.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * getlocks_test.c : show all repository locks living below a URL
  *
  * ====================================================================
- *    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/tools/examples/geturl.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/geturl.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/geturl.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/geturl.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.
+#
+#
+#
 # USAGE: geturl.py FILE_OR_DIR1 FILE_OR_DIR2 ...
 #
 # prints out the URL associated with each item

Modified: subversion/branches/issue-3242-dev/tools/examples/headrev.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/headrev.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/headrev.c (original)
+++ subversion/branches/issue-3242-dev/tools/examples/headrev.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * headrev.c :  print out the HEAD revision of a repository.
  *
  * ====================================================================
- *    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/tools/examples/minimal_client.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/minimal_client.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/minimal_client.c (original)
+++ subversion/branches/issue-3242-dev/tools/examples/minimal_client.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * minimal_client.c  - a minimal Subversion client application ("hello world")
  *
  * ====================================================================
- *    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/tools/examples/putfile.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/putfile.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/putfile.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/putfile.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.
+#
+#
+#
 # USAGE: putfile.py [-m commitmsg] [-u username] file repos-path
 #
 # put a file into an SVN repository

Modified: subversion/branches/issue-3242-dev/tools/examples/revplist.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/revplist.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/revplist.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/revplist.py Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
 # revplist.py : display revision properties
 #
 ######################################################################
-#    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/tools/examples/svnlook.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/svnlook.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/svnlook.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/svnlook.py Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
 # svnlook.py : a Python-based replacement for svnlook
 #
 ######################################################################
-#    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/tools/examples/svnlook.rb
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/svnlook.rb?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/svnlook.rb (original)
+++ subversion/branches/issue-3242-dev/tools/examples/svnlook.rb Tue Dec 15 06:14:36 2009
@@ -3,10 +3,10 @@
 # svnlook.rb : a Ruby-based replacement for svnlook
 #
 ######################################################################
-#    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/tools/examples/svnput.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/svnput.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/svnput.c (original)
+++ subversion/branches/issue-3242-dev/tools/examples/svnput.c Tue Dec 15 06:14:36 2009
@@ -15,10 +15,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/tools/examples/svnserve-sgid.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/svnserve-sgid.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/svnserve-sgid.c (original)
+++ subversion/branches/issue-3242-dev/tools/examples/svnserve-sgid.c Tue Dec 15 06:14:36 2009
@@ -1,4 +1,25 @@
 /*
+ *
+ * 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.
+ *
+ */
+
+/*
  * Wrapper to run the svnserve process setgid.
  * The idea is to avoid the problem that some interpreters like bash
  * invoked by svnserve in hook scripts will reset the effective gid to

Modified: subversion/branches/issue-3242-dev/tools/examples/svnshell.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/svnshell.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/svnshell.py (original)
+++ subversion/branches/issue-3242-dev/tools/examples/svnshell.py Tue Dec 15 06:14:36 2009
@@ -4,10 +4,10 @@
 #               the filesystem.
 #
 ######################################################################
-#    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/tools/examples/svnshell.rb
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/svnshell.rb?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/svnshell.rb (original)
+++ subversion/branches/issue-3242-dev/tools/examples/svnshell.rb Tue Dec 15 06:14:36 2009
@@ -11,10 +11,10 @@
 # for details on how to install readline for Ruby.
 #
 ######################################################################
-#    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/tools/examples/testwrite.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/examples/testwrite.c?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/examples/testwrite.c (original)
+++ subversion/branches/issue-3242-dev/tools/examples/testwrite.c Tue Dec 15 06:14:36 2009
@@ -2,10 +2,10 @@
  * testwrite.c : test whether a user has commit access.
  *
  * ====================================================================
- *    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/tools/hook-scripts/commit-access-control.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/commit-access-control.pl.in?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/commit-access-control.pl.in (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/commit-access-control.pl.in Tue Dec 15 06:14:36 2009
@@ -14,10 +14,10 @@
 # Usage: commit-access-control.pl REPOS TXN-NAME CONF_FILE
 #    
 # ====================================================================
-#    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/tools/hook-scripts/log-police.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/log-police.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/log-police.py (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/log-police.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.
+#
+#
 
 # log-police.py: Ensure that log messages end with a single newline.
 # See usage() function for details, or just run with no arguments.

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/mailer.conf.example
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/mailer.conf.example?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/mailer.conf.example (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/mailer.conf.example Tue Dec 15 06:14:36 2009
@@ -35,15 +35,16 @@
 # Any sections other than [general], [defaults], [maps] and sections
 # referred to within [maps] are considered to be user-defined groups
 # which override values in the [defaults] section.
-# These groups are selected using the following two options:
+# These groups are selected using the following three options:
 #
 #   for_repos
 #   for_paths
+#   search_logmsg
 #
-# Both options specify a regular expression. The former is matched against
-# the absolute path to the repository the mailer is operating against. The
-# second is matched against *every* path (files and dirs) that was modified
-# during the commit.
+# Each option specifies a regular expression. for_repos is matched
+# against the absolute path to the repository the mailer is operating
+# against. for_paths is matched against *every* path (files and
+# dirs) that was modified during the commit.
 #
 # The options specified in the [defaults] section are always selected. The
 # presence of a non-matching for_repos has no relevance. Note that you may
@@ -62,6 +63,14 @@
 # none of the paths, even though its for_paths would have selected some of
 # the paths in the commit.
 #
+# search_logmsg specifies a regular expression to match against the
+# log message.  If the regular expression does not match the log
+# message, the group is not matched; if the regular expression matches
+# once, the group is used.  If there are multiple matches, each
+# successful match generates another group-match (this is useful if
+# "named groups" are used).  If search_logmsg is not used, no log
+# message filtering is performed.
+#
 # Groups are matched in no particular order. Do not depend upon their
 # order within this configuration file. The values from [defaults] will
 # be used if no group is matched or an option in a group does not override
@@ -111,6 +120,20 @@
 # If none of the groups match, but a for_paths is present in [defaults],
 # then its extracted names will be available.
 #
+# Further suppose you want to match bug-ids in log messages:
+#
+#   search_logmsg = (?P<bugid>(ProjA|ProjB)#\d)
+#
+# The bugids would be of the form ProjA#123 and ProjB#456.  In this
+# case, each time the regular expression matches, another match group
+# will be generated.  Thus, if you use:
+#
+#   commit_subject_prefix = %(bugid)s:
+#
+# Then, a log message such as "Fixes ProjA#123 and ProjB#234" would
+# match both bug-ids, and two emails would be generated - one with
+# subject "ProjA#123: <...>" and "ProjB#234: <...>".
+#
 # Note that each unique set of names for substitution will generate an
 # email. In the above example, if a commit modified files in all three
 # client subdirectories, then an email will be sent to all three commits@
@@ -329,3 +352,10 @@
 # for_repos = /home/(?P<who>[^/]*)/repos
 # to_addr = %(who)s@example.com
 #
+# [issuetracker]
+# search_logmsg = (?P<bugid>(?P<project>projecta|projectb|projectc)#\d+)
+# # (or, use a mapping if the bug-id to email address is not this trivial)
+# to_addr = %(project)s-tracker@example.com
+# commit_subject_prefix = %(bugid)s:
+# propchange_subject_prefix = %(bugid)s:
+

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/mailer.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/mailer.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/mailer.py (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/mailer.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.
+#
+#
 # -*- coding: utf-8 -*-
 #
 # mailer.py: send email describing a commit
@@ -328,10 +348,12 @@
 
     self.changelist = sorted(editor.get_changes().items())
 
+    log = repos.get_rev_prop(svn.core.SVN_PROP_REVISION_LOG) or ''
+
     # collect the set of groups and the unique sets of params for the options
     self.groups = { }
     for path, change in self.changelist:
-      for (group, params) in self.cfg.which_groups(path):
+      for (group, params) in self.cfg.which_groups(path, log):
         # turn the params into a hashable object and stash it away
         param_list = sorted(params.items())
         # collect the set of paths belonging to this group
@@ -402,7 +424,7 @@
 
     # collect the set of groups and the unique sets of params for the options
     self.groups = { }
-    for (group, params) in self.cfg.which_groups(''):
+    for (group, params) in self.cfg.which_groups('', None):
       # turn the params into a hashable object and stash it away
       param_list = sorted(params.items())
       self.groups[group, tuple(param_list)] = params
@@ -492,7 +514,7 @@
     # collect the set of groups and the unique sets of params for the options
     self.groups = { }
     for path in self.dirlist:
-      for (group, params) in self.cfg.which_groups(path):
+      for (group, params) in self.cfg.which_groups(path, None):
         # turn the params into a hashable object and stash it away
         param_list = sorted(params.items())
         # collect the set of paths belonging to this group
@@ -1243,32 +1265,56 @@
       else:
         exclude_paths_re = None
 
-      self._group_re.append((group, re.compile(for_paths),
-                             exclude_paths_re, params))
+      # check search_logmsg re
+      search_logmsg = getattr(sub, 'search_logmsg', None)
+      if search_logmsg is not None:
+        search_logmsg_re = re.compile(search_logmsg)
+      else:
+        search_logmsg_re = None
+
+      self._group_re.append((group,
+                             re.compile(for_paths),
+                             exclude_paths_re,
+                             params,
+                             search_logmsg_re))
 
     # after all the groups are done, add in the default group
     try:
       self._group_re.append((None,
                              re.compile(self.defaults.for_paths),
                              None,
-                             self._default_params))
+                             self._default_params,
+                             None))
     except AttributeError:
       # there is no self.defaults.for_paths
       pass
 
-  def which_groups(self, path):
+  def which_groups(self, path, logmsg):
     "Return the path's associated groups."
     groups = []
-    for group, pattern, exclude_pattern, repos_params in self._group_re:
+    for group, pattern, exclude_pattern, repos_params, search_logmsg_re in self._group_re:
       match = pattern.match(path)
       if match:
         if exclude_pattern and exclude_pattern.match(path):
           continue
         params = repos_params.copy()
         params.update(match.groupdict())
-        groups.append((group, params))
+
+        if search_logmsg_re is None:
+          groups.append((group, params))
+        else:
+          if logmsg is None:
+            logmsg = ''
+
+          for match in search_logmsg_re.finditer(logmsg):
+            # Add captured variables to (a copy of) params
+            msg_params = params.copy()
+            msg_params.update(match.groupdict())
+            groups.append((group, msg_params))
+
     if not groups:
       groups.append((None, self._default_params))
+
     return groups
 
 

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-init.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-init.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-init.sh (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-init.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.
+#
+#
+#
 # mailer-init.sh: create and initialize a repository for the mailer tests
 #
 # USAGE: ./mailer-init.sh
@@ -36,7 +56,7 @@
 svn ps prop1 propval1 file2
 svn ps prop3 propval3 dir1
 echo change C2 >> dir2/file5
-svn commit -m "two file changes"
+svn commit -m "two file changes.  Fixes Blah#123"
 
 # copy a file and a dir and change property
 svn cp file1 dir2/file7
@@ -64,7 +84,7 @@
 svn add file9
 svn mkdir dir4
 echo change C4 >> dir1/file3
-svn commit -m "mixed addition and change"
+svn commit -m "mixed addition and change.  Fixes Blaz#456 Blah#987"
 
 # add a file, add a dir, delete a file, delete a dir, and make a change
 echo file10 > dir1/file10

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-t1.output
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-t1.output?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-t1.output (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-t1.output Tue Dec 15 06:14:36 2009
@@ -152,24 +152,29 @@
 +++ file2	Sun Sep  9 01:46:40 2001	(r1)
 @@ -0,0 +1 @@
 +file2
-Group: file plus other areas
-Subject: r2 -  dir1 dir2
+Group: bugtracker
+Subject: Fix for Blah#123: r2 -  dir1 dir2
 
 Author: mailer test
 Date: Sun Sep  9 04:33:20 2001
 New Revision: 2
 
 Log:
-two file changes
+two file changes.  Fixes Blah#123
 
 Modified:
+   dir1/   (props changed)
+   dir2/file5
    file1   (props changed)
    file2   (contents, props changed)
 
-Changes in other areas also in this revision:
-Modified:
-   dir1/   (props changed)
-   dir2/file5
+Modified: dir2/file5
+==============================================================================
+--- dir2/file5	Sun Sep  9 01:46:40 2001	(r1)
++++ dir2/file5	Sun Sep  9 04:33:20 2001	(r2)
+@@ -1 +1,2 @@
+ file5
++change C2
 
 Modified: file2
 ==============================================================================
@@ -178,16 +183,6 @@
 @@ -1 +1,2 @@
  file2
 +change C1
-
-Diffs of changes in other areas also in this revision:
-
-Modified: dir2/file5
-==============================================================================
---- dir2/file5	Sun Sep  9 01:46:40 2001	(r1)
-+++ dir2/file5	Sun Sep  9 04:33:20 2001	(r2)
-@@ -1 +1,2 @@
- file5
-+change C2
 Group: All
 Subject: r2 -  dir1 dir2
 
@@ -196,7 +191,7 @@
 New Revision: 2
 
 Log:
-two file changes
+two file changes.  Fixes Blah#123
 
 Modified:
    dir1/   (props changed)
@@ -219,6 +214,42 @@
 @@ -1 +1,2 @@
  file2
 +change C1
+Group: file plus other areas
+Subject: r2 -  dir1 dir2
+
+Author: mailer test
+Date: Sun Sep  9 04:33:20 2001
+New Revision: 2
+
+Log:
+two file changes.  Fixes Blah#123
+
+Modified:
+   file1   (props changed)
+   file2   (contents, props changed)
+
+Changes in other areas also in this revision:
+Modified:
+   dir1/   (props changed)
+   dir2/file5
+
+Modified: file2
+==============================================================================
+--- file2	Sun Sep  9 01:46:40 2001	(r1)
++++ file2	Sun Sep  9 04:33:20 2001	(r2)
+@@ -1 +1,2 @@
+ file2
++change C1
+
+Diffs of changes in other areas also in this revision:
+
+Modified: dir2/file5
+==============================================================================
+--- dir2/file5	Sun Sep  9 01:46:40 2001	(r1)
++++ dir2/file5	Sun Sep  9 04:33:20 2001	(r2)
+@@ -1 +1,2 @@
+ file5
++change C2
 Group: file
 Subject: r2 -  dir1 dir2
 
@@ -227,7 +258,7 @@
 New Revision: 2
 
 Log:
-two file changes
+two file changes.  Fixes Blah#123
 
 Modified:
    file1   (props changed)
@@ -326,6 +357,25 @@
 
 Modified:
    file2   (props changed)
+Group: file
+Subject: r6 -  dir1 dir4
+
+Author: mailer test
+Date: Sun Sep  9 15:40:00 2001
+New Revision: 6
+
+Log:
+mixed addition and change.  Fixes Blaz#456 Blah#987
+
+Added:
+   file9
+
+Added: file9
+==============================================================================
+--- /dev/null	00:00:00 1970	(empty, because file is newly added)
++++ file9	Sun Sep  9 15:40:00 2001	(r6)
+@@ -0,0 +1 @@
++file9
 Group: file plus other areas
 Subject: r6 -  dir1 dir4
 
@@ -334,7 +384,7 @@
 New Revision: 6
 
 Log:
-mixed addition and change
+mixed addition and change.  Fixes Blaz#456 Blah#987
 
 Added:
    file9
@@ -369,7 +419,7 @@
 New Revision: 6
 
 Log:
-mixed addition and change
+mixed addition and change.  Fixes Blaz#456 Blah#987
 
 Added:
    dir4/
@@ -391,18 +441,59 @@
 +++ file9	Sun Sep  9 15:40:00 2001	(r6)
 @@ -0,0 +1 @@
 +file9
-Group: file
-Subject: r6 -  dir1 dir4
+Group: bugtracker
+Subject: Fix for Blah#987: r6 -  dir1 dir4
 
 Author: mailer test
 Date: Sun Sep  9 15:40:00 2001
 New Revision: 6
 
 Log:
-mixed addition and change
+mixed addition and change.  Fixes Blaz#456 Blah#987
 
 Added:
+   dir4/
    file9
+Modified:
+   dir1/file3
+
+Modified: dir1/file3
+==============================================================================
+--- dir1/file3	Sun Sep  9 12:53:20 2001	(r5)
++++ dir1/file3	Sun Sep  9 15:40:00 2001	(r6)
+@@ -1 +1,2 @@
+ file3
++change C4
+
+Added: file9
+==============================================================================
+--- /dev/null	00:00:00 1970	(empty, because file is newly added)
++++ file9	Sun Sep  9 15:40:00 2001	(r6)
+@@ -0,0 +1 @@
++file9
+Group: bugtracker
+Subject: Fix for Blaz#456: r6 -  dir1 dir4
+
+Author: mailer test
+Date: Sun Sep  9 15:40:00 2001
+New Revision: 6
+
+Log:
+mixed addition and change.  Fixes Blaz#456 Blah#987
+
+Added:
+   dir4/
+   file9
+Modified:
+   dir1/file3
+
+Modified: dir1/file3
+==============================================================================
+--- dir1/file3	Sun Sep  9 12:53:20 2001	(r5)
++++ dir1/file3	Sun Sep  9 15:40:00 2001	(r6)
+@@ -1 +1,2 @@
+ file3
++change C4
 
 Added: file9
 ==============================================================================

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-t1.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-t1.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-t1.sh (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-t1.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.
+#
+#
+#
 # mailer-t1.sh: test #1 for the mailer.py script
 #
 # This test generates "email" for each revision in the repository,

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-tweak.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-tweak.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-tweak.py (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer-tweak.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.
+#
+#
+#
 # mailer-tweak.py: tweak the svn:date and svn:author properties
 #                  on all revisions
 #

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer.conf
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer.conf?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer.conf (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/mailer/tests/mailer.conf Tue Dec 15 06:14:36 2009
@@ -338,3 +338,9 @@
 [file]
 for_paths = file.*
 show_nonmatching_paths = no
+
+[bugtracker]
+search_logmsg = (?P<bugid>(Blaz|Blah)#\d+)
+to_addr = issue-tracker@example.com
+commit_subject_prefix = Fix for %(bugid)s:
+

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/svn2feed.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/svn2feed.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/svn2feed.py (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/svn2feed.py Tue Dec 15 06:14:36 2009
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: 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/tools/hook-scripts/svnperms.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/svnperms.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/svnperms.py (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/svnperms.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.
+#
+#
 # -*- coding: utf-8 -*-
 
 # $HeadURL$

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/validate-extensions.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/validate-extensions.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/validate-extensions.py (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/validate-extensions.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.
+#
+#
 
 """\
 Check that any files pending commit into a Subversion repository have

Modified: subversion/branches/issue-3242-dev/tools/hook-scripts/verify-po.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/hook-scripts/verify-po.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/hook-scripts/verify-po.py (original)
+++ subversion/branches/issue-3242-dev/tools/hook-scripts/verify-po.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.
+#
+#
 """This is a pre-commit hook that checks whether the contents of PO files
 committed to the repository are encoded in UTF-8.
 """

Modified: subversion/branches/issue-3242-dev/tools/po/l10n-report.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/po/l10n-report.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/po/l10n-report.py (original)
+++ subversion/branches/issue-3242-dev/tools/po/l10n-report.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.
+#
+#
 
 """Usage: l10n-report.py [OPTION...]
 

Modified: subversion/branches/issue-3242-dev/tools/po/po-update.sh
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/po/po-update.sh?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/po/po-update.sh (original)
+++ subversion/branches/issue-3242-dev/tools/po/po-update.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.
+#
+#
+#
 # Usage:
 # ./po-update.sh pot
 #   - to generate just the pot file

Modified: subversion/branches/issue-3242-dev/tools/server-side/fsfs-reshard.py
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3242-dev/tools/server-side/fsfs-reshard.py?rev=890658&r1=890657&r2=890658&view=diff
==============================================================================
--- subversion/branches/issue-3242-dev/tools/server-side/fsfs-reshard.py (original)
+++ subversion/branches/issue-3242-dev/tools/server-side/fsfs-reshard.py Tue Dec 15 06:14:36 2009
@@ -28,10 +28,10 @@
 # intended to solve.
 #
 # ====================================================================
-#    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



Mime
View raw message