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 2010/03/16 16:22:30 UTC
svn commit: r923804 - in /subversion/branches/1.6.x: ./ contrib/cgi/
contrib/client-side/emacs/ contrib/hook-scripts/ contrib/server-side/
doc/user/ notes/ packages/windows-WiX/BuildSubversion/
packages/windows-innosetup/ subversion/bindings/javahl/nat...
Author: cmpilato
Date: Tue Mar 16 15:22:28 2010
New Revision: 923804
URL: http://svn.apache.org/viewvc?rev=923804&view=rev
Log:
Merge from trunk (with conflict resolution of both the textual and
tree varieties) r904301 and r904394:
* r904301, r904394
Update every occurence of the Subversion repository URL to apache.org,
except in CHANGES (for sentimental reasons, I guess).
Justification:
Tools and doc references should point at the new locations.
Notes:
Merge has a number of conflicts. Although singly they may be easy to
resolve, I recommend a backport branch because of the volume.
Votes:
+1: neels, cmpilato, rhuijben
Also:
* STATUS
Remove the related status item.
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/contrib/cgi/mirror_dir_through_svn.README
subversion/branches/1.6.x/contrib/client-side/emacs/psvn.el
subversion/branches/1.6.x/contrib/hook-scripts/commit-email.pl.in
subversion/branches/1.6.x/contrib/server-side/svn-fast-backup
subversion/branches/1.6.x/contrib/server-side/svnmirror-test.sh
subversion/branches/1.6.x/contrib/server-side/svnmirror.sh
subversion/branches/1.6.x/doc/user/cvs-crossover-guide.html
subversion/branches/1.6.x/notes/fs_dumprestore.txt
subversion/branches/1.6.x/notes/interactive-conflict-resolution.txt
subversion/branches/1.6.x/notes/object-model.txt
subversion/branches/1.6.x/packages/windows-WiX/BuildSubversion/Pre.rtf
subversion/branches/1.6.x/packages/windows-innosetup/Pre.rtf
subversion/branches/1.6.x/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
subversion/branches/1.6.x/subversion/bindings/swig/perl/native/Client.pm
subversion/branches/1.6.x/subversion/libsvn_repos/repos.c
subversion/branches/1.6.x/subversion/libsvn_wc/wc_db.h
subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
subversion/branches/1.6.x/subversion/tests/libsvn_subr/path-test.c
subversion/branches/1.6.x/tools/buildbot/slaves/README
subversion/branches/1.6.x/tools/client-side/change-svn-wc-format.py
subversion/branches/1.6.x/tools/client-side/svn-graph.pl
subversion/branches/1.6.x/tools/dev/contribulyze.py
subversion/branches/1.6.x/tools/dev/po-merge.py
subversion/branches/1.6.x/tools/dev/svn-merge-revs.py
subversion/branches/1.6.x/tools/dist/gen_nightly_ann.py
subversion/branches/1.6.x/www/design.html
subversion/branches/1.6.x/www/merge-tracking/func-spec.html
subversion/branches/1.6.x/www/merge-tracking/requirements.html
subversion/branches/1.6.x/www/merge-tracking/summit.html
subversion/branches/1.6.x/www/variance-adjusted-patching.html
subversion/branches/1.6.x/www/webdav-usage.html
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 15:22:28 2010
@@ -61,4 +61,4 @@
/subversion/branches/tc_url_rev:870696-870828
/subversion/branches/tree-conflicts:864636-869499
/subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,895514,895653,896522,898963,899826,899828,900797,901752,904594,905303,905326,906256,906305,917640,918211,922516
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,895514,895653,896522,898963,899826,899828,900797,901752,904301,904394,904594,905303,905326,906256,906305,917640,918211,922516
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 15:22:28 2010
@@ -60,4 +60,4 @@
/subversion/branches/tc_url_rev/CHANGES:870696-870828
/subversion/branches/tree-conflicts/CHANGES:864636-869499
/subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-901365,901752,904594,905303,905326,917640,918211,922516
+/subversion/trunk/CHANGES:875962-901365,901752,904301,904394,904594,905303,905326,917640,918211,922516
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Mar 16 15:22:28 2010
@@ -230,13 +230,3 @@ Approved changes:
Votes:
+1: pburba, rhuijben, cmpilato
-* r904301, r904394
- Update every occurence of the Subversion repository URL to apache.org,
- except in CHANGES (for sentimental reasons, I guess).
- Justification:
- Tools and doc references should point at the new locations.
- Notes:
- Merge has a number of conflicts. Although singly they may be easy to
- resolve, I recommend a backport branch because of the volume.
- Votes:
- +1: neels, cmpilato, rhuijben
Modified: subversion/branches/1.6.x/contrib/cgi/mirror_dir_through_svn.README
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/contrib/cgi/mirror_dir_through_svn.README?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/contrib/cgi/mirror_dir_through_svn.README (original)
+++ subversion/branches/1.6.x/contrib/cgi/mirror_dir_through_svn.README Tue Mar 16 15:22:28 2010
@@ -55,7 +55,7 @@ How to use it
1) Get a copy of svn_load_dirs.pl, revision 3787 or later. You can
find it in:
- http://svn.collab.net/repos/svn/trunk/tools/client-side/
+ http://svn.apache.org/repos/asf/subversion/trunk/tools/client-side/
2) Edit the configuration variables in mirror_dirs_through_svn.cgi so
it knows the location of svn, the location of svn_load_dirs.pl, the
Modified: subversion/branches/1.6.x/contrib/client-side/emacs/psvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/contrib/client-side/emacs/psvn.el?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/contrib/client-side/emacs/psvn.el (original)
+++ subversion/branches/1.6.x/contrib/client-side/emacs/psvn.el Tue Mar 16 15:22:28 2010
@@ -136,7 +136,7 @@
;; The latest version of psvn.el can be found at:
;; http://www.xsteve.at/prg/emacs/psvn.el
;; Or you can check it out from the subversion repository:
-;; svn co http://svn.collab.net/repos/svn/trunk/contrib/client-side/emacs emacs-svn
+;; svn co http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs emacs-svn
;; TODO:
;; * shortcut for svn propset svn:keywords "Date" psvn.el
@@ -1701,7 +1701,7 @@ The results are used to build the `svn-s
;; (message "Going to skip %s" skip-double-external-dir-entry-name)
nil)
((looking-at "--- Changelist") ; skip svn changelist header lines
- ;; See: http://svn.collab.net/repos/svn/trunk/notes/changelist-design.txt
+ ;; See: http://svn.apache.org/repos/asf/subversion/trunk/notes/changelist-design.txt
nil)
(t
(setq svn-marks (buffer-substring (point) (+ (point) svn-marks-length))
Modified: subversion/branches/1.6.x/contrib/hook-scripts/commit-email.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/contrib/hook-scripts/commit-email.pl.in?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/contrib/hook-scripts/commit-email.pl.in (original)
+++ subversion/branches/1.6.x/contrib/hook-scripts/commit-email.pl.in Tue Mar 16 15:22:28 2010
@@ -5,7 +5,7 @@
# using mailer.py for post-commit and post-revprop change
# notifications. If you wish to improve or add features to a
# post-commit notification script, please do that work on mailer.py.
-# See http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/mailer .
+# See http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/mailer .
# ====================================================================
# ====================================================================
Modified: subversion/branches/1.6.x/contrib/server-side/svn-fast-backup
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/contrib/server-side/svn-fast-backup?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/contrib/server-side/svn-fast-backup (original)
+++ subversion/branches/1.6.x/contrib/server-side/svn-fast-backup Tue Mar 16 15:22:28 2010
@@ -251,7 +251,7 @@ def do_rsync_backup():
### Use rsync to make a copy.
# We need to copy the 'current' file first.
# Don't copy the transactions/ directory.
- # See http://svn.collab.net/repos/svn/trunk/notes/fsfs
+ # See http://svn.apache.org/repos/asf/subversion/trunk/notes/fsfs
rsync_dest = os.path.join(backup_tmpdir,'')
Modified: subversion/branches/1.6.x/contrib/server-side/svnmirror-test.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/contrib/server-side/svnmirror-test.sh?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/contrib/server-side/svnmirror-test.sh (original)
+++ subversion/branches/1.6.x/contrib/server-side/svnmirror-test.sh Tue Mar 16 15:22:28 2010
@@ -7,7 +7,7 @@
#
# License:
# The same as svn itself. for latest version check:
-# http://svn.collab.net/repos/svn/trunk/subversion/LICENSE
+# http://svn.apache.org/repos/asf/subversion/trunk/subversion/LICENSE
#
#######################################################################
Modified: subversion/branches/1.6.x/contrib/server-side/svnmirror.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/contrib/server-side/svnmirror.sh?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/contrib/server-side/svnmirror.sh (original)
+++ subversion/branches/1.6.x/contrib/server-side/svnmirror.sh Tue Mar 16 15:22:28 2010
@@ -65,14 +65,14 @@ VERSION="0.0.7"
#
# License:
# The same as svn itself. for latest version check:
-# http://svn.collab.net/repos/svn/trunk/subversion/LICENSE
+# http://svn.apache.org/repos/asf/subversion/trunk/subversion/LICENSE
#
# Thanks to the subversion team for their great work.
#
# Links:
# If you do not like our solution check:
# - svnpush
-# + http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn-push/svn-push.c
+# + http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svn-push/svn-push.c
# - svn replicate
# + https://open.datacore.ch/read-only/
# - SVN::Mirror and SVN::Web
Modified: subversion/branches/1.6.x/doc/user/cvs-crossover-guide.html
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/doc/user/cvs-crossover-guide.html?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/doc/user/cvs-crossover-guide.html (original)
+++ subversion/branches/1.6.x/doc/user/cvs-crossover-guide.html Tue Mar 16 15:22:28 2010
@@ -784,7 +784,7 @@ different convention altogether.</p>
<p>As an example, you can see all of Subversion's tags by running:</p>
<pre>
- $ svn ls --verbose http://svn.collab.net/repos/svn/tags
+ $ svn ls --verbose http://svn.apache.org/repos/asf/subversion/tags
…
7739 kfogel Nov 13 22:05 0.33.0/
7796 josander Nov 18 12:15 0.33.1/
Modified: subversion/branches/1.6.x/notes/fs_dumprestore.txt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/notes/fs_dumprestore.txt?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/notes/fs_dumprestore.txt (original)
+++ subversion/branches/1.6.x/notes/fs_dumprestore.txt Tue Mar 16 15:22:28 2010
@@ -1,5 +1,5 @@
This document has been moved to:
- http://svn.collab.net/repos/svn/trunk/notes/dump-load-format.txt
+ http://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt
(This forwarding pointer is just for link-compatibility.)
Modified: subversion/branches/1.6.x/notes/interactive-conflict-resolution.txt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/notes/interactive-conflict-resolution.txt?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/notes/interactive-conflict-resolution.txt (original)
+++ subversion/branches/1.6.x/notes/interactive-conflict-resolution.txt Tue Mar 16 15:22:28 2010
@@ -63,5 +63,5 @@ So your conflict-callback is going to ha
-> CLI simply says, "You want to delete the prop, they want to
set its value to blah." No other diff offered.
-http://svn.collab.net/repos/svn/trunk/subversion/svn/conflict-callbacks.c
+http://svn.apache.org/repos/asf/subversion/trunk/subversion/svn/conflict-callbacks.c
contains the conflict resolution callback for the command-line client.
Modified: subversion/branches/1.6.x/notes/object-model.txt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/notes/object-model.txt?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/notes/object-model.txt (original)
+++ subversion/branches/1.6.x/notes/object-model.txt Tue Mar 16 15:22:28 2010
@@ -167,4 +167,4 @@ Notes
[6] http://www.wxwidgets.org/
[7] http://mapserver.gis.umn.edu/
[8] http://svn.haxx.se/dev/archive-2003-10/0215.shtml
-[9] http://svn.collab.net/repos/svn/branches/ctypes-python-bindings/
+[9] http://svn.apache.org/repos/asf/subversion/branches/ctypes-python-bindings/
Modified: subversion/branches/1.6.x/packages/windows-WiX/BuildSubversion/Pre.rtf
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/packages/windows-WiX/BuildSubversion/Pre.rtf?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
Binary files - no diff available.
Modified: subversion/branches/1.6.x/packages/windows-innosetup/Pre.rtf
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/packages/windows-innosetup/Pre.rtf?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/packages/windows-innosetup/Pre.rtf (original)
+++ subversion/branches/1.6.x/packages/windows-innosetup/Pre.rtf Tue Mar 16 15:22:28 2010
@@ -5,7 +5,7 @@ Subversion is a compelling replacement f
\par
See:\par
http://subversion.tigris.org/ and\par
- http://svn.collab.net/repos/svn/trunk/CHANGES for more info.\par
+ http://svn.apache.org/repos/asf/subversion/trunk/CHANGES for more info.\par
\par
Subversion is using some external programs and libraries included in this package.\par
The proper licenses are in the licenses folder in the application path created after this installation.\par
Modified: subversion/branches/1.6.x/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/bindings/javahl/native/JNIUtil.cpp?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/1.6.x/subversion/bindings/javahl/native/JNIUtil.cpp Tue Mar 16 15:22:28 2010
@@ -234,7 +234,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
g_pool = svn_pool_create(NULL);
#if defined(WIN32) || defined(__CYGWIN__)
- /* See http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt */
+ /* See http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt */
/* ### This code really only needs to be invoked by consumers of
### the libsvn_wc library, which basically means SVNClient. */
if (getenv ("SVN_ASP_DOT_NET_HACK"))
Modified: subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java (original)
+++ subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java Tue Mar 16 15:22:28 2010
@@ -42,7 +42,7 @@ public interface SVNClientInterface
* @return The name of the working copy's administrative
* directory, which is usually <code>.svn</code>.
* @see <a
- * href="http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt">
+ * href="http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt">
* Instructions on changing this as a work-around for the behavior of
* ASP.Net on Windows.</a>
* @since 1.3
Modified: subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java (original)
+++ subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java Tue Mar 16 15:22:28 2010
@@ -70,7 +70,7 @@ public class SVNClientSynchronized imple
* @return The name of the working copy's administrative
* directory, which is usually <code>.svn</code>.
* @see <a
- * href="http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt">
+ * href="http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt">
* Instructions on changing this as a work-around for the behavior of
* ASP.Net on Windows.</a>
* @since 1.3
Modified: subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java (original)
+++ subversion/branches/1.6.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java Tue Mar 16 15:22:28 2010
@@ -21,7 +21,7 @@ package org.tigris.subversion.javahl;
/**
* Encapsulates version information about the underlying native
* libraries. Basically a wrapper for <a
- * href="http://svn.collab.net/repos/svn/trunk/subversion/include/svn_version.h"><code>svn_version.h</code></a>.
+ * href="http://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_version.h"><code>svn_version.h</code></a>.
*/
public class Version
{
Modified: subversion/branches/1.6.x/subversion/bindings/swig/perl/native/Client.pm
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/bindings/swig/perl/native/Client.pm?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/bindings/swig/perl/native/Client.pm (original)
+++ subversion/branches/1.6.x/subversion/bindings/swig/perl/native/Client.pm Tue Mar 16 15:22:28 2010
@@ -46,7 +46,7 @@ SVN::Client - Subversion client function
SVN::Client::get_username_provider()]
);
- $ctx->cat (\*STDOUT, 'http://svn.collab.net/repos/svn/trunk/README',
+ $ctx->cat (\*STDOUT, 'http://svn.apache.org/repos/asf/subversion/trunk/README',
'HEAD');
sub simple_prompt {
Modified: subversion/branches/1.6.x/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_repos/repos.c?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_repos/repos.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_repos/repos.c Tue Mar 16 15:22:28 2010
@@ -267,8 +267,8 @@ create_locks(svn_repos_t *repos, apr_poo
#define PREWRITTEN_HOOKS_TEXT \
"# For more examples and pre-written hooks, see those in" NL \
"# the Subversion repository at" NL \
- "# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and" NL \
- "# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/" NL
+ "# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and" NL \
+ "# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/" NL
static svn_error_t *
Modified: subversion/branches/1.6.x/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_wc/wc_db.h?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/branches/1.6.x/subversion/libsvn_wc/wc_db.h Tue Mar 16 15:22:28 2010
@@ -238,7 +238,7 @@ svn_wc__db_close(svn_wc__db_t *db,
* Different kind of trees
*
* The design doc mentions three different kinds of trees, BASE, WORKING and
- * ACTUAL: http://svn.collab.net/repos/svn/trunk/notes/wc-ng-design
+ * ACTUAL: http://svn.apache.org/repos/asf/subversion/trunk/notes/wc-ng-design
* We have different APIs to handle each tree, enumerated below, along with
* a blurb to explain what that tree represents.
*/
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py Tue Mar 16 15:22:28 2010
@@ -14646,8 +14646,8 @@ def merge_range_prior_to_rename_source_e
"merge prior to rename src existence still dels src"
# Replicate a merge bug found while synching up a feature branch on the
- # Subversion repository with trunk. See r34047 of
- # http://svn.collab.net/repos/svn/branches/ignore-mergeinfo, in which
+ # Subversion repository with trunk. See r874121 of
+ # http://svn.apache.org/repos/asf/subversion/branches/ignore-mergeinfo, in which
# a move was merged to the target, but the delete half of the move
# didn't occur.
Modified: subversion/branches/1.6.x/subversion/tests/libsvn_subr/path-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/libsvn_subr/path-test.c?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/libsvn_subr/path-test.c (original)
+++ subversion/branches/1.6.x/subversion/tests/libsvn_subr/path-test.c Tue Mar 16 15:22:28 2010
@@ -171,7 +171,7 @@ test_path_is_url(const char **msg,
{ "//blah/blah", FALSE },
{ "://blah/blah", FALSE },
{ "a:abb://boo/", FALSE },
- { "http://svn.collab.net/repos/svn", TRUE },
+ { "http://svn.apache.org/repos/asf/subversion", TRUE },
{ "scheme/with", FALSE },
{ "scheme/with:", FALSE },
{ "scheme/with:/", FALSE },
Modified: subversion/branches/1.6.x/tools/buildbot/slaves/README
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/tools/buildbot/slaves/README?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/tools/buildbot/slaves/README (original)
+++ subversion/branches/1.6.x/tools/buildbot/slaves/README Tue Mar 16 15:22:28 2010
@@ -57,7 +57,7 @@ slavedir/[botname] folder.
You can copy and reuse the scripts the other buildbot slave owners use for
Windows, Linux or Mac buildslaves. You can find them here:
-http://svn.collab.net/repos/svn/trunk/tools/buildbot/slaves
+http://svn.apache.org/repos/asf/subversion/trunk/tools/buildbot/slaves
4. Builds
---------
Modified: subversion/branches/1.6.x/tools/client-side/change-svn-wc-format.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/tools/client-side/change-svn-wc-format.py?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/tools/client-side/change-svn-wc-format.py (original)
+++ subversion/branches/1.6.x/tools/client-side/change-svn-wc-format.py Tue Mar 16 15:22:28 2010
@@ -59,7 +59,7 @@ Change the format of a Subversion workin
def get_adm_dir():
"""Return the name of Subversion's administrative directory,
adjusted for the SVN_ASP_DOT_NET_HACK environment variable. See
- <http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt>
+ <http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt>
for details."""
return "SVN_ASP_DOT_NET_HACK" in os.environ and "_svn" or ".svn"
Modified: subversion/branches/1.6.x/tools/client-side/svn-graph.pl
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/tools/client-side/svn-graph.pl?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/tools/client-side/svn-graph.pl (original)
+++ subversion/branches/1.6.x/tools/client-side/svn-graph.pl Tue Mar 16 15:22:28 2010
@@ -42,7 +42,7 @@ require SVN::Ra;
require SVN::Client;
# The URL of the Subversion repository we wish to graph
-# (e.g. "http://svn.collab.net/repos/svn").
+# (e.g. "http://svn.apache.org/repos/asf/subversion").
my $repos_url;
# The revision range we operate on, from $startrev -> $youngest.
Modified: subversion/branches/1.6.x/tools/dev/contribulyze.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/tools/dev/contribulyze.py?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/tools/dev/contribulyze.py (original)
+++ subversion/branches/1.6.x/tools/dev/contribulyze.py Tue Mar 16 15:22:28 2010
@@ -606,14 +606,14 @@ index_introduction = '''
<p>The following list of contributors and their contributions is meant
to help us keep track of whom to consider for commit access. The list
was generated from "svn log" output by <a
-href="http://svn.collab.net/repos/svn/trunk/tools/dev/contribulyze.py"
+href="http://svn.apache.org/repos/asf/subversion/trunk/tools/dev/contribulyze.py"
>contribulyze.py</a>, which looks for log messages that use the <a
href="http://subversion.tigris.org/hacking.html#crediting">special
contribution format</a>.</p>
<p><i>Please do not use this list as a generic guide to who has
contributed what to Subversion!</i> It omits existing <a
-href="http://svn.collab.net/repos/svn/trunk/COMMITTERS"
+href="http://svn.apache.org/repos/asf/subversion/trunk/COMMITTERS"
>full committers</a>, for example, because they are irrelevant to our
search for new committers. Also, it merely counts changes, it does
not evaluate them. To truly understand what someone has contributed,
Modified: subversion/branches/1.6.x/tools/dev/po-merge.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/tools/dev/po-merge.py?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/tools/dev/po-merge.py (original)
+++ subversion/branches/1.6.x/tools/dev/po-merge.py Tue Mar 16 15:22:28 2010
@@ -103,7 +103,7 @@ def main(argv):
'A backup copy of lang.po is saved as lang.po.bak.\n'
'\n'
'Example:\n'
- ' svn cat http://svn.collab.net/repos/svn/trunk/subversion/po/sv.po | \\\n'
+ ' svn cat http://svn.apache.org/repos/asf/subversion/trunk/subversion/po/sv.po | \\\n'
' %s sv.po' % (argv0, argv0))
# Read the source po file into a hash
Modified: subversion/branches/1.6.x/tools/dev/svn-merge-revs.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/tools/dev/svn-merge-revs.py?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/tools/dev/svn-merge-revs.py (original)
+++ subversion/branches/1.6.x/tools/dev/svn-merge-revs.py Tue Mar 16 15:22:28 2010
@@ -24,10 +24,10 @@ revision that was merged, and the diff f
Examples:
- %s http://svn.collab.net/repos/svn/trunk svn-1.2.x-branch \
+ %s http://svn.apache.org/repos/asf/subversion/trunk svn-1.2.x-branch \
r14041, r14149, r14186, r14194, r14238, r14273
- %s http://svn.collab.net/repos/svn/trunk svn-1.2.x-branch \
+ %s http://svn.apache.org/repos/asf/subversion/trunk svn-1.2.x-branch \
14041 14149 14186 14194 14238 14273""" % (progname, progname)
print(val)
Modified: subversion/branches/1.6.x/tools/dist/gen_nightly_ann.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/tools/dist/gen_nightly_ann.py?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/tools/dist/gen_nightly_ann.py (original)
+++ subversion/branches/1.6.x/tools/dist/gen_nightly_ann.py Tue Mar 16 15:22:28 2010
@@ -15,7 +15,7 @@ webpagetext = '''<!DOCTYPE html PUBLIC "
nightly release of Subversion 1.5.x (r%d).</p>
<p>This distribution is automatically generated from the latest sources on the
-<a href="http://svn.collab.net/repos/svn/branches/1.5.x">1.5.x branch</a>. It
+<a href="http://svn.apache.org/repos/asf/subversion/branches/1.5.x">1.5.x branch</a>. It
may not even compile, and is certainly <i>not</i> suitable for any sort of
production use. This distribution has not been tested, and may cause any
number of problems, up to and including death and bodily injury. Only use this
Modified: subversion/branches/1.6.x/www/design.html
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/www/design.html?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/www/design.html (original)
+++ subversion/branches/1.6.x/www/design.html Tue Mar 16 15:22:28 2010
@@ -2286,7 +2286,7 @@ write/Makefile:6
<p>For a detailed description of exactly how Greg Stein
<em class="email">gstein@lyra.org</em> is mapping the WebDAV DeltaV spec to
- Subversion, see his paper: <a href="http://svn.collab.net/repos/svn/trunk/www/webdav-usage.html">http://svn.collab.net/repos/svn/trunk/www/webdav-usage.html</a>
+ Subversion, see his paper: <a href="http://svn.apache.org/repos/asf/subversion/trunk/www/webdav-usage.html">http://svn.apache.org/repos/asf/subversion/trunk/www/webdav-usage.html</a>
</p>
<p>For more information on WebDAV and the DeltaV extensions, see
@@ -2304,7 +2304,7 @@ write/Makefile:6
<p>The client library <tt class="literal">libsvn_ra_svn</tt> and standalone
server program <tt class="literal">svnserve</tt> implement a custom protocol
- over TCP. This protocol is documented at <a href="http://svn.collab.net/repos/svn/trunk/subversion/libsvn_ra_svn/protocol">http://svn.collab.net/repos/svn/trunk/subversion/libsvn_ra_svn/protocol</a>.</p>
+ over TCP. This protocol is documented at <a href="http://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_ra_svn/protocol">http://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_ra_svn/protocol</a>.</p>
</div> <!-- protocol.svn (h3) -->
</div> <!-- protocol (h2) -->
Modified: subversion/branches/1.6.x/www/merge-tracking/func-spec.html
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/www/merge-tracking/func-spec.html?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/www/merge-tracking/func-spec.html (original)
+++ subversion/branches/1.6.x/www/merge-tracking/func-spec.html Tue Mar 16 15:22:28 2010
@@ -786,7 +786,7 @@ href="requirements.html#repeated-merge">
have already been applied to a merge target or its children. After a
conflict is encountered, merges of subsequent revision ranges must be
aborted, since <a
-href="http://svn.collab.net/repos/svn/trunk/notes/tree-conflicts.txt"
+href="http://svn.apache.org/repos/asf/subversion/trunk/notes/tree-conflicts.txt"
>tree conflicts</a> or previous content conflicts cannot be reliably
merged into (e.g. you can't merge into a file that either isn't there
or which you could potentially merge inside one side of a conflict
@@ -950,7 +950,7 @@ versions of Subversion.</p>
</li>
<li><a
- href="http://svn.collab.net/repos/svn/trunk/subversion/libsvn_fs_base/notes/structure">Structure
+ href="http://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_fs_base/notes/structure">Structure
of the Subversion FS BerkeleyDB backend</a></li>
</ul>
Modified: subversion/branches/1.6.x/www/merge-tracking/requirements.html
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/www/merge-tracking/requirements.html?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/www/merge-tracking/requirements.html (original)
+++ subversion/branches/1.6.x/www/merge-tracking/requirements.html Tue Mar 16 15:22:28 2010
@@ -388,7 +388,7 @@ href="http://subversion.tigris.org/issue
<h4>User Interface Ease in Common Cases</h4>
<p>(This was one of the points made at the <a
-href="http://svn.collab.net/repos/svn/trunk/notes/EuroOSCON-2005-vc-bof.txt"
+href="http://svn.apache.org/repos/asf/subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt"
>EuroOSCON 2005 Version Control BOF session</a>.)</p>
<p>The interface for common-case merges should be easy. Currently it
@@ -509,7 +509,7 @@ a release branch.</p>
>CollabNet customer Merge Tracking Summit</a></li>
<li><a
- href="http://svn.collab.net/repos/svn/trunk/notes/schema-tradeoffs.txt"
+ href="http://svn.apache.org/repos/asf/subversion/trunk/notes/schema-tradeoffs.txt"
>schema-tradeoffs.txt</a>: Search for the section called "Questions
that Users Ask".</li>
Modified: subversion/branches/1.6.x/www/merge-tracking/summit.html
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/www/merge-tracking/summit.html?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/www/merge-tracking/summit.html (original)
+++ subversion/branches/1.6.x/www/merge-tracking/summit.html Tue Mar 16 15:22:28 2010
@@ -78,7 +78,7 @@ the average user needs.</p>
unique object identifier, more than we offer so far. This desire
was also noted at the
<a
- href="http://svn.collab.net/repos/svn/trunk/notes/EuroOSCON-2005-vc-bof.txt"
+ href="http://svn.apache.org/repos/asf/subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt"
>EuroOSCON 2005 Version Control BOF session</a>, search for
"What branches/tags is this version of this file present in?".</p></li>
@@ -94,7 +94,7 @@ the average user needs.</p>
<p>The exact same desire was expressed at the
<a
- href="http://svn.collab.net/repos/svn/trunk/notes/EuroOSCON-2005-vc-bof.txt"
+ href="http://svn.apache.org/repos/asf/subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt"
>EuroOSCON 2005 Version Control BOF session</a>, see the item
containing the string "find my descendants" in that document.</p></li>
@@ -113,7 +113,7 @@ the average user needs.</p>
useful. Programmatic parsability was not a high priority,
however. An extended patch program was not considered crucial. The
desire for a "Smart patch format" was also noted at the <a
- href="http://svn.collab.net/repos/svn/trunk/notes/EuroOSCON-2005-vc-bof.txt"
+ href="http://svn.apache.org/repos/asf/subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt"
>EuroOSCON 2005 Version Control BOF session</a>.</p></li>
<li><p>Visual interfaces to branch/merge management are <em>very</em>
@@ -123,7 +123,7 @@ the average user needs.</p>
cited as an excellent example of a tool providing the merge
managment portion of this type of UI. The need for GUI interfaces
to branch topology was also discussed at the <a
- href="http://svn.collab.net/repos/svn/trunk/notes/EuroOSCON-2005-vc-bof.txt"
+ href="http://svn.apache.org/repos/asf/subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt"
>EuroOSCON 2005 Version Control BOF session</a>, search for
"display topology". TODO: Follow-up sessions via WebEx will add
more detail here.</p></li>
@@ -176,7 +176,7 @@ the average user needs.</p>
<a href="http://subversion.tigris.org/issues/show_bug.cgi?id=2286"
>issue #2286</a>. It was also expressed at the
<a
- href="http://svn.collab.net/repos/svn/trunk/notes/EuroOSCON-2005-vc-bof.txt"
+ href="http://svn.apache.org/repos/asf/subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt"
>EuroOSCON 2005 Version Control BOF session</a>, search for "The
One-File-In-Many-Branches Problem" there, which discusses
how p4 and ClearCase do this.</p></li>
Modified: subversion/branches/1.6.x/www/variance-adjusted-patching.html
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/www/variance-adjusted-patching.html?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/www/variance-adjusted-patching.html (original)
+++ subversion/branches/1.6.x/www/variance-adjusted-patching.html Tue Mar 16 15:22:28 2010
@@ -21,7 +21,7 @@
<p>Date of First Publication: 22 May, 2001</p>
<p>$LastChangedDate$<br />
-Canonical URL: <a href="http://svn.collab.net/repos/svn/trunk/www/variance-adjusted-patching.html">http://svn.collab.net/repos/svn/trunk/www/variance-adjusted-patching.html</a></p>
+Canonical URL: <a href="http://svn.apache.org/repos/asf/subversion/trunk/www/variance-adjusted-patching.html">http://svn.apache.org/repos/asf/subversion/trunk/www/variance-adjusted-patching.html</a></p>
<hr /> <!-- ====================================================== -->
Modified: subversion/branches/1.6.x/www/webdav-usage.html
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/www/webdav-usage.html?rev=923804&r1=923803&r2=923804&view=diff
==============================================================================
--- subversion/branches/1.6.x/www/webdav-usage.html (original)
+++ subversion/branches/1.6.x/www/webdav-usage.html Tue Mar 16 15:22:28 2010
@@ -1176,7 +1176,7 @@ property for each
<blockquote>
<p>For example, take a
look at:
- <a href="http://svn.collab.net/repos/svn/trunk/README">http://svn.collab.net/repos/svn/trunk/README</a>
+ <a href="http://svn.apache.org/repos/asf/subversion/trunk/README">http://svn.apache.org/repos/asf/subversion/trunk/README</a>
(that's the HEAD right there; we also have URLs for every
previous revision of every file)</p>
</blockquote>