Re: svn commit: r1134489 - /subversion/trunk/tools/dist/release.py
hwri...@apache.org wrote on Sat, Jun 11, 2011 at 00:14:03 -: > +# About this script: > +# This script is intended to simplify creating Subversion releases, by > +# automating as much as is possible. It works well with our Apache > +# infrastructure, and should make rolling, posting, and announcing > +# releases dirt simple. > +# > +# This script may be run on a number of platforms, but it is intended to > +# be run on people.apache.org. As such, it may have dependencies (such > +# as Python version) which may not be common, but are guaranteed to be > +# available on people.apache.org. Why does the script need to be run on people.a.o? Infra hat on, unless there is a good reason, please use some other a.o box for this (eg subversion.zones.a.o, also FreeBSD). Also: why does the script need to be run on a.o hardware? (rather than on the release manager's hardware) Using a.o hardware has implications on trusting the resulting tarballs in case people.a.o gets broken into.
svn commit: r1134493 - /subversion/trunk/tools/dist/construct-rolling-environment.sh
Author: arfrever
Date: Sat Jun 11 00:38:04 2011
New Revision: 1134493
URL: http://svn.apache.org/viewvc?rev=1134493&view=rev
Log:
Follow-up to r1134075:
* tools/dist/construct-rolling-environment.sh: Disable support for PCRE in SWIG
to work around build failure on misconfigured buildbot.
Modified:
subversion/trunk/tools/dist/construct-rolling-environment.sh
Modified: subversion/trunk/tools/dist/construct-rolling-environment.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/construct-rolling-environment.sh?rev=1134493&r1=1134492&r2=1134493&view=diff
==
--- subversion/trunk/tools/dist/construct-rolling-environment.sh (original)
+++ subversion/trunk/tools/dist/construct-rolling-environment.sh Sat Jun 11
00:38:04 2011
@@ -98,7 +98,7 @@ create_prefix() {
tar zxvf $SWIG.tar.gz
cd $SWIG
-./configure --prefix=$PREFIX
+./configure --prefix=$PREFIX --without-pcre
make
make install
cd ..
svn commit: r1134489 - /subversion/trunk/tools/dist/release.py
Author: hwright
Date: Sat Jun 11 00:14:03 2011
New Revision: 1134489
URL: http://svn.apache.org/viewvc?rev=1134489&view=rev
Log:
The first bits of a script to handle releases. This is far from finished,
but should eventually supplant construct-rolling-environment.sh, dist.sh,
roll.sh, getsigs.py, and a whole host of other manual steps.
Improvements welcomed.
* tools/dist/release.py:
New.
Added:
subversion/trunk/tools/dist/release.py (with props)
Added: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1134489&view=auto
==
--- subversion/trunk/tools/dist/release.py (added)
+++ subversion/trunk/tools/dist/release.py Sat Jun 11 00:14:03 2011
@@ -0,0 +1,136 @@
+#!/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.
+#
+
+
+# About this script:
+# This script is intended to simplify creating Subversion releases, by
+# automating as much as is possible. It works well with our Apache
+# infrastructure, and should make rolling, posting, and announcing
+# releases dirt simple.
+#
+# This script may be run on a number of platforms, but it is intended to
+# be run on people.apache.org. As such, it may have dependencies (such
+# as Python version) which may not be common, but are guaranteed to be
+# available on people.apache.org.
+
+
+# Stuff we need
+import os
+import sys
+import shutil
+import urllib2
+import argparse # standard in Python 2.7
+
+
+def get_prefix(base_dir):
+return os.path.join(base_dir, 'prefix')
+
+def get_tempdir(base_dir):
+return os.path.join(base_dir, 'tempdir')
+
+
+def cleanup(base_dir):
+'Remove generated files and folders.'
+
+shutil.rmtree(get_prefix(base_dir), True)
+shutil.rmtree(get_tempdir(base_dir), True)
+
+
+def build_env(base_dir, args):
+'Download prerequisites for a release and prepare the environment.'
+
+# Versions of our environment
+params = { 'autoconf' : 'autoconf-2.68',
+ 'libtool': 'libtool-2.4',
+ 'swig' : 'swig-2.0.4',
+ 'sf_mirror' : args.sf_mirror,
+ }
+
+prefix = get_prefix(base_dir)
+if os.path.exists(prefix):
+raise RuntimeError("Directory exists: '%s'" % prefix)
+os.mkdir(prefix)
+
+tempdir = get_tempdir(base_dir)
+if os.path.exists(tempdir):
+raise RuntimeError("Directory exists: '%s'" % tempdir)
+os.mkdir(tempdir)
+
+objects = { 'autoconf' :
'http://ftp.gnu.org/gnu/autoconf/%(autoconf)s.tar.gz',
+'libtool' :
'http://ftp.gnu.org/gnu/libtool/%(libtool)s.tar.gz',
+'swig' :
'http://sourceforge.net/projects/swig/files/swig/%(swig)s/%(swig)s.tar.gz/download?use_mirror=%(sf_mirror)s'
+ }
+
+# Grab each of the prerequisite tarballs
+for key, value in objects.items():
+url = value % params
+response = urllib2.urlopen(url)
+target = open(os.path.join(get_tempdir(base_dir), key + '.tar.gz'),
'w')
+target.write(response.read())
+
+
+def roll_tarballs(base_dir, args):
+'Create the release artifacts.'
+
+
+def announce(base_dir, args):
+'Write the release announcement.'
+
+
+def main():
+'Parse arguments, and drive the appropriate subcommand.'
+
+# Setup our main parser
+parser = argparse.ArgumentParser(
+description='Create an Apache Subversion release.')
+parser.add_argument('--clean', action='store_true', default=False,
+ help='Remove any directories previously created by
%(prog)s')
+parser.add_argument('--base-dir', default=os.getcwd(),
+ help='''The directory in which to create needed files and
+ folders. The default is the current working
+ directory.''')
+subparsers = parser.add_subparsers(title='subcommands')
+
+# Setup the parser for the build-env subcommand
+build_env_parser = subparsers.add_parser('build-env',
+help='''Download release prerequisistes, including
autoconf,
+
svn propchange: r1134488 - svn:log
Author: danielsh Revision: 1134488 Modified property: svn:log Modified: svn:log at Sat Jun 11 00:06:41 2011 -- --- svn:log (original) +++ svn:log Sat Jun 11 00:06:41 2011 @@ -1,2 +1,2 @@ * subversion/include/svn_error.h - (svn_error_find_cause): Fix the docstring's error-clearing instructions. + (svn_error_find_cause): Clarify the docstring's error-clearing instructions.
svn commit: r1134488 - /subversion/trunk/subversion/include/svn_error.h
Author: danielsh Date: Fri Jun 10 23:58:36 2011 New Revision: 1134488 URL: http://svn.apache.org/viewvc?rev=1134488&view=rev Log: * subversion/include/svn_error.h (svn_error_find_cause): Fix the docstring's error-clearing instructions. Modified: subversion/trunk/subversion/include/svn_error.h Modified: subversion/trunk/subversion/include/svn_error.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error.h?rev=1134488&r1=1134487&r2=1134488&view=diff == --- subversion/trunk/subversion/include/svn_error.h (original) +++ subversion/trunk/subversion/include/svn_error.h Fri Jun 10 23:58:36 2011 @@ -180,9 +180,8 @@ svn_error_t * svn_error_root_cause(svn_error_t *err); /** Return the first error in @a err's chain that has an error code @a - * apr_err or #SVN_NO_ERROR if there is no error with that code. @a - * err should *not* be cleared as the returned error shares memory - * with @a err. + * apr_err or #SVN_NO_ERROR if there is no error with that code. The + * returned error should @em not be cleared as it shares memory with @a err. * * If @a err is #SVN_NO_ERROR, return #SVN_NO_ERROR. *
Re: svn commit: r1129641 - in /subversion/trunk/subversion: include/private/svn_fs_util.h libsvn_fs/fs-loader.c libsvn_repos/dump.c tests/cmdline/svnadmin_tests.py
Daniel Shahaf wrote on Sat, Jun 11, 2011 at 00:01:18 +0300: > s...@apache.org wrote on Tue, May 31, 2011 at 12:23:05 -: > > Author: stsp > > Date: Tue May 31 12:23:05 2011 > > New Revision: 1129641 > > > > URL: http://svn.apache.org/viewvc?rev=1129641&view=rev > > Log: > > Make 'svnadmin verify' error out if an invalid path is found in the > > repository. > > > > There have been reports of non-UTF-8 paths having entered repositories, > > probably due to buggy third-party clients running against pre-1.6 servers > > (pre-1.6 servers do not verify filename encoding). > > See this thread for one such report, which also mentions that > > 'svnadmin verify' didn't detect this problem: > > http://svn.haxx.se/users/archive-2011-05/0361.shtml > > > > * subversion/include/private/svn_fs_util.h > > (svn_fs__path_valid): Declare. > > > > * subversion/libsvn_fs/fs-loader.c > > (path_valid): Rename this funcion to ... > > (svn_fs__path_valid): ... this, making it available to the repos layer. > > (svn_fs_make_dir, svn_fs_copy, svn_fs_make_file): Update callers. > > > > * subversion/tests/cmdline/svnadmin_tests.py > > (verify_non_utf8_paths): New test which makes sure that 'svnadmin verify' > >will error out on non-UTF-8 paths. It also makes sure that the repository > >can still be dumped successfully so that the problem can be fixed by > >editing the dumpfile. This test is FSFS-only for now but that shouldn't > >be a problem. > > > > * subversion/libsvn_repos/dump.c > > (dump_node): If verifying, run the node's path through > > svn_fs__path_valid(). > > > > Modified: > > subversion/trunk/subversion/include/private/svn_fs_util.h > > subversion/trunk/subversion/libsvn_fs/fs-loader.c > > subversion/trunk/subversion/libsvn_repos/dump.c > > subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py > > > > Modified: subversion/trunk/subversion/libsvn_repos/dump.c > > URL: > > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1129641&r1=1129640&r2=1129641&view=diff > > == > > --- subversion/trunk/subversion/libsvn_repos/dump.c (original) > > +++ subversion/trunk/subversion/libsvn_repos/dump.c Tue May 31 12:23:05 2011 > > @@ -36,6 +36,7 @@ > > #include "svn_props.h" > > > > #include "private/svn_mergeinfo_private.h" > > +#include "private/svn_fs_util.h" > > > > #define ARE_VALID_COPY_ARGS(p,r) ((p) && SVN_IS_VALID_REVNUM(r)) > > > > @@ -242,6 +243,10 @@ dump_node(struct edit_baton *eb, > >svn_fs_root_t *compare_root = NULL; > >apr_file_t *delta_file = NULL; > > > > + /* If we're verifying, validate the path. */ > > + if (eb->verify) > > +SVN_ERR(svn_fs__path_valid(path, pool)); > > + > > Can we print a warning to stderr if eb->verify == FALSE ? > > (we have a notify_func we can use) > r1134484 (and predecessors). > > >/* Write out metadata headers for this file node. */ > >SVN_ERR(svn_stream_printf(eb->stream, pool, > > SVN_REPOS_DUMPFILE_NODE_PATH ": %s\n", > >
svn commit: r1134487 - /subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Author: danielsh Date: Fri Jun 10 23:49:27 2011 New Revision: 1134487 URL: http://svn.apache.org/viewvc?rev=1134487&view=rev Log: * subversion/tests/cmdline/svnadmin_tests.py (load_bad_props, verify_non_utf8_paths): Typo fixes. Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1134487&r1=1134486&r2=1134487&view=diff == --- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Jun 10 23:49:27 2011 @@ -1256,7 +1256,7 @@ def hotcopy_symlink(sbox): raise svntest.Failure def load_bad_props(sbox): - "svadmin load with invalid svn: props" + "svnadmin load with invalid svn: props" dump_str = """SVN-fs-dump-format-version: 2 @@ -1321,7 +1321,7 @@ text # so it will trigger with either backend anyway. @SkipUnless(svntest.main.is_fs_type_fsfs) def verify_non_utf8_paths(sbox): - "svadmin verify with non-UTF-8 paths" + "svnadmin verify with non-UTF-8 paths" dumpfile = clean_dumpfile() test_create(sbox)
svn commit: r1134484 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/dump.c tests/cmdline/svnadmin_tests.py
Author: danielsh
Date: Fri Jun 10 23:45:51 2011
New Revision: 1134484
URL: http://svn.apache.org/viewvc?rev=1134484&view=rev
Log:
Verify FS paths for validity during dump. Follow-up to r1129641, which added
validation to 'verify'.
The validation during dump is conditional upon 'notify_func' being available,
and does not result in a hard error. The validation during verify always
results in a hard error.
* subversion/include/svn_repos.h
(svn_repos_notify_warning_t):
New enumerator 'svn_repos_notify_warning_invalid_fspath'.
* subversion/libsvn_repos/dump.c
(dump_node): Validate FS paths during dump too if notify_func is provided.
Use notify_func during verify as well.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_non_utf8_paths): Adjust expected stderr.
Modified:
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/libsvn_repos/dump.c
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/trunk/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1134484&r1=1134483&r2=1134484&view=diff
==
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Fri Jun 10 23:45:51 2011
@@ -259,6 +259,13 @@ typedef enum svn_repos_notify_warning_t
/** An #SVN_PROP_MERGEINFO property's encoded mergeinfo references a
* revision earlier than the first revision dumped. */
svn_repos_notify_warning_found_old_mergeinfo,
+
+ /** Found an invalid path in the filesystem.
+ * @see svn_fs.h:"Directory entry names and directory paths" */
+ /* ### TODO(doxygen): make that a proper doxygen link */
+ /* See svn_fs__path_valid(). */
+ svn_repos_notify_warning_invalid_fspath,
+
} svn_repos_notify_warning_t;
/**
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1134484&r1=1134483&r2=1134484&view=diff
==
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Fri Jun 10 23:45:51 2011
@@ -243,9 +243,33 @@ dump_node(struct edit_baton *eb,
svn_fs_root_t *compare_root = NULL;
apr_file_t *delta_file = NULL;
- /* If we're verifying, validate the path. */
- if (eb->verify)
-SVN_ERR(svn_fs__path_valid(path, pool));
+ /* Maybe validate the path. */
+ if (eb->verify || eb->notify_func)
+{
+ svn_error_t *err = svn_fs__path_valid(path, pool);
+
+ if (eb->notify_func)
+{
+ char errbuf[512]; /* ### svn_strerror() magic number */
+ svn_repos_notify_t *notify;
+ notify = svn_repos_notify_create(svn_repos_notify_warning, pool);
+
+ notify->warning = svn_repos_notify_warning_invalid_fspath;
+ notify->warning_str = apr_psprintf(
+ pool,
+ _("E%06d: While validating fspath '%s': %s"),
+ err->apr_err, path,
+ svn_err_best_message(err, errbuf, sizeof(errbuf)));
+
+ eb->notify_func(eb->notify_baton, notify, pool);
+}
+
+ /* Return the error in addition to notifying about it. */
+ if (eb->verify)
+return svn_error_return(err);
+ else
+svn_error_clear(err);
+}
/* Write out metadata headers for this file node. */
SVN_ERR(svn_stream_printf(eb->stream, pool,
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1134484&r1=1134483&r2=1134484&view=diff
==
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Jun 10
23:45:51 2011
@@ -1366,11 +1366,18 @@ def verify_non_utf8_paths(sbox):
# Make sure the repository can still be dumped so that the
# encoding problem can be fixed in a dump/edit/load cycle.
+ expected_stderr = [
+"* Dumped revision 0.\n",
+"WARNING 0x0002: E160005: "
+ "While validating fspath '?\\230': "
+ "Path '?\\230' is not in UTF-8"
+ "\n",
+"* Dumped revision 1.\n",
+]
exit_code, output, errput = svntest.main.run_svnadmin("dump", sbox.repo_dir)
if svntest.verify.compare_and_display_lines(
"Output of 'svnadmin dump' is unexpected.",
-'STDERR', ["* Dumped revision 0.\n",
- "* Dumped revision 1.\n"], errput):
+'STDERR', expected_stderr, errput):
raise svntest.Failure
svn commit: r1134480 - /subversion/trunk/subversion/svnadmin/main.c
Author: danielsh
Date: Fri Jun 10 23:32:28 2011
New Revision: 1134480
URL: http://svn.apache.org/viewvc?rev=1134480&view=rev
Log:
stats++
* subversion/svnadmin/main.c
(repos_notify_handler): Print the enum's value as leading-zeroes-ful hex.
Modified:
subversion/trunk/subversion/svnadmin/main.c
Modified: subversion/trunk/subversion/svnadmin/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/main.c?rev=1134480&r1=1134479&r2=1134480&view=diff
==
--- subversion/trunk/subversion/svnadmin/main.c (original)
+++ subversion/trunk/subversion/svnadmin/main.c Fri Jun 10 23:32:28 2011
@@ -685,7 +685,7 @@ repos_notify_handler(void *baton,
{
case svn_repos_notify_warning:
svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
-"WARNING %d: %s\n", notify->warning,
+"WARNING 0x%04x: %s\n",
notify->warning,
notify->warning_str));
return;
svn commit: r1134477 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/dump.c
Author: danielsh
Date: Fri Jun 10 23:25:14 2011
New Revision: 1134477
URL: http://svn.apache.org/viewvc?rev=1134477&view=rev
Log:
Add 'dump/verify done' notifications; see r1134470 for the use-case.
* subversion/include/svn_repos.h
(svn_repos_notify_action_t):
New enumerators:
'svn_repos_notify_dump_end' and 'svn_repos_notify_verify_end'.
* subversion/libsvn_repos/dump.c
(svn_repos_dump_fs3, svn_repos_verify_fs2):
Generate corresponding notifications.
Modified:
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/libsvn_repos/dump.c
Modified: subversion/trunk/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1134477&r1=1134476&r2=1134477&view=diff
==
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Fri Jun 10 23:25:14 2011
@@ -199,6 +199,12 @@ typedef enum svn_repos_notify_action_t
/** A revision has finished being verified. */
svn_repos_notify_verify_rev_end,
+ /** All revisions have finished being dumped. */
+ svn_repos_notify_dump_end,
+
+ /** All revisions have finished being verified. */
+ svn_repos_notify_verify_end,
+
/** packing of an FSFS shard has commenced */
svn_repos_notify_pack_shard_start,
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1134477&r1=1134476&r2=1134477&view=diff
==
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Fri Jun 10 23:25:14 2011
@@ -1120,6 +1120,9 @@ svn_repos_dump_fs3(svn_repos_t *repos,
warning, since the inline warnings already issued might easily be
missed. */
+ notify = svn_repos_notify_create(svn_repos_notify_dump_end, subpool);
+ notify_func(notify_baton, notify, subpool);
+
if (found_old_reference)
{
notify = svn_repos_notify_create(svn_repos_notify_warning, subpool);
@@ -1296,6 +1299,13 @@ svn_repos_verify_fs2(svn_repos_t *repos,
}
}
+ /* We're done. */
+ if (notify_func)
+{
+ notify = svn_repos_notify_create(svn_repos_notify_dump_end, iterpool);
+ notify_func(notify_baton, notify, iterpool);
+}
+
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
svn propchange: r1134473 - svn:log
Author: cmpilato
Revision: 1134473
Modified property: svn:log
Modified: svn:log at Fri Jun 10 23:14:13 2011
--
--- svn:log (original)
+++ svn:log Fri Jun 10 23:14:13 2011
@@ -1,10 +1,14 @@
Fix issue #3904 ("serf regression test failures with v1 protocol").
+NOTE: No need to backport this, as it was a regression introduced in
+trunk not present in 1.6.x.
+
+ALSO NOTE: In retrospect, there's room for improvement here by having
+each parent directory baton stash a boolean flag indicating that it is
+the descendent of an added directory, left as an exercise for a future
+commit.)
+
* subversion/libsvn_ra_serf/commit.c
(checkout_dir, checkout_file): Look all the way up the parent_dir
baton stack for an added directory, not just at the immediate
-parent. (NOTE: In retrospect, there's room for improvement here
-by having each parent directory baton stash a boolean flag
-indicating that it is the descendent of an added directory, left
-as an exercise for a future commit.)
-
+parent.
svn commit: r1134474 - /subversion/trunk/subversion/libsvn_repos/dump.c
Author: danielsh
Date: Fri Jun 10 23:12:18 2011
New Revision: 1134474
URL: http://svn.apache.org/viewvc?rev=1134474&view=rev
Log:
Save an unneeded-for-good-repositories memory allocation.
* subversion/libsvn_repos/dump.c
(svn_repos_dump_fs3): Move an allocation to after a condition.
Modified:
subversion/trunk/subversion/libsvn_repos/dump.c
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1134474&r1=1134473&r2=1134474&view=diff
==
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Fri Jun 10 23:12:18 2011
@@ -1120,10 +1120,10 @@ svn_repos_dump_fs3(svn_repos_t *repos,
warning, since the inline warnings already issued might easily be
missed. */
- notify = svn_repos_notify_create(svn_repos_notify_warning, subpool);
-
if (found_old_reference)
{
+ notify = svn_repos_notify_create(svn_repos_notify_warning, subpool);
+
notify->warning = svn_repos_notify_warning_found_old_reference;
notify->warning_str = _("The range of revisions dumped "
"contained references to "
@@ -1136,6 +1136,8 @@ svn_repos_dump_fs3(svn_repos_t *repos,
in dumped mergeinfo. */
if (found_old_mergeinfo)
{
+ notify = svn_repos_notify_create(svn_repos_notify_warning, subpool);
+
notify->warning = svn_repos_notify_warning_found_old_mergeinfo;
notify->warning_str = _("The range of revisions dumped "
"contained mergeinfo "
svn commit: r1134473 - /subversion/trunk/subversion/libsvn_ra_serf/commit.c
Author: cmpilato
Date: Fri Jun 10 23:12:03 2011
New Revision: 1134473
URL: http://svn.apache.org/viewvc?rev=1134473&view=rev
Log:
Fix issue #3904 ("serf regression test failures with v1 protocol").
* subversion/libsvn_ra_serf/commit.c
(checkout_dir, checkout_file): Look all the way up the parent_dir
baton stack for an added directory, not just at the immediate
parent. (NOTE: In retrospect, there's room for improvement here
by having each parent directory baton stash a boolean flag
indicating that it is the descendent of an added directory, left
as an exercise for a future commit.)
Modified:
subversion/trunk/subversion/libsvn_ra_serf/commit.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1134473&r1=1134472&r2=1134473&view=diff
==
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Fri Jun 10 23:12:03 2011
@@ -355,17 +355,19 @@ checkout_dir(dir_context_t *dir)
checkout_context_t *checkout_ctx;
svn_ra_serf__handler_t *handler;
svn_error_t *err;
+ dir_context_t *parent_dir = dir->parent_dir;
if (dir->checkout)
{
return SVN_NO_ERROR;
}
- if (dir->parent_dir)
+ /* Is one of our parent dirs newly added? If so, we're already
+ * implicitly checked out.
+ */
+ while (parent_dir)
{
- /* Is our parent newly added? If so, we're already implicitly checked
- * out. */
- if (dir->parent_dir->added)
+ if (parent_dir->added)
{
/* Implicitly checkout this dir now. */
dir->checkout = apr_pcalloc(dir->pool, sizeof(*dir->checkout));
@@ -378,6 +380,7 @@ checkout_dir(dir_context_t *dir)
return SVN_NO_ERROR;
}
+ parent_dir = parent_dir->parent_dir;
}
/* Checkout our directory into the activity URL now. */
@@ -543,28 +546,28 @@ checkout_file(file_context_t *file)
{
svn_ra_serf__handler_t *handler;
svn_error_t *err;
+ dir_context_t *parent_dir = file->parent_dir;
- if (file->parent_dir)
+ /* Is one of our parent dirs newly added? If so, we're already
+ * implicitly checked out.
+ */
+ while (parent_dir)
{
- dir_context_t *dir = file->parent_dir;
-
- /* Is our parent newly added? If so, we're already implicitly checked
out. */
- if (dir->added)
+ if (parent_dir->added)
{
- const char *diff_path;
-
- /* Implicitly checkout this dir now. */
+ /* Implicitly checkout this file now. */
file->checkout = apr_pcalloc(file->pool, sizeof(*file->checkout));
file->checkout->pool = file->pool;
-
file->checkout->activity_url = file->commit->activity_url;
- diff_path = svn_relpath_is_child(dir->name, file->name, file->pool);
file->checkout->resource_url =
-svn_path_url_add_component2(dir->checkout->resource_url,
-diff_path,
+svn_path_url_add_component2(parent_dir->checkout->resource_url,
+svn_relpath_is_child(parent_dir->name,
+ file->name,
+ file->pool),
file->pool);
return SVN_NO_ERROR;
}
+ parent_dir = parent_dir->parent_dir;
}
/* Checkout our file into the activity URL now. */
svn commit: r1134471 - /subversion/trunk/subversion/svn/main.c
Author: cmpilato
Date: Fri Jun 10 23:05:32 2011
New Revision: 1134471
URL: http://svn.apache.org/viewvc?rev=1134471&view=rev
Log:
* subversion/svn/main.c
(main): Use svn_error_find_cause() rather than duplicating its
functionality.
Modified:
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1134471&r1=1134470&r2=1134471&view=diff
==
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri Jun 10 23:05:32 2011
@@ -2601,15 +2601,11 @@ main(int argc, const char *argv[])
/* Tell the user about 'svn cleanup' if any error on the stack
was about locked working copies. */
- for (tmp_err = err; tmp_err; tmp_err = tmp_err->child)
-if (tmp_err->apr_err == SVN_ERR_WC_LOCKED)
- {
-svn_error_clear
- (svn_cmdline_fputs(_("svn: run 'svn cleanup' to remove locks "
- "(type 'svn help cleanup' for details)\n"),
- stderr, pool));
-break;
- }
+ if (svn_error_find_cause(err, SVN_ERR_WC_LOCKED))
+svn_error_clear(svn_cmdline_fputs(_("svn: run 'svn cleanup' to "
+"remove locks (type 'svn help "
+"cleanup' for details)\n"),
+ stderr, pool));
svn_error_clear(err);
svn_pool_destroy(pool);
svn commit: r1134470 - in /subversion/trunk/subversion: include/svn_repos.h libsvn_repos/deprecated.c libsvn_repos/dump.c svnadmin/main.c
Author: danielsh
Date: Fri Jun 10 23:04:45 2011
New Revision: 1134470
URL: http://svn.apache.org/viewvc?rev=1134470&view=rev
Log:
Tweak the svn_repos_notify_* API to be less tailored for svnadmin.
Note, since the notifications were printed both during the dump and once
more at the end, the API will now generate the same svn_repos_notify_action_t
twice: once during the dump and once at the end. This should be fine for API
users since we have (or are about to have) a "Done" notification.
* subversion/include/svn_repos.h
(svn_repos_notify_warning_t): New enum and typedef.
(svn_repos_notify_t):
Rename 'warning' to 'warning_str' and add 'warning' members.
* subversion/libsvn_repos/deprecated.c
(repos_notify_handler): Track rename.
* subversion/libsvn_repos/dump.c
(dump_node, svn_repos_dump_fs3): Track rename.
Don't format the error message in an svnadmin-specific way.
* subversion/svnadmin/main.c
(repos_notify_handler): Format the error message here.
Modified:
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/libsvn_repos/deprecated.c
subversion/trunk/subversion/libsvn_repos/dump.c
subversion/trunk/subversion/svnadmin/main.c
Modified: subversion/trunk/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1134470&r1=1134469&r2=1134470&view=diff
==
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Fri Jun 10 23:04:45 2011
@@ -240,6 +240,21 @@ typedef enum svn_repos_notify_action_t
} svn_repos_notify_action_t;
+/** The type of error occurring.
+ *
+ * @since New in 1.7.
+ */
+typedef enum svn_repos_notify_warning_t
+{
+ /** Referencing copy source data from a revision earlier than the
+ * first revision dumped. */
+ svn_repos_notify_warning_found_old_reference,
+
+ /** An #SVN_PROP_MERGEINFO property's encoded mergeinfo references a
+ * revision earlier than the first revision dumped. */
+ svn_repos_notify_warning_found_old_mergeinfo,
+} svn_repos_notify_warning_t;
+
/**
* Structure used by #svn_repos_notify_func_t.
*
@@ -261,8 +276,10 @@ typedef struct svn_repos_notify_t
* the revision which just completed. */
svn_revnum_t revision;
- /** For #svn_repos_notify_warning, the warning text. */
- const char *warning;
+ /** For #svn_repos_notify_warning, the warning object. Must be cleared
+ by the consumer of the notification. */
+ const char *warning_str;
+ svn_repos_notify_warning_t warning;
/** For #svn_repos_notify_pack_shard_start,
#svn_repos_notify_pack_shard_end,
Modified: subversion/trunk/subversion/libsvn_repos/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/deprecated.c?rev=1134470&r1=1134469&r2=1134470&view=diff
==
--- subversion/trunk/subversion/libsvn_repos/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_repos/deprecated.c Fri Jun 10 23:04:45
2011
@@ -570,8 +570,8 @@ repos_notify_handler(void *baton,
switch (notify->action)
{
case svn_repos_notify_warning:
- len = strlen(notify->warning);
- svn_error_clear(svn_stream_write(feedback_stream, notify->warning,
&len));
+ len = strlen(notify->warning_str);
+ svn_error_clear(svn_stream_write(feedback_stream, notify->warning_str,
&len));
return;
case svn_repos_notify_dump_rev_end:
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1134470&r1=1134469&r2=1134470&view=diff
==
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Fri Jun 10 23:04:45 2011
@@ -353,13 +353,14 @@ dump_node(struct edit_baton *eb,
svn_repos_notify_t *notify =
svn_repos_notify_create(svn_repos_notify_warning, pool);
- notify->warning = apr_psprintf(
+ notify->warning = svn_repos_notify_warning_found_old_reference;
+ notify->warning_str = apr_psprintf(
pool,
- _("WARNING: Referencing data in revision %ld,"
- " which is older than the oldest\n"
- "WARNING: dumped revision (%ld). Loading this dump"
- " into an empty repository\n"
- "WARNING: will fail.\n"),
+ _("Referencing data in revision %ld,"
+ " which is older than the oldest"
+ " dumped revision (%ld). Loading this dump"
+ " into an empty repository"
+ " will fail."),
cmp_rev, eb->ol
svn commit: r1134454 - /subversion/site/publish/download/download.html
Author: danielsh Date: Fri Jun 10 21:52:41 2011 New Revision: 1134454 URL: http://svn.apache.org/viewvc?rev=1134454&view=rev Log: * publish/download/download.html: (release-archives): Explicitly suggest to upgrade. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134454&r1=1134453&r2=1134454&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 21:52:41 2011 @@ -215,8 +215,8 @@ Other mirrors: other supported releases, distributions of Subversion found in the archives are not supported by the community. If you require support for an older version of - Subversion, consider contacting a commercial Subversion support - vendor. + Subversion, and are not able to upgrade to a newer version, + consider contacting a commercial Subversion support vendor.
Re: svn commit: r1134219 - /subversion/trunk/configure.ac
phi...@apache.org wrote on Fri, Jun 10, 2011 at 07:50:17 -: > Author: philip > Date: Fri Jun 10 07:50:17 2011 > New Revision: 1134219 > > URL: http://svn.apache.org/viewvc?rev=1134219&view=rev > Log: > * configure.ac: Don't replace svn_private_config.h if the content > is unchanged. > > Modified: > subversion/trunk/configure.ac > > Modified: subversion/trunk/configure.ac > URL: > http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1134219&r1=1134218&r2=1134219&view=diff > == > --- subversion/trunk/configure.ac (original) > +++ subversion/trunk/configure.ac Fri Jun 10 07:50:17 2011 > @@ -1297,10 +1297,15 @@ AC_SUBST(INCLUDE_OUTPUTS) > > # Detection complete - output and run config.status > = > > -AC_CONFIG_HEADERS(subversion/svn_private_config.h) > -AC_CONFIG_COMMANDS([svn_private_config.h], > - [$SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" > subversion/svn_private_config.h > subversion/svn_private_config.h.new > -mv -f subversion/svn_private_config.h.new > subversion/svn_private_config.h], > +AC_CONFIG_HEADERS(subversion/svn_private_config.h.tmp) > +AC_CONFIG_COMMANDS([svn_private_config.h.tmp], > + [$SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" > subversion/svn_private_config.h.tmp > subversion/svn_private_config.h.tmp.new > +if test -e subversion/svn_private_config.h && diff > subversion/svn_private_config.h subversion/svn_private_config.h.tmp.new > >/dev/null ; then s/diff >/dev/null/cmp/ ? > + rm -f subversion/svn_private_config.h.tmp.new > +else > + mv -f subversion/svn_private_config.h.tmp.new > subversion/svn_private_config.h > +fi > +rm -f subversion/svn_private_config.h.tmp], > [SED="$SED" > SVN_DB_HEADER="$SVN_DB_HEADER"]) > AC_CONFIG_FILES([Makefile]) > >
svn commit: r1134442 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 21:09:00 2011 New Revision: 1134442 URL: http://svn.apache.org/viewvc?rev=1134442&view=rev Log: * site/publish/download/download.html (release-archives): New section. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134442&r1=1134441&r2=1134442&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 21:09:00 2011 @@ -153,7 +153,7 @@ Other mirrors: - + Pre-releases @@ -201,6 +201,25 @@ Other mirrors: + +Release archives + ¶ + + +Looking for previous releases of Subversion? All Subversion + releases are available for download from the + http://archive.apache.org/dist/subversion/"; >Apache + distribution archive. Please note that, with the exception of + our recommended and + other supported releases, + distributions of Subversion found in the archives are not supported + by the community. If you require support for an older version of + Subversion, consider contacting a commercial Subversion support + vendor. + + +
Re: svn commit: r1129641 - in /subversion/trunk/subversion: include/private/svn_fs_util.h libsvn_fs/fs-loader.c libsvn_repos/dump.c tests/cmdline/svnadmin_tests.py
s...@apache.org wrote on Tue, May 31, 2011 at 12:23:05 -:
> Author: stsp
> Date: Tue May 31 12:23:05 2011
> New Revision: 1129641
>
> URL: http://svn.apache.org/viewvc?rev=1129641&view=rev
> Log:
> Make 'svnadmin verify' error out if an invalid path is found in the
> repository.
>
> There have been reports of non-UTF-8 paths having entered repositories,
> probably due to buggy third-party clients running against pre-1.6 servers
> (pre-1.6 servers do not verify filename encoding).
> See this thread for one such report, which also mentions that
> 'svnadmin verify' didn't detect this problem:
> http://svn.haxx.se/users/archive-2011-05/0361.shtml
>
> * subversion/include/private/svn_fs_util.h
> (svn_fs__path_valid): Declare.
>
> * subversion/libsvn_fs/fs-loader.c
> (path_valid): Rename this funcion to ...
> (svn_fs__path_valid): ... this, making it available to the repos layer.
> (svn_fs_make_dir, svn_fs_copy, svn_fs_make_file): Update callers.
>
> * subversion/tests/cmdline/svnadmin_tests.py
> (verify_non_utf8_paths): New test which makes sure that 'svnadmin verify'
>will error out on non-UTF-8 paths. It also makes sure that the repository
>can still be dumped successfully so that the problem can be fixed by
>editing the dumpfile. This test is FSFS-only for now but that shouldn't
>be a problem.
>
> * subversion/libsvn_repos/dump.c
> (dump_node): If verifying, run the node's path through svn_fs__path_valid().
>
> Modified:
> subversion/trunk/subversion/include/private/svn_fs_util.h
> subversion/trunk/subversion/libsvn_fs/fs-loader.c
> subversion/trunk/subversion/libsvn_repos/dump.c
> subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
>
> Modified: subversion/trunk/subversion/include/private/svn_fs_util.h
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_fs_util.h?rev=1129641&r1=1129640&r2=1129641&view=diff
> ==
> --- subversion/trunk/subversion/include/private/svn_fs_util.h (original)
> +++ subversion/trunk/subversion/include/private/svn_fs_util.h Tue May 31
> 12:23:05 2011
> @@ -186,6 +186,14 @@ svn_fs__path_change_create_internal(cons
> svn_fs_path_change_kind_t change_kind,
> apr_pool_t *pool);
>
> +/* Check whether PATH is valid for a filesystem, following (most of) the
> + * requirements in svn_fs.h:"Directory entry names and directory paths".
> + *
> + * Return SVN_ERR_FS_PATH_SYNTAX if PATH is not valid.
> + */
> +svn_error_t *
> +svn_fs__path_valid(const char *path, apr_pool_t *pool);
> +
> #ifdef __cplusplus
> }
> #endif /* __cplusplus */
>
> Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1129641&r1=1129640&r2=1129641&view=diff
> ==
> --- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
> +++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Tue May 31 12:23:05 2011
> @@ -334,13 +334,8 @@ default_warning_func(void *baton, svn_er
>SVN_ERR_MALFUNCTION_NO_RETURN();
> }
>
> -/* Check whether PATH is valid for a filesystem, following (most of) the
> - * requirements in svn_fs.h:"Directory entry names and directory paths".
> - *
> - * Return SVN_ERR_FS_PATH_SYNTAX if PATH is not valid.
> - */
> -static svn_error_t *
> -path_valid(const char *path, apr_pool_t *pool)
> +svn_error_t *
> +svn_fs__path_valid(const char *path, apr_pool_t *pool)
> {
>/* UTF-8 encoded string without NULs. */
>if (! svn_utf__cstring_is_valid(path))
> @@ -1044,7 +1039,7 @@ svn_fs_dir_entries(apr_hash_t **entries_
> svn_error_t *
> svn_fs_make_dir(svn_fs_root_t *root, const char *path, apr_pool_t *pool)
> {
> - SVN_ERR(path_valid(path, pool));
> + SVN_ERR(svn_fs__path_valid(path, pool));
>return svn_error_return(root->vtable->make_dir(root, path, pool));
> }
>
> @@ -1058,7 +1053,7 @@ svn_error_t *
> svn_fs_copy(svn_fs_root_t *from_root, const char *from_path,
> svn_fs_root_t *to_root, const char *to_path, apr_pool_t *pool)
> {
> - SVN_ERR(path_valid(to_path, pool));
> + SVN_ERR(svn_fs__path_valid(to_path, pool));
>return svn_error_return(to_root->vtable->copy(from_root, from_path,
> to_root, to_path, pool));
> }
> @@ -1131,7 +1126,7 @@ svn_fs_file_contents(svn_stream_t **cont
> svn_error_t *
> svn_fs_make_file(svn_fs_root_t *root, const char *path, apr_pool_t *pool)
> {
> - SVN_ERR(path_valid(path, pool));
> + SVN_ERR(svn_fs__path_valid(path, pool));
>return svn_error_return(root->vtable->make_file(root, path, pool));
> }
>
>
> Modified: subversion/trunk/subversion/libsvn_repos/dump.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=11296
Re: svn commit: r1127709 - /subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
stef...@apache.org wrote on Wed, May 25, 2011 at 22:20:25 -:
> Author: stefan2
> Date: Wed May 25 22:20:25 2011
> New Revision: 1127709
>
> URL: http://svn.apache.org/viewvc?rev=1127709&view=rev
> Log:
> Fix a pool usage issue: svn_cache__get_partial() may be called many
> times in a row. Thus, the internal pool used to construct keys should
> be cleared in this function as well from time to time.
>
> * subversion/libsvn_subr/cache-membuffer.c
> (svn_membuffer_cache_get_partial): regularly clear the internal scratch pool
>
> Modified:
> subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
>
> Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1127709&r1=1127708&r2=1127709&view=diff
> ==
> --- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
> +++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Wed May 25
> 22:20:25 2011
> @@ -1668,6 +1668,12 @@ svn_membuffer_cache_get_partial(void **v
>
>DEBUG_CACHE_MEMBUFFER_INIT_TAG
>
> + if (++cache->alloc_counter > ALLOCATIONS_PER_POOL_CLEAR)
> +{
> + apr_pool_clear(cache->pool);
> + cache->alloc_counter = 0;
> +}
> +
Does this need to be guarded by a cache lock?
>combine_key(cache->prefix,
>sizeof(cache->prefix),
>key,
>
>
svn commit: r1134418 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 19:21:41 2011 New Revision: 1134418 URL: http://svn.apache.org/viewvc?rev=1134418&view=rev Log: * site/publish/download/download.html Attach a note to the 1.6.17 and 1.5.9 release blocks about their non-Apache-branded status and alternative hosting. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134418&r1=1134417&r2=1134418&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 19:21:41 2011 @@ -85,6 +85,10 @@ Other mirrors: Subversion 1.6.17 +This + is not an Apache-branded release, and is hosted on the project's + http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260"; + >previous website. File @@ -122,6 +126,10 @@ Other mirrors: are as follows: Subversion 1.5.9 +This + is not an Apache-branded release, and is hosted on the project's + http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260"; + >previous website. File
svn commit: r1134416 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 19:15:22 2011 New Revision: 1134416 URL: http://svn.apache.org/viewvc?rev=1134416&view=rev Log: * site/publish/download/download.html Populate some old MD5 checksums. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134416&r1=1134415&r2=1134416&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 19:15:22 2011 @@ -93,17 +93,17 @@ Other mirrors: http://subversion.tigris.org/downloads/subversion-1.6.17.tar.gz";>subversion-1.6.17.tar.gz - + aa0f54aacac21bf5c84079e551357c15 (MD5) [http://subversion.tigris.org/downloads/subversion-1.6.17.tar.gz";>PGP] http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2";>subversion-1.6.17.tar.bz2 - + 81e5dc5beee4b3fc025ac70c0b6caa14 (MD5) [http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2.asc";>PGP] http://subversion.tigris.org/downloads/subversion-1.6.17.zip";>subversion-1.6.17.zip - + a3a4dedd9ec782d3da4465694ce012d4 (MD5) [http://subversion.tigris.org/downloads/subversion-1.6.17.zip.asc";>PGP] @@ -130,17 +130,17 @@ Other mirrors: http://subversion.tigris.org/downloads/subversion-1.5.9.tar.gz";>subversion-1.5.9.tar.gz - (MD5) + 973e87cd8aa64f44ed6b4e569c635abc (MD5) [http://subversion.tigris.org/downloads/subversion-1.5.9.tar.gz";>PGP] http://subversion.tigris.org/downloads/subversion-1.5.9.tar.bz2";>subversion-1.5.9.tar.bz2 - (MD5) + d8de4f33decb9e608c8cfd43288ebe89 (MD5) [http://subversion.tigris.org/downloads/subversion-1.5.9.tar.bz2.asc";>PGP] http://subversion.tigris.org/downloads/subversion-1.5.9.zip";>subversion-1.5.9.zip - (MD5) + 77c879a1b78e26a521618659ec4798c4 (MD5) [http://subversion.tigris.org/downloads/subversion-1.5.9.zip.asc";>PGP]
svn commit: r1134415 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 19:12:23 2011 New Revision: 1134415 URL: http://svn.apache.org/viewvc?rev=1134415&view=rev Log: * site/publish/download/download.html Mostly stylistic tweaks. But also, allow for MD5 checksums also for our older releases. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134415&r1=1134414&r2=1134415&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 19:12:23 2011 @@ -85,25 +85,25 @@ Other mirrors: Subversion 1.6.17 - + File - SHA1 + Checksum Signatures http://subversion.tigris.org/downloads/subversion-1.6.17.tar.gz";>subversion-1.6.17.tar.gz - + [http://subversion.tigris.org/downloads/subversion-1.6.17.tar.gz";>PGP] http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2";>subversion-1.6.17.tar.bz2 - + [http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2.asc";>PGP] http://subversion.tigris.org/downloads/subversion-1.6.17.zip";>subversion-1.6.17.zip - + [http://subversion.tigris.org/downloads/subversion-1.6.17.zip.asc";>PGP] @@ -122,25 +122,25 @@ Other mirrors: are as follows: Subversion 1.5.9 - + File - SHA1 + Checksum Signatures http://subversion.tigris.org/downloads/subversion-1.5.9.tar.gz";>subversion-1.5.9.tar.gz - + (MD5) [http://subversion.tigris.org/downloads/subversion-1.5.9.tar.gz";>PGP] http://subversion.tigris.org/downloads/subversion-1.5.9.tar.bz2";>subversion-1.5.9.tar.bz2 - + (MD5) [http://subversion.tigris.org/downloads/subversion-1.5.9.tar.bz2.asc";>PGP] http://subversion.tigris.org/downloads/subversion-1.5.9.zip";>subversion-1.5.9.zip - + (MD5) [http://subversion.tigris.org/downloads/subversion-1.5.9.zip.asc";>PGP] @@ -168,25 +168,25 @@ Other mirrors: Subversion 1.7.0-alpha1 - + File - SHA1 + Checksum Signatures subversion-1.7.0-alpha1.tar.gz - 212eaca54374a8e95ab5c6a15208870bbb339ae6 + 212eaca54374a8e95ab5c6a15208870bbb339ae6 (SHA1) [http://www.apache.org/dist/subversion/subversion-1.7.0-alpha1.tar.gz.asc";>PGP] subversion-1.7.0-alpha1.tar.bz2 - 7710d703eb2365b2e91d66cedc4dbaab4ef6fbea + 7710d703eb2365b2e91d66cedc4dbaab4ef6fbea (SHA1) [http://www.apache.org/dist/subversion/subversion-1.7.0-alpha1.tar.bz2.asc";>PGP] subversion-1.7.0-alpha1.zip - bddc417433732ed09b8e641cc08ef49850574d36 + bddc417433732ed09b8e641cc08ef49850574d36 (SHA1) [http://www.apache.org/dist/subversion/subversion-1.7.0-alpha1.zip.asc";>PGP] @@ -202,19 +202,19 @@ Other mirrors: It is essential that you verify the integrity of the downloaded - files using the PGP or SHA1 signatures. Please read - http://httpd.apache.org/dev/verification.html";>Verifying Apache - HTTP Server Releases for more information on why you should verify our - releases. (The same rationale applies to Subversion as to HTTP Server.) + files using the PGP signatures and/or file checksums. Please read + http://httpd.apache.org/dev/verification.html";>Verifying + Apache HTTP Server Releases for more information on why you + should verify our releases. (The same rationale applies to + Subversion as to HTTP Server.) -The PGP signatures can be verified using PGP or GPG. First - download the - https://people.apache.org/keys/group/subversion.asc";>KEYS - as well as the asc signature file for the particular - distribution. Make sure you get these files from the - http://www.apache.org/dist/subversion/";>main distribution - directory, rather than from a mirror. Then verify the signatures - using +The PGP signatures can be verified using PGP or GPG. First download + the https://people.apache.org/keys/group/subversion.asc"; + >KEYS as well as the asc signature file for the + particular distribution. Make sure you get these files from the + http://www.apache.org/dist/subversion/"; >main distribution + directory, rather than from a mirror. Then verify the + signatures as follows: % pgpk -a subversion.asc @@ -231,10 +231,11 @@ Other mirrors: % gpg --verify subversion-1.7.0.tar.gz.asc -Alternatively, you can verify the SHA1 signature on the files. A - unix program called sha1 or sha1sum is - included in many unix distributions. It is also available as part - of http://www.gnu.org/software/textutils/textutils.html"; +Alternatively, you can verify the SHA1 (or MD5) signature on the + files. A unix program called sha1 + or sha1sum (md5sum, for MD5 signatures) + is included in many unix distributions. It is also available as + part of http://www.gnu.org/software/textutils/textutils.html"; >GNU Textutils.
svn commit: r1134409 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 19:00:01 2011 New Revision: 1134409 URL: http://svn.apache.org/viewvc?rev=1134409&view=rev Log: * site/publish/download/download.html Replace textual descriptions of 1.6.17 and 1.5.9 releases with blocks similar to what we have for 1.7.0-alpha1, providing direct links to the downloads rather than merely an pointer to the Tigris downloads area. In a follow-up, I'll add a note about how those releases are not Apache releases and point out that they are hosted elsewhere. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134409&r1=1134408&r2=1134409&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 19:00:01 2011 @@ -84,10 +84,29 @@ Other mirrors: title="Link to this section">¶ -The latest stable release of Subversion is 1.6.17. This release is - available for download from the - http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; - >Tigris Source Releases area. +Subversion 1.6.17 + + + File + SHA1 + Signatures + + + http://subversion.tigris.org/downloads/subversion-1.6.17.tar.gz";>subversion-1.6.17.tar.gz + + [http://subversion.tigris.org/downloads/subversion-1.6.17.tar.gz";>PGP] + + + http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2";>subversion-1.6.17.tar.bz2 + + [http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2.asc";>PGP] + + + http://subversion.tigris.org/downloads/subversion-1.6.17.zip";>subversion-1.6.17.zip + + [http://subversion.tigris.org/downloads/subversion-1.6.17.zip.asc";>PGP] + + @@ -97,17 +116,34 @@ Other mirrors: title="Link to this section">¶ -We support the latest release available from the following release - lines: +In addition to the recommended + release, we generally support the latest release from at least + one prior release stream. The currently supported older releases + are as follows: - -Subversion 1.5.x: 1.5.9 -Subversion 1.6.x: 1.6.17 - - -All supported releases are available for download from - the http://archive.apache.org/dist/subversion/"; >Apache - archive. +Subversion 1.5.9 + + + File + SHA1 + Signatures + + + http://subversion.tigris.org/downloads/subversion-1.5.9.tar.gz";>subversion-1.5.9.tar.gz + + [http://subversion.tigris.org/downloads/subversion-1.5.9.tar.gz";>PGP] + + + http://subversion.tigris.org/downloads/subversion-1.5.9.tar.bz2";>subversion-1.5.9.tar.bz2 + + [http://subversion.tigris.org/downloads/subversion-1.5.9.tar.bz2.asc";>PGP] + + + http://subversion.tigris.org/downloads/subversion-1.5.9.zip";>subversion-1.5.9.zip + + [http://subversion.tigris.org/downloads/subversion-1.5.9.zip.asc";>PGP] + +
svn commit: r1134393 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 17:15:49 2011 New Revision: 1134393 URL: http://svn.apache.org/viewvc?rev=1134393&view=rev Log: * site/publish/download/download.html Consistify paragraph formatting, and avoid the unrecommended "hN text follows hN+1 section" by moving the bit about which archive type to download to the preamble of the "Source Releases" section. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134393&r1=1134392&r2=1134393&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 17:15:49 2011 @@ -68,13 +68,15 @@ Other mirrors: title="Link to this section">¶ - +We provide source code distributions in a variety of archive types. + Generally, speaking, Windows users should download .zip + files. Users of all other operating systems should + download .tar.gz or .tar.bz2 files. + +Please note that the dependencies + distribution subversion-deps-* is no longer available in + 1.7 and later. See The 1.7 + release notes for details and alternatives. Recommended Release @@ -83,9 +85,9 @@ fill up the above queue. --> The latest stable release of Subversion is 1.6.17. This release is - available for download from the - http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; - >Tigris Source Releases area. + available for download from the + http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; + >Tigris Source Releases area. @@ -96,7 +98,7 @@ fill up the above queue. --> We support the latest release available from the following release - lines: + lines: Subversion 1.5.x: 1.5.9 @@ -104,8 +106,8 @@ fill up the above queue. --> All supported releases are available for download from - the http://archive.apache.org/dist/subversion/"; >Apache - archive. + the http://archive.apache.org/dist/subversion/"; >Apache + archive. @@ -116,15 +118,18 @@ fill up the above queue. --> - The following releases are offered for pre-release testing. The http://mail-archives.apache.org/mod_mbox/subversion-announce/201106.mbox/%3cBANLkTi=hfhxwpygkp7xosl4j39tssd3...@mail.gmail.com%3e"; - >usual caveats apply, including the fact that there are known issues, and - no upgrade path is promised for APIs and on-disk files (working copies and - repositories) between the pre-releases and the final release. + +The following releases are offered for pre-release testing. + The http://mail-archives.apache.org/mod_mbox/subversion-announce/201106.mbox/%3cBANLkTi=hfhxwpygkp7xosl4j39tssd3...@mail.gmail.com%3e"; + >usual caveats apply, including the fact that there are known + issues, and no upgrade path is promised for APIs and on-disk files + (working copies and repositories) between the pre-releases and the + final release. - Please report any issues to us...@subversion.apache.org. - +Please report any issues to us...@subversion.apache.org. + + Subversion 1.7.0-alpha1 @@ -152,16 +157,6 @@ fill up the above queue. --> -Windows users should download .zip files. For all other operating - systems, download .tar.gz or .tar.bz2 files. See the - instructions in the - http://svn.apache.org/repos/asf/subversion/trunk/INSTALL";>INSTALL - file for instructions on how to build Subversion. - -The dependencies distribution subversion-deps-* is no longer - available in 1.7 and later. See The 1.7 release notes for details and alternatives. - @@ -201,10 +196,10 @@ fill up the above queue. --> Alternatively, you can verify the SHA1 signature on the files. A -unix program called sha1 or sha1sum is -included in many unix distributions. It is also available as part of -http://www.gnu.org/software/textutils/textutils.html";>GNU -Textutils. + unix program called sha1 or sha1sum is + included in many unix distributions. It is also available as part + of http://www.gnu.org/software/textutils/textutils.html"; + >GNU Textutils.
Re: svn commit: r1134382 - /subversion/site/publish/site-nav.html
On 06/10/2011 12:41 PM, danie...@apache.org wrote: > Author: danielsh > Date: Fri Jun 10 16:41:19 2011 > New Revision: 1134382 > > URL: http://svn.apache.org/viewvc?rev=1134382&view=rev > Log: > Bikeshed. > > * site-nav.html: Say 'Source' in the navigation bar entry. +1 -- C. Michael Pilato CollabNet <> www.collab.net <> Distributed Development On Demand signature.asc Description: OpenPGP digital signature
svn commit: r1134382 - /subversion/site/publish/site-nav.html
Author: danielsh Date: Fri Jun 10 16:41:19 2011 New Revision: 1134382 URL: http://svn.apache.org/viewvc?rev=1134382&view=rev Log: Bikeshed. * site-nav.html: Say 'Source' in the navigation bar entry. Modified: subversion/site/publish/site-nav.html Modified: subversion/site/publish/site-nav.html URL: http://svn.apache.org/viewvc/subversion/site/publish/site-nav.html?rev=1134382&r1=1134381&r2=1134382&view=diff == --- subversion/site/publish/site-nav.html (original) +++ subversion/site/publish/site-nav.html Fri Jun 10 16:41:19 2011 @@ -13,7 +13,7 @@ Getting Subversion - Download + Source Download Binary Packages Release Notes
svn commit: r1134380 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 16:40:56 2011 New Revision: 1134380 URL: http://svn.apache.org/viewvc?rev=1134380&view=rev Log: * site/publish/download/download.html Fix title casing inconsistency. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134380&r1=1134379&r2=1134380&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 16:40:56 2011 @@ -165,7 +165,7 @@ fill up the above queue. --> -Verifying the integrity of the files +Verifying the Integrity of Downloaded Files ¶
svn commit: r1134379 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 16:39:12 2011 New Revision: 1134379 URL: http://svn.apache.org/viewvc?rev=1134379&view=rev Log: * site/publish/download/download.html Make the "installing" section more explicit. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134379&r1=1134378&r2=1134379&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 16:39:12 2011 @@ -209,13 +209,13 @@ Textutils. -Installing Subversion +Building and Installing Subversion ¶ -For information about what to do with your freshly downloaded - source code release, see our Source - Code page. +For information about building and installing your freshly + downloaded source code release, see the + Source Code page.
svn commit: r1134377 - /subversion/site/publish/site-nav.html
Author: cmpilato Date: Fri Jun 10 16:36:52 2011 New Revision: 1134377 URL: http://svn.apache.org/viewvc?rev=1134377&view=rev Log: * site/publish/site-nav.html Go "live" with the /download/ page by replacing the existing Source Code left-nav menu link with a pointer to that page. Modified: subversion/site/publish/site-nav.html Modified: subversion/site/publish/site-nav.html URL: http://svn.apache.org/viewvc/subversion/site/publish/site-nav.html?rev=1134377&r1=1134376&r2=1134377&view=diff == --- subversion/site/publish/site-nav.html (original) +++ subversion/site/publish/site-nav.html Fri Jun 10 16:36:52 2011 @@ -13,8 +13,8 @@ Getting Subversion + Download Binary Packages - Source Code Release Notes
svn commit: r1134375 - in /subversion/site/publish: download/download.html source-code.html
Author: cmpilato Date: Fri Jun 10 16:34:03 2011 New Revision: 1134375 URL: http://svn.apache.org/viewvc?rev=1134375&view=rev Log: * site/publish/download/download.html Lose all the redundant stuff about building, checking out from version control, nightlies, etc., leaving just a pointer to the Source Code page for those details. * site/publish/source-code.html Point folks to the Download page for, you know, downloads. Modified: subversion/site/publish/download/download.html subversion/site/publish/source-code.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134375&r1=1134374&r2=1134375&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 16:34:03 2011 @@ -214,70 +214,8 @@ Textutils. title="Link to this section">¶ -You can install Subversion by compiling - its source code release directly, or - you can install one of the prepackaged - binaries if there is one for your operating system. Unless a - release has "alpha", "beta", or "rc" in - its name, it is tested and considered stable for production - use. - -When upgrading, just install "on top of" the older release. - Subversion 1.x is forward-compatible with any newer 1.y. No - repository upgrade is required. As long as client and server both - have the same major release number (1), olders clients will work - with newer servers and newer clients will work with older servers. - The only caveat is that if the client and server minor release - numbers don't match (e.g., 1.0 and 1.1), then some of the features - of the newer release may not be activated. +For information about what to do with your freshly downloaded + source code release, see our Source + Code page. - - -Checking Out Subversion - ¶ - - -Subversion's source code is stored in the - http://svn.apache.org/repos/asf/subversion"; - >subversion tree of the - main http://svn.apache.org/repos/asf"; >Subversion - repository of the Apache Software Foundation. - You can checkout the latest version of the code - using the following command: - - -$ svn co http://svn.apache.org/repos/asf/subversion/trunk subversion - - - - - - -Nightly Source Releases - ¶ - - -The project also produces nightly source code snapshots based upon the -latest development sources. These are available as -http://ci.apache.org/projects/subversion/nightlies/index.html";>nightly -source releases, and are only recommended for people who would like to -test cutting-edge new features. These are not for production use! - - - - -Web Access - ¶ - - -If you would rather browse the source code, rather than download - it, you can do so via Apache's http://viewvc.org"; - >ViewVC instance. Just use the following link: - http://svn.apache.org/viewvc/subversion/trunk/"; - >http://svn.apache.org/viewvc/subversion/trunk/ - - Modified: subversion/site/publish/source-code.html URL: http://svn.apache.org/viewvc/subversion/site/publish/source-code.html?rev=1134375&r1=1134374&r2=1134375&view=diff == --- subversion/site/publish/source-code.html (original) +++ subversion/site/publish/source-code.html Fri Jun 10 16:34:03 2011 @@ -17,11 +17,6 @@ Source Code - -The best available version of Apache Subversion - is: 1.6.17 - - You can install Subversion by compiling its source code release directly, or you can install one of the prepackaged @@ -48,20 +43,19 @@ To build Subversion from a source code release: - Download the latest distribution from the http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; - >Source Releases Area. - Windows users should download .zip files. For all other operating - systems, download .tar.gz or .tar.bz2 files. + Download the latest source code + distribution or checkout the source code + from version control. - Build and install it according to the instructions in the + Build and install it according to the instructions in the http://svn.apache.org/repos/asf/subversion/trunk/INSTALL";>INSTALL - file in the top level of the distribution. You will end up with a - 'svn' binary in the subversion/svn/ subdirectory - (or installed in /usr/local/bin/, if you ran - 'make install'.) + file in the top level of the distribution. +When your build is complete, you should find the 'svn' binary in + the subversion/svn/ subdirectory (or installed + in /usr/local/bin/, if you ran 'make install'). +
svn commit: r1134372 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 16:20:49 2011 New Revision: 1134372 URL: http://svn.apache.org/viewvc?rev=1134372&view=rev Log: * site/publish/download/download.html Oh, scrap attempts to make the current "Recommended release" section pretty. It won't be ugly for long. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134372&r1=1134371&r2=1134372&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 16:20:49 2011 @@ -82,23 +82,10 @@ fill up the above queue. --> title="Link to this section">¶ -The following is the latest stable release of - Subversion: - -Subversion 1.6.17 - - - - File - SHA1 - Signatures - - - This release is available for download from the -http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; ->Tigris Source Releases area. - - +The latest stable release of Subversion is 1.6.17. This release is + available for download from the + http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; + >Tigris Source Releases area.
svn commit: r1134371 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 16:19:03 2011 New Revision: 1134371 URL: http://svn.apache.org/viewvc?rev=1134371&view=rev Log: * site/publish/download/download.html Make the "Recommended release" section look a little bit more like it might once we're shipping from ASF hardware. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134371&r1=1134370&r2=1134371&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 16:19:03 2011 @@ -87,9 +87,18 @@ fill up the above queue. --> Subversion 1.6.17 -This release is available for download from the - http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; - >Tigris Source Releases area. + + + File + SHA1 + Signatures + + + This release is available for download from the +http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; +>Tigris Source Releases area. + +
svn commit: r1134369 - /subversion/site/publish/download/download.html
Author: cmpilato Date: Fri Jun 10 16:15:51 2011 New Revision: 1134369 URL: http://svn.apache.org/viewvc?rev=1134369&view=rev Log: * site/publish/download/download.html Rename "Latest release" section to "Recommended release". Renamed "Supported release" to "Supported release(s)", and explicitly list both 1.5.9 and 1.6.17. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134369&r1=1134368&r2=1134369&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 16:15:51 2011 @@ -8,7 +8,7 @@ disappears. The best available version of Apache Subversion - is: 1.6.17 + is: 1.6.17 Use the links below to download Apache Subversion from our of our mirrors. @@ -76,25 +76,40 @@ Other mirrors: Since we're just starting out with ASF infrastructure, it may take a while to fill up the above queue. --> - -Latest Release - +Recommended Release + ¶ -The latest release is 1.6.17. It can be found in the Tigris -http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74";>Source Releases Area. +The following is the latest stable release of + Subversion: - +Subversion 1.6.17 - -Supported Release - This release is available for download from the + http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74"; + >Tigris Source Releases area. + + + + +Supported Release(s) + ¶ -We still support 1.5.9, which can be downloaded from the -http://archive.apache.org/dist/subversion/";>Apache archive. +We support the latest release available from the following release + lines: + + +Subversion 1.5.x: 1.5.9 +Subversion 1.6.x: 1.6.17 + + +All supported releases are available for download from + the http://archive.apache.org/dist/subversion/"; >Apache + archive.
svn commit: r1134364 - /subversion/site/publish/mailing-lists.html
Author: danielsh Date: Fri Jun 10 16:11:45 2011 New Revision: 1134364 URL: http://svn.apache.org/viewvc?rev=1134364&view=rev Log: * /site/publish/mailing-lists.html: Linguistic style tweaks. Modified: subversion/site/publish/mailing-lists.html Modified: subversion/site/publish/mailing-lists.html URL: http://svn.apache.org/viewvc/subversion/site/publish/mailing-lists.html?rev=1134364&r1=1134363&r2=1134364&view=diff == --- subversion/site/publish/mailing-lists.html (original) +++ subversion/site/publish/mailing-lists.html Fri Jun 10 16:11:45 2011 @@ -77,7 +77,7 @@ all usage questions here. This is the default mailing list, if such a concept makes sense. If you're in doubt as to whether a post should go here or to - 'dev', then it should probably go here. first. People + 'dev', then it should go here first. People will suggest posting it to 'dev' if that's appropriate.
svn commit: r1134363 - /subversion/site/publish/download/download.html
Author: danielsh Date: Fri Jun 10 16:10:17 2011 New Revision: 1134363 URL: http://svn.apache.org/viewvc?rev=1134363&view=rev Log: * /site/publish/download/download.html (pre-releases): Point to mailing-lists.html. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134363&r1=1134362&r2=1134363&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 16:10:17 2011 @@ -111,8 +111,8 @@ fill up the above queue. --> no upgrade path is promised for APIs and on-disk files (working copies and repositories) between the pre-releases and the final release. - Please report any issues to us...@subversion.apache.org. + Please report any issues to us...@subversion.apache.org. Subversion 1.7.0-alpha1
svn commit: r1134361 - /subversion/site/publish/download/download.html
Author: danielsh Date: Fri Jun 10 16:06:40 2011 New Revision: 1134361 URL: http://svn.apache.org/viewvc?rev=1134361&view=rev Log: * /site/publish/download/download.html (pre-releases): Tweak the warning, and fix a typo. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134361&r1=1134360&r2=1134361&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 16:06:40 2011 @@ -105,10 +105,14 @@ fill up the above queue. --> -The following releases are offered for pre-release testing. The usual - caveats apply, including the fact that there are known issues, and APIs and - file formats may change before the final release. Please report any issues - to u...@subversion.apache.org. + The following releases are offered for pre-release testing. The http://mail-archives.apache.org/mod_mbox/subversion-announce/201106.mbox/%3cBANLkTi=hfhxwpygkp7xosl4j39tssd3...@mail.gmail.com%3e"; + >usual caveats apply, including the fact that there are known issues, and + no upgrade path is promised for APIs and on-disk files (working copies and + repositories) between the pre-releases and the final release. + + Please report any issues to us...@subversion.apache.org. Subversion 1.7.0-alpha1
svn commit: r1134354 - /subversion/site/publish/download/download.html
Author: hwright Date: Fri Jun 10 15:48:55 2011 New Revision: 1134354 URL: http://svn.apache.org/viewvc?rev=1134354&view=rev Log: * publish/download/download.html: Fix copy-pasto. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134354&r1=1134353&r2=1134354&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 15:48:55 2011 @@ -143,7 +143,7 @@ fill up the above queue. --> http://svn.apache.org/repos/asf/subversion/trunk/INSTALL";>INSTALL file for instructions on how to build Subversion. -The dependencies distribution subversion-deps-* is no longer +The dependencies distribution subversion-deps-* is no longer available in 1.7 and later. See The 1.7 release notes for details and alternatives.
svn commit: r1134353 - /subversion/site/publish/download/download.html
Author: danielsh Date: Fri Jun 10 15:39:23 2011 New Revision: 1134353 URL: http://svn.apache.org/viewvc?rev=1134353&view=rev Log: * /site/publish/download/download.html (source-releases): Link to pointer to get-deps.sh. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134353&r1=1134352&r2=1134353&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 15:39:23 2011 @@ -143,6 +143,10 @@ fill up the above queue. --> http://svn.apache.org/repos/asf/subversion/trunk/INSTALL";>INSTALL file for instructions on how to build Subversion. +The dependencies distribution subversion-deps-* is no longer + available in 1.7 and later. See The 1.7 release notes for details and alternatives. +
svn commit: r1134312 - /subversion/site/publish/download/download.html
Author: hwright Date: Fri Jun 10 13:23:02 2011 New Revision: 1134312 URL: http://svn.apache.org/viewvc?rev=1134312&view=rev Log: Add a section noting the supported 1.5.9 release, and where to get it. * publish/download/download.html (supported-release): New. (pre-releases): Fix a typo. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134312&r1=1134311&r2=1134312&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 13:23:02 2011 @@ -87,8 +87,19 @@ fill up the above queue. --> + +Supported Release + ¶ + + +We still support 1.5.9, which can be downloaded from the +http://archive.apache.org/dist/subversion/";>Apache archive. + + + -Pre-releases Release +Pre-releases ¶
svn propchange: r1134302 - svn:log
Author: julianfoad Revision: 1134302 Modified property: svn:log Modified: svn:log at Fri Jun 10 13:19:23 2011 -- --- svn:log (original) +++ svn:log Fri Jun 10 13:19:23 2011 @@ -2,7 +2,7 @@ Remove redundant code. * subversion/libsvn_subr/dirent_uri.c (svn_uri_skip_ancestor): Remove the checks for the parent URL length being -zero, as the assertions guarantee it contains at least a schema. +zero, as the API contract guarantees it contains at least a schema. * subversion/tests/libsvn_subr/dirent_uri-test.c (test_relpath_skip_ancestor): Remove duplicate test cases.
svn commit: r1134309 - /subversion/site/publish/download/download.html
Author: hwright Date: Fri Jun 10 13:15:36 2011 New Revision: 1134309 URL: http://svn.apache.org/viewvc?rev=1134309&view=rev Log: A few stylistic tweaks to the download page. * publish/download/download.html (source-release): Rename to source-releases. (pre-releases): Center the content, and make the header bigger. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134309&r1=1134308&r2=1134309&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 13:15:36 2011 @@ -62,14 +62,12 @@ Other mirrors: - -Source Release - +Source Releases + ¶ -The most recent versions of Subversion are: - title="Link to this section">¶ - + The following releases are offered for pre-release testing. The usual caveats apply, including the fact that there are known issues, and APIs and file formats may change before the final release. Please report any issues to u...@subversion.apache.org. -Subversion 1.7.0-alpha1 - +Subversion 1.7.0-alpha1 + File SHA1 @@ -134,7 +132,7 @@ fill up the above queue. --> http://svn.apache.org/repos/asf/subversion/trunk/INSTALL";>INSTALL file for instructions on how to build Subversion. - + Verifying the integrity of the files @@ -187,7 +185,7 @@ Textutils. You can install Subversion by compiling - its source code release directly, or + its source code release directly, or you can install one of the prepackaged binaries if there is one for your operating system. Unless a release has "alpha", "beta", or "rc" in
svn commit: r1134306 - /subversion/site/publish/download/download.html
Author: hwright Date: Fri Jun 10 13:07:42 2011 New Revision: 1134306 URL: http://svn.apache.org/viewvc?rev=1134306&view=rev Log: More work on the download page, pointing out that 1.7.0-alpha1 is a pre-release, and add a link to 1.6.17 at the tirgis downloads area. Also put some text in the INSTALLING section. * publish/download/download.html (pre-release, latest-release): New. (installing): New. Modified: subversion/site/publish/download/download.html Modified: subversion/site/publish/download/download.html URL: http://svn.apache.org/viewvc/subversion/site/publish/download/download.html?rev=1134306&r1=1134305&r2=1134306&view=diff == --- subversion/site/publish/download/download.html (original) +++ subversion/site/publish/download/download.html Fri Jun 10 13:07:42 2011 @@ -1,6 +1,5 @@ -Note: Subversion 1.7 is not released yet, and -this page is still under construction. Please see the +Note:This page is still under construction. Please see the source code page until this notice disappears. @@ -9,7 +8,7 @@ disappears. The best available version of Apache Subversion - is: 1.7.0-alpha1 + is: 1.6.17 Use the links below to download Apache Subversion from our of our mirrors. @@ -17,7 +16,7 @@ disappears. the downloaded files using signatures downloaded from our main directory. -The following are the currently support versions of Subversion. Older +The following are the currently supported versions of Subversion. Older releases are available from the http://archive.apache.org/dist/subversion/";>archive download site. @@ -63,23 +62,6 @@ Other mirrors: -You can install Subversion by compiling - its source code release directly, or - you can install one of the prepackaged - binaries if there is one for your operating system. Unless a - release has "alpha", "beta", or "rc" in - its name, it is tested and considered stable for production - use. - -When upgrading, just install "on top of" the older release. - Subversion 1.x is forward-compatible with any newer 1.y. No - repository upgrade is required. As long as client and server both - have the same major release number (1), olders clients will work - with newer servers and newer clients will work with older servers. - The only caveat is that if the client and server minor release - numbers don't match (e.g., 1.0 and 1.1), then some of the features - of the newer release may not be activated. - Source Release -Subversion 1.7.0-alpha1 + +Latest Release + ¶ + + +The latest release is 1.6.17. It can be found in the Tigris +http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=260&expandFolder=74";>Source Releases Area. + + + + +Pre-releases Release + ¶ + + + +The following releases are offered for pre-release testing. The usual + caveats apply, including the fact that there are known issues, and APIs and + file formats may change before the final release. Please report any issues + to u...@subversion.apache.org. + + +Subversion 1.7.0-alpha1 File @@ -120,6 +126,8 @@ fill up the above queue. --> + + Windows users should download .zip files. For all other operating systems, download .tar.gz or .tar.bz2 files. See the instructions in the @@ -172,6 +180,31 @@ Textutils. + +Installing Subversion + ¶ + + +You can install Subversion by compiling + its source code release directly, or + you can install one of the prepackaged + binaries if there is one for your operating system. Unless a + release has "alpha", "beta", or "rc" in + its name, it is tested and considered stable for production + use. + +When upgrading, just install "on top of" the older release. + Subversion 1.x is forward-compatible with any newer 1.y. No + repository upgrade is required. As long as client and server both + have the same major release number (1), olders clients will work + with newer servers and newer clients will work with older servers. + The only caveat is that if the client and server minor release + numbers don't match (e.g., 1.0 and 1.1), then some of the features + of the newer release may not be activated. + + + Checking Out Subversion
svn commit: r1134305 - /subversion/trunk/subversion/libsvn_client/mergeinfo.c
Author: rhuijben
Date: Fri Jun 10 13:07:20 2011
New Revision: 1134305
URL: http://svn.apache.org/viewvc?rev=1134305&view=rev
Log:
* subversion/libsvn_client/mergeinfo.c
(elide_mergeinfo): Fix tests broken by r1134296, by removing an argument
that wasn't documented to be NULL, but was always NULL.
(svn_client__elide_mergeinfo): Update caller.
Modified:
subversion/trunk/subversion/libsvn_client/mergeinfo.c
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1134305&r1=1134304&r2=1134305&view=diff
==
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Fri Jun 10 13:07:20
2011
@@ -839,7 +839,6 @@ static svn_error_t *
elide_mergeinfo(svn_mergeinfo_t parent_mergeinfo,
svn_mergeinfo_t child_mergeinfo,
const char *local_abspath,
-const char *path_suffix,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
{
@@ -848,8 +847,8 @@ elide_mergeinfo(svn_mergeinfo_t parent_m
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
SVN_ERR(should_elide_mergeinfo(&elides,
- parent_mergeinfo, child_mergeinfo,
- path_suffix, scratch_pool));
+ parent_mergeinfo, child_mergeinfo, NULL,
+ scratch_pool));
if (elides)
{
@@ -861,16 +860,18 @@ elide_mergeinfo(svn_mergeinfo_t parent_m
if (ctx->notify_func2)
{
- const char *path = svn_dirent_join(local_abspath, path_suffix,
- scratch_pool);
- svn_wc_notify_t *notify =
-svn_wc_create_notify(path, svn_wc_notify_merge_elide_info,
- scratch_pool);
+ svn_wc_notify_t *notify;
+ notify = svn_wc_create_notify(local_abspath,
+svn_wc_notify_merge_elide_info,
+scratch_pool);
ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
- notify = svn_wc_create_notify(path, svn_wc_notify_update_update,
+
+ notify = svn_wc_create_notify(local_abspath,
+svn_wc_notify_update_update,
scratch_pool);
notify->prop_state = svn_wc_notify_state_changed;
+
ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
}
}
@@ -982,7 +983,7 @@ svn_client__elide_mergeinfo(const char *
return SVN_NO_ERROR;
SVN_ERR(elide_mergeinfo(mergeinfo, target_mergeinfo, target_abspath,
- NULL, ctx, pool));
+ ctx, pool));
}
return SVN_NO_ERROR;
}
svn commit: r1134302 - in /subversion/trunk/subversion: libsvn_subr/dirent_uri.c tests/libsvn_subr/dirent_uri-test.c
Author: julianfoad
Date: Fri Jun 10 13:02:55 2011
New Revision: 1134302
URL: http://svn.apache.org/viewvc?rev=1134302&view=rev
Log:
Remove redundant code.
* subversion/libsvn_subr/dirent_uri.c
(svn_uri_skip_ancestor): Remove the checks for the parent URL length being
zero, as the assertions guarantee it contains at least a schema.
* subversion/tests/libsvn_subr/dirent_uri-test.c
(test_relpath_skip_ancestor): Remove duplicate test cases.
Modified:
subversion/trunk/subversion/libsvn_subr/dirent_uri.c
subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1134302&r1=1134301&r2=1134302&view=diff
==
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Fri Jun 10 13:02:55
2011
@@ -1527,10 +1527,7 @@ svn_uri_skip_ancestor(const char *parent
if (child_uri[len] == 0)
return ""; /* parent_uri == child_uri */
- if (len == 1 && child_uri[0] == '/')
-return child_uri + 1;
-
- if (len > 0 && child_uri[len] == '/')
+ if (child_uri[len] == '/')
return child_uri + len + 1;
return child_uri;
Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1134302&r1=1134301&r2=1134302&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Fri Jun 10
13:02:55 2011
@@ -1532,12 +1532,9 @@ test_relpath_skip_ancestor(apr_pool_t *p
{ "foo", "foot", "foot"},
{ "foot","foo","foo"},
{ "","foo","foo"},
-{ "","foo","foo"},
-{ "","foo","foo"},
{ "foo/bar/bla", "foo/bar","foo/bar"},
{ "foo/bar", "foo/bar/bla","bla"},
{ "foo/bar", "foo","foo"},
-{ "foo/bar", "foo","foo"},
{ "","bar/bla","bar/bla"},
{ "http:/server","http:/server/q", "q" },
{ "svn:/server", "http:/server/q", "http:/server/q" },
svn commit: r1134296 - in /subversion/trunk/subversion: libsvn_client/mergeinfo.c libsvn_subr/config_file.c
Author: rhuijben
Date: Fri Jun 10 12:53:53 2011
New Revision: 1134296
URL: http://svn.apache.org/viewvc?rev=1134296&view=rev
Log:
Don't use svn_dirent_join_many() when there are just two path components.
* subversion/libsvn_client/mergeinfo.c
(elide_mergeinfo): Calculate path once and use a normal join.
* subversion/libsvn_subr/config_file.c
(ensure_auth_subdir): Use simple joins when possible.
Modified:
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_subr/config_file.c
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1134296&r1=1134295&r2=1134296&view=diff
==
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Fri Jun 10 12:53:53
2011
@@ -861,18 +861,14 @@ elide_mergeinfo(svn_mergeinfo_t parent_m
if (ctx->notify_func2)
{
+ const char *path = svn_dirent_join(local_abspath, path_suffix,
+ scratch_pool);
svn_wc_notify_t *notify =
-svn_wc_create_notify(
- svn_dirent_join_many(scratch_pool, local_abspath,
- path_suffix, NULL),
- svn_wc_notify_merge_elide_info, scratch_pool);
+svn_wc_create_notify(path, svn_wc_notify_merge_elide_info,
+ scratch_pool);
ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
- notify = svn_wc_create_notify(svn_dirent_join_many(scratch_pool,
- local_abspath,
- path_suffix,
- NULL),
-svn_wc_notify_update_update,
+ notify = svn_wc_create_notify(path, svn_wc_notify_update_update,
scratch_pool);
notify->prop_state = svn_wc_notify_state_changed;
ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
Modified: subversion/trunk/subversion/libsvn_subr/config_file.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_file.c?rev=1134296&r1=1134295&r2=1134296&view=diff
==
--- subversion/trunk/subversion/libsvn_subr/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_file.c Fri Jun 10 12:53:53
2011
@@ -463,7 +463,7 @@ ensure_auth_subdir(const char *auth_dir,
const char *subdir_full_path;
svn_node_kind_t kind;
- subdir_full_path = svn_dirent_join_many(pool, auth_dir, subdir, NULL);
+ subdir_full_path = svn_dirent_join(auth_dir, subdir, pool);
err = svn_io_check_path(subdir_full_path, &kind, pool);
if (err || kind == svn_node_none)
{
@@ -485,7 +485,7 @@ ensure_auth_dirs(const char *path,
svn_error_t *err;
/* Ensure ~/.subversion/auth/ */
- auth_dir = svn_dirent_join_many(pool, path, SVN_CONFIG__AUTH_SUBDIR, NULL);
+ auth_dir = svn_dirent_join(path, SVN_CONFIG__AUTH_SUBDIR, pool);
err = svn_io_check_path(auth_dir, &kind, pool);
if (err || kind == svn_node_none)
{
svn commit: r1134295 - in /subversion/trunk/subversion/tests: libsvn_subr/dirent_uri-test.c libsvn_wc/utils.c
Author: rhuijben
Date: Fri Jun 10 12:46:48 2011
New Revision: 1134295
URL: http://svn.apache.org/viewvc?rev=1134295&view=rev
Log:
Use non deprecated svn_io_ functions in a few places in our test suite, where
we aren't explicitly testing these functions.
Deprecation warnings are by default disabled in these test files to
allow testing old functions without many warnings.
* subversion/tests/libsvn_subr/dirent_uri-test.c
(test_dirent_get_absolute_from_lc_drive): Use svn_io_get_dirents3 and
new struct.
* subversion/tests/libsvn_wc/utils.c
(svn_test__create_fake_wc): Use svn_io_remove_file2.
Modified:
subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/trunk/subversion/tests/libsvn_wc/utils.c
Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1134295&r1=1134294&r2=1134295&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Fri Jun 10
12:46:48 2011
@@ -2129,7 +2129,7 @@ test_dirent_get_absolute_from_lc_drive(a
if (! getdcwd(3, current_dir_on_C, sizeof(current_dir_on_C)))
return svn_error_create(SVN_ERR_BASE, NULL, "getdcwd() failed");
- SVN_ERR(svn_io_get_dirents2(&dirents, "C:\\", pool));
+ SVN_ERR(svn_io_get_dirents3(&dirents, "C:\\", TRUE, pool, pool));
/* We need a directory on 'C:\' to switch to lower case and back.
We use the first directory we can find that is not the CWD and
@@ -2138,7 +2138,7 @@ test_dirent_get_absolute_from_lc_drive(a
for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi))
{
const char *dir = svn__apr_hash_index_key(hi);
- svn_io_dirent_t *de = svn__apr_hash_index_val(hi);
+ svn_io_dirent2_t *de = svn__apr_hash_index_val(hi);
if (de->kind == svn_node_dir &&
strcmp(dir, current_dir_on_C))
Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?rev=1134295&r1=1134294&r2=1134295&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Fri Jun 10 12:46:48 2011
@@ -130,7 +130,7 @@ svn_test__create_fake_wc(const char *wc_
/* Create fake-wc/SUBDIR/.svn/ for placing the metadata. */
SVN_ERR(svn_io_make_dir_recursively(dotsvn_abspath, scratch_pool));
- svn_error_clear(svn_io_remove_file(db_abspath, scratch_pool));
+ svn_error_clear(svn_io_remove_file2(db_abspath, FALSE, scratch_pool));
SVN_ERR(svn_wc__db_util_open_db(&sdb, wc_abspath, "wc.db",
svn_sqlite__mode_rwcreate, my_statements,
result_pool, scratch_pool));
svn commit: r1134294 - in /subversion/trunk: build.conf subversion/tests/libsvn_fs_base/fs-base-test.c subversion/tests/libsvn_fs_base/key-test.c
Author: rhuijben
Date: Fri Jun 10 12:43:22 2011
New Revision: 1134294
URL: http://svn.apache.org/viewvc?rev=1134294&view=rev
Log:
Integrate a small test in the c file of the library where it applies to. After
more than 5 years it is unlikely that we wil make some more generic svn_key_
api in the forseeable future.
* build.conf
Remove key-test project
* subversion/tests/libsvn_fs_base/key-test.c
Delete file
* subversion/tests/libsvn_fs_base/fs-base-test.c
(includes): Add key-gen.h
(key_test): Move here, from key-test.c
(test_funcs): Add key_test.
Removed:
subversion/trunk/subversion/tests/libsvn_fs_base/key-test.c
Modified:
subversion/trunk/build.conf
subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c
Modified: subversion/trunk/build.conf
URL:
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1134294&r1=1134293&r2=1134294&view=diff
==
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Fri Jun 10 12:43:22 2011
@@ -638,14 +638,6 @@ install = bdb-test
libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
libsvn_fs_util libsvn_subr apriconv apr
-[key-test]
-description = Test keygen funcs in libsvn_fs_base
-type = exe
-path = subversion/tests/libsvn_fs_base
-sources = key-test.c
-install = bdb-test
-libs = libsvn_test libsvn_fs_base libsvn_subr apriconv apr
-
[strings-reps-test]
description = Test strings/reps in libsvn_fs_base
type = exe
@@ -1118,7 +1110,7 @@ libs = svn svnadmin svndumpfilter svnloo
type = project
path = build/win32
libs = __ALL__
- fs-test fs-base-test fs-fsfs-test fs-pack-test skel-test key-test
+ fs-test fs-base-test fs-fsfs-test fs-pack-test skel-test
strings-reps-test changes-test locks-test repos-test
checksum-test compat-test config-test hashdump-test mergeinfo-test
opt-test path-test stream-test string-test time-test utf-test
Modified: subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c?rev=1134294&r1=1134293&r2=1134294&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c Fri Jun 10
12:43:22 2011
@@ -37,6 +37,7 @@
#include "../../libsvn_fs_base/trail.h"
#include "../../libsvn_fs_base/bdb/txn-table.h"
#include "../../libsvn_fs_base/bdb/nodes-table.h"
+#include "../../libsvn_fs_base/key-gen.h"
#include "private/svn_fs_util.h"
#include "../../libsvn_delta/delta.h"
@@ -1477,6 +1478,50 @@ orphaned_textmod_change(const svn_test_o
return SVN_NO_ERROR;
}
+static svn_error_t *
+key_test(apr_pool_t *pool)
+{
+ int i;
+ const char *keys[9][2] = {
+{ "0", "1" },
+{ "9", "a" },
+{ "z", "10" },
+{ "z00zz", "z0100" },
+{ "97hnq33jx2a", "97hnq33jx2b" },
+{ "97hnq33jx2z", "97hnq33jx30" },
+{ "999", "99a" },
+{ "a9z", "aa0" },
+{ "z", "10" }
+ };
+
+ for (i = 0; i < 9; i++)
+{
+ char gen_key[MAX_KEY_SIZE];
+ const char *orig_key = keys[i][0];
+ const char *next_key = keys[i][1];
+ apr_size_t len, olen;
+
+ len = strlen(orig_key);
+ olen = len;
+
+ svn_fs_base__next_key(orig_key, &len, gen_key);
+ if (! (((len == olen) || (len == (olen + 1)))
+ && (strlen(next_key) == len)
+ && (strcmp(next_key, gen_key) == 0)))
+{
+ return svn_error_createf
+(SVN_ERR_FS_GENERAL, NULL,
+ "failed to increment key \"%s\" correctly\n"
+ " expected: %s\n"
+ "actual: %s",
+ orig_key, next_key, gen_key);
+}
+}
+
+ return SVN_NO_ERROR;
+}
+
+
/* */
/* The test table. */
@@ -1504,5 +1549,7 @@ struct svn_test_descriptor_t test_funcs[
"ensure no-op for redundant copies"),
SVN_TEST_OPTS_PASS(orphaned_textmod_change,
"test for orphaned textmod changed paths"),
+SVN_TEST_PASS2(key_test,
+ "testing sequential alphanumeric key generation"),
SVN_TEST_NULL
};
Re: svn commit: r1134075 - in /subversion/trunk: configure.ac tools/dist/construct-rolling-environment.sh
get-deps.sh too? arfre...@apache.org wrote on Thu, Jun 09, 2011 at 21:01:19 -: > Author: arfrever > Date: Thu Jun 9 21:01:18 2011 > New Revision: 1134075 > > URL: http://svn.apache.org/viewvc?rev=1134075&view=rev > Log: > Update versions of some dependencies. > > * configure.ac > (NEON_RECOMMENDED_VER): Recommend Neon 0.29.6. > (SQLITE_RECOMMENDED_VER): Recommend SQLite 3.7.6.3. > > * tools/dist/construct-rolling-environment.sh: Use Autoconf 2.68, Libtool 2.4 >and SWIG 2.0.4. > > Modified: > subversion/trunk/configure.ac > subversion/trunk/tools/dist/construct-rolling-environment.sh >
svn commit: r1134291 - /subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
Author: rhuijben
Date: Fri Jun 10 12:28:02 2011
New Revision: 1134291
URL: http://svn.apache.org/viewvc?rev=1134291&view=rev
Log:
* subversion/tests/libsvn_fs_fs/fs-pack-test.c
(write_format,
create_packed_filesystem,
pack_filesystem,
pack_even_filesystem): Use dirent functions for path processing.
Modified:
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=1134291&r1=1134290&r2=1134291&view=diff
==
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Fri Jun 10
12:28:02 2011
@@ -50,7 +50,7 @@ write_format(const char *path,
{
const char *contents;
- path = svn_path_join(path, "format", pool);
+ path = svn_dirent_join(path, "format", pool);
if (format >= SVN_FS_FS__MIN_LAYOUT_FORMAT_OPTION_FORMAT)
{
@@ -74,7 +74,7 @@ write_format(const char *path,
const char *path_tmp;
SVN_ERR(svn_io_write_unique(&path_tmp,
- svn_path_dirname(path, pool),
+ svn_dirent_dirname(path, pool),
contents, strlen(contents),
svn_io_file_del_none, pool));
@@ -124,7 +124,7 @@ create_packed_filesystem(const char *dir
/* Rewrite the format file */
SVN_ERR(svn_io_read_version_file(&version,
- svn_path_join(dir, "format", subpool),
+ svn_dirent_join(dir, "format", subpool),
subpool));
SVN_ERR(write_format(dir, version, shard_size, subpool));
@@ -189,9 +189,9 @@ pack_filesystem(const svn_test_opts_t *o
don't. */
for (i = 0; i < (MAX_REV + 1) / SHARD_SIZE; i++)
{
- path = svn_path_join_many(pool, REPO_NAME, "revs",
-apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
-"pack", NULL);
+ path = svn_dirent_join_many(pool, REPO_NAME, "revs",
+ apr_psprintf(pool, "%d.pack", i /
SHARD_SIZE),
+ "pack", NULL);
/* These files should exist. */
SVN_ERR(svn_io_check_path(path, &kind, pool));
@@ -199,9 +199,9 @@ pack_filesystem(const svn_test_opts_t *o
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
"Expected pack file '%s' not found", path);
- path = svn_path_join_many(pool, REPO_NAME, "revs",
-apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
-"manifest", NULL);
+ path = svn_dirent_join_many(pool, REPO_NAME, "revs",
+ apr_psprintf(pool, "%d.pack", i /
SHARD_SIZE),
+ "manifest", NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -209,9 +209,9 @@ pack_filesystem(const svn_test_opts_t *o
path);
/* This directory should not exist. */
- path = svn_path_join_many(pool, REPO_NAME, "revs",
-apr_psprintf(pool, "%d", i / SHARD_SIZE),
-NULL);
+ path = svn_dirent_join_many(pool, REPO_NAME, "revs",
+ apr_psprintf(pool, "%d", i / SHARD_SIZE),
+ NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_none)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -220,8 +220,8 @@ pack_filesystem(const svn_test_opts_t *o
/* Ensure the min-unpacked-rev jives with the above operations. */
SVN_ERR(svn_io_file_open(&file,
- svn_path_join(REPO_NAME, PATH_MIN_UNPACKED_REV,
- pool),
+ svn_dirent_join(REPO_NAME, PATH_MIN_UNPACKED_REV,
+ pool),
APR_READ | APR_BUFFERED, APR_OS_DEFAULT, pool));
len = sizeof(buf);
SVN_ERR(svn_io_read_length_line(file, buf, &len, pool));
@@ -231,9 +231,9 @@ pack_filesystem(const svn_test_opts_t *o
"Bad '%s' contents", PATH_MIN_UNPACKED_REV);
/* Finally, make sure the final revision directory does exist. */
- path = svn_path_join_many(pool, REPO_NAME, "revs",
-apr_psprintf(pool, "%d", (i / SHARD_SIZE) + 1),
-NULL);
+ path = svn_dirent_join_many(pool, REPO_NAME, "revs",
+ apr_psprintf(pool, "%d", (i / SHARD_SIZE) + 1),
+
svn commit: r1134290 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: rhuijben
Date: Fri Jun 10 12:22:34 2011
New Revision: 1134290
URL: http://svn.apache.org/viewvc?rev=1134290&view=rev
Log:
Properly calculate the url of deleted and working-excluded nodes. Inside a
deleted subtree the information on whether a node was a copy before deleting
or a switched base node wasn't properly interpreted.
* subversion/libsvn_wc/wc_db.c
(read_url_txn): Handle svn_wc__db_status_deleted via layering and fix
the fallback case which is now only used for excluded in op_depth > 0.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1134290&r1=1134289&r2=1134290&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jun 10 12:22:34 2011
@@ -7249,39 +7249,74 @@ read_url_txn(void *baton,
NULL, NULL, wcroot, local_relpath,
scratch_pool, scratch_pool));
}
- else if (have_base)
+ else if (status == svn_wc__db_status_deleted)
{
- SVN_ERR(base_get_info(NULL, NULL, NULL, &repos_relpath, &repos_id,
-NULL, NULL, NULL, NULL, NULL,
-NULL, NULL, NULL, NULL,
+ const char *base_del_relpath;
+ const char *work_del_relpath;
+
+ SVN_ERR(scan_deletion(&base_del_relpath, NULL, &work_del_relpath,
wcroot, local_relpath,
scratch_pool, scratch_pool));
+
+ if (base_del_relpath)
+{
+ SVN_ERR(base_get_info(NULL, NULL, NULL, &repos_relpath,
+&repos_id, NULL, NULL, NULL, NULL, NULL,
+NULL, NULL, NULL, NULL,
+wcroot, base_del_relpath,
+scratch_pool, scratch_pool));
+
+ repos_relpath = svn_relpath_join(
+repos_relpath,
+svn_dirent_skip_ancestor(base_del_relpath,
+ local_relpath),
+scratch_pool);
+}
+ else
+{
+ /* The parent of the WORKING delete, must be an addition */
+ const char *work_relpath = svn_relpath_dirname(work_del_relpath,
+ scratch_pool);
+
+ SVN_ERR(scan_addition(NULL, NULL, &repos_relpath, &repos_id,
+NULL, NULL, NULL,
+wcroot, work_relpath,
+scratch_pool, scratch_pool));
+
+ repos_relpath = svn_relpath_join(
+repos_relpath,
+svn_dirent_skip_ancestor(work_relpath,
+ local_relpath),
+scratch_pool);
+}
}
- else if (status == svn_wc__db_status_absent
- || status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_not_present
- || (!have_base && (status == svn_wc__db_status_deleted)))
+ else if (status == svn_wc__db_status_excluded)
{
const char *parent_relpath;
+ const char *name;
struct read_url_baton_t new_rub;
const char *url;
- /* Set 'repos_root_url' to the *full URL* of the parent WC dir,
- * and 'repos_relpath' to the *single path component* that is the
+ /* Set 'url' to the *full URL* of the parent WC dir,
+ * and 'name' to the *single path component* that is the
* basename of this WC directory, so that joining them will result
* in the correct full URL. */
- svn_relpath_split(&parent_relpath, &repos_relpath, local_relpath,
+ svn_relpath_split(&parent_relpath, &name, local_relpath,
scratch_pool);
new_rub.result_pool = scratch_pool;
new_rub.url = &url;
SVN_ERR(read_url_txn(&new_rub, wcroot, parent_relpath,
scratch_pool));
+
+ *rub->url = svn_path_url_add_component2(url, name, rub->result_pool);
+
+ return SVN_NO_ERROR;
}
else
{
- /* Status: obstructed, obstructed_add */
- *rub->url = NULL;
- return SVN_NO_ERROR;
+ /* All working statee are explicitly handled and all base statee
+ have a repos_relpath */
+ SVN_ERR_MALFUNCTION();
}
}
Re: svn commit: r1134075 - in /subversion/trunk: configure.ac tools/dist/construct-rolling-environment.sh
arfre...@apache.org wrote on Thu, Jun 09, 2011 at 21:01:19 -:
> Author: arfrever
> Date: Thu Jun 9 21:01:18 2011
> New Revision: 1134075
>
> URL: http://svn.apache.org/viewvc?rev=1134075&view=rev
> Log:
> Update versions of some dependencies.
>
> * configure.ac
> (NEON_RECOMMENDED_VER): Recommend Neon 0.29.6.
> (SQLITE_RECOMMENDED_VER): Recommend SQLite 3.7.6.3.
>
> * tools/dist/construct-rolling-environment.sh: Use Autoconf 2.68, Libtool 2.4
>and SWIG 2.0.4.
>
> Modified:
> subversion/trunk/configure.ac
> subversion/trunk/tools/dist/construct-rolling-environment.sh
>
> Modified: subversion/trunk/configure.ac
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1134075&r1=1134074&r2=1134075&view=diff
> ==
> --- subversion/trunk/configure.ac (original)
> +++ subversion/trunk/configure.ac Thu Jun 9 21:01:18 2011
> @@ -104,7 +104,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config)
> # Either a space-separated list of allowable Neon versions, or "any" to
> # mean allow anything.
> NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
> -NEON_RECOMMENDED_VER="0.29.0"
> +NEON_RECOMMENDED_VER="0.29.6"
> NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz";
> dnl You can skip the neon version check only if you know what you are doing
> AC_ARG_ENABLE(neon-version-check,
> @@ -153,7 +153,7 @@ SVN_FIND_APACHE(20020903)
>
> dnl Search for SQLite
> SQLITE_MINIMUM_VER="3.6.18"
> -SQLITE_RECOMMENDED_VER="3.7.2"
> +SQLITE_RECOMMENDED_VER="3.7.6.3"
>
> SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER}.tar.gz";
> SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
> ${SQLITE_URL})
>
> Modified: subversion/trunk/tools/dist/construct-rolling-environment.sh
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/tools/dist/construct-rolling-environment.sh?rev=1134075&r1=1134074&r2=1134075&view=diff
> ==
> --- subversion/trunk/tools/dist/construct-rolling-environment.sh (original)
> +++ subversion/trunk/tools/dist/construct-rolling-environment.sh Thu Jun 9
> 21:01:18 2011
> @@ -21,9 +21,9 @@
> #
> set -e
>
> -AUTOCONF=autoconf-2.64
> -LIBTOOL=libtool-1.5.26
> -SWIG=swig-1.3.36
> +AUTOCONF=autoconf-2.68
> +LIBTOOL=libtool-2.4
> +SWIG=swig-2.0.4
>
The nightly tarball rolling dies after this change:
http://ci.apache.org/builders/svn-trunk-nightly/builds/64/steps/shell/logs/stdio
> LOCATION=${LOCATION-US}
>
>
>
svn commit: r1134278 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: philip
Date: Fri Jun 10 11:10:47 2011
New Revision: 1134278
URL: http://svn.apache.org/viewvc?rev=1134278&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_global_update): Fix a compiler warning in this
unused and not fully implemented function.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1134278&r1=1134277&r2=1134278&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jun 10 11:10:47 2011
@@ -8434,6 +8434,9 @@ svn_wc__db_global_update(svn_wc__db_t *d
const svn_skel_t *work_items,
apr_pool_t *scratch_pool)
{
+ NOT_IMPLEMENTED();
+
+#if 0
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
struct update_baton_t ub;
@@ -8471,9 +8474,6 @@ svn_wc__db_global_update(svn_wc__db_t *d
ub.conflict = conflict;
ub.work_items = work_items;
- NOT_IMPLEMENTED();
-
-#if 0
SVN_ERR(svn_wc__db_with_txn(wcroot, local_relpath, update_node, &ub,
scratch_pool));
svn commit: r1134263 - /subversion/trunk/subversion/libsvn_wc/props.c
Author: stsp
Date: Fri Jun 10 10:11:30 2011
New Revision: 1134263
URL: http://svn.apache.org/viewvc?rev=1134263&view=rev
Log:
* subversion/libsvn_wc/props.c
(maybe_generate_propconflict): Rename 'old_val' and 'new_val' to
'incoming_old_val' and 'incoming_new_val' for clarity.
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1134263&r1=1134262&r2=1134263&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Fri Jun 10 10:11:30 2011
@@ -691,9 +691,9 @@ set_prop_merge_state(svn_wc_notify_state
* property conflict.
*
* BASE_VAL/WORKING_VAL represent the current state of the working
- * copy, and OLD_VAL/NEW_VAL represents the incoming propchange. Any
- * of these values might be NULL, indicating either non-existence or
- * intent-to-delete.
+ * copy, and INCOMING_OLD_VAL/INCOMING_NEW_VAL represents the incoming
+ * propchange. Any of these values might be NULL, indicating either
+ * non-existence or intent-to-delete.
*
* If the callback isn't available, or if it responds with
* 'choose_postpone', then set *CONFLICT_REMAINS to TRUE and return.
@@ -711,8 +711,8 @@ maybe_generate_propconflict(svn_boolean_
svn_boolean_t is_dir,
const char *propname,
apr_hash_t *working_props,
-const svn_string_t *old_val,
-const svn_string_t *new_val,
+const svn_string_t *incoming_old_val,
+const svn_string_t *incoming_new_val,
const svn_string_t *base_val,
const svn_string_t *working_val,
svn_wc_conflict_resolver_func2_t conflict_func,
@@ -751,25 +751,25 @@ maybe_generate_propconflict(svn_boolean_
cdesc->my_abspath = svn_dirent_join(dirpath, file_name, filepool);
}
- if (new_val)
+ if (incoming_new_val)
{
const char *file_name;
- SVN_ERR(svn_io_write_unique(&file_name, dirpath, new_val->data,
- new_val->len,
svn_io_file_del_on_pool_cleanup,
- filepool));
+ SVN_ERR(svn_io_write_unique(&file_name, dirpath, incoming_new_val->data,
+ incoming_new_val->len,
+ svn_io_file_del_on_pool_cleanup, filepool));
cdesc->their_abspath = svn_dirent_join(dirpath, file_name, filepool);
}
- if (!base_val && !old_val)
+ if (!base_val && !incoming_old_val)
{
/* If base and old are both NULL, then that's fine, we just let
base_file stay NULL as-is. Both agents are attempting to add a
new property. */
}
- else if ((base_val && !old_val)
- || (!base_val && old_val))
+ else if ((base_val && !incoming_old_val)
+ || (!base_val && incoming_old_val))
{
/* If only one of base and old are defined, then we've got a
situation where one agent is attempting to add the property
@@ -778,7 +778,8 @@ maybe_generate_propconflict(svn_boolean_
whichever older-value happens to be defined, so that the
conflict-callback can still attempt a 3-way merge. */
- const svn_string_t *conflict_base_val = base_val ? base_val : old_val;
+ const svn_string_t *conflict_base_val = base_val ? base_val
+ : incoming_old_val;
const char *file_name;
SVN_ERR(svn_io_write_unique(&file_name, dirpath,
@@ -794,7 +795,7 @@ maybe_generate_propconflict(svn_boolean_
const svn_string_t *conflict_base_val;
const char *file_name;
- if (! svn_string_compare(base_val, old_val))
+ if (! svn_string_compare(base_val, incoming_old_val))
{
/* What happens if 'base' and 'old' don't match up? In an
ideal situation, they would. But if they don't, this is
@@ -811,7 +812,7 @@ maybe_generate_propconflict(svn_boolean_
compare. */
if (working_val && svn_string_compare(base_val, working_val))
-conflict_base_val = old_val;
+conflict_base_val = incoming_old_val;
else
conflict_base_val = base_val;
}
@@ -821,11 +822,11 @@ maybe_generate_propconflict(svn_boolean_
}
SVN_ERR(svn_io_write_unique(&file_name, dirpath, conflict_base_val->data,
- conflict_base_val->len,
svn_io_file_del_on_pool_cleanup,
- filepool));
+ conflict_base_val->len,
+ svn_io_file_del_on_pool_cleanup, f
svn commit: r1134258 - /subversion/trunk/subversion/libsvn_wc/props.c
Author: stsp
Date: Fri Jun 10 09:55:18 2011
New Revision: 1134258
URL: http://svn.apache.org/viewvc?rev=1134258&view=rev
Log:
* subversion/libsvn_wc/props.c
(maybe_generate_propconflict): Rename variable 'the_val' to
'conflict_base_val' so people have a chance of guessing what it's for.
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1134258&r1=1134257&r2=1134258&view=diff
==
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Fri Jun 10 09:55:18 2011
@@ -778,18 +778,20 @@ maybe_generate_propconflict(svn_boolean_
whichever older-value happens to be defined, so that the
conflict-callback can still attempt a 3-way merge. */
- const svn_string_t *the_val = base_val ? base_val : old_val;
+ const svn_string_t *conflict_base_val = base_val ? base_val : old_val;
const char *file_name;
- SVN_ERR(svn_io_write_unique(&file_name, dirpath, the_val->data,
- the_val->len,
svn_io_file_del_on_pool_cleanup,
+ SVN_ERR(svn_io_write_unique(&file_name, dirpath,
+ conflict_base_val->data,
+ conflict_base_val->len,
+ svn_io_file_del_on_pool_cleanup,
filepool));
cdesc->base_abspath = svn_dirent_join(dirpath, file_name, filepool);
}
else /* base and old are both non-NULL */
{
- const svn_string_t *the_val;
+ const svn_string_t *conflict_base_val;
const char *file_name;
if (! svn_string_compare(base_val, old_val))
@@ -809,17 +811,17 @@ maybe_generate_propconflict(svn_boolean_
compare. */
if (working_val && svn_string_compare(base_val, working_val))
-the_val = old_val;
+conflict_base_val = old_val;
else
-the_val = base_val;
+conflict_base_val = base_val;
}
else
{
- the_val = base_val;
+ conflict_base_val = base_val;
}
- SVN_ERR(svn_io_write_unique(&file_name, dirpath, the_val->data,
- the_val->len,
svn_io_file_del_on_pool_cleanup,
+ SVN_ERR(svn_io_write_unique(&file_name, dirpath, conflict_base_val->data,
+ conflict_base_val->len,
svn_io_file_del_on_pool_cleanup,
filepool));
cdesc->base_abspath = svn_dirent_join(dirpath, file_name, filepool);
@@ -833,10 +835,11 @@ maybe_generate_propconflict(svn_boolean_
SVN_ERR(svn_stream_open_unique(&mergestream, &cdesc->merged_file,
NULL, svn_io_file_del_on_pool_cleanup,
filepool, scratch_pool));
- SVN_ERR(svn_diff_mem_string_diff3(&diff, the_val, working_val,
+ SVN_ERR(svn_diff_mem_string_diff3(&diff, conflict_base_val,
+working_val,
new_val, options, filepool));
SVN_ERR(svn_diff_mem_string_output_merge2
- (mergestream, diff, the_val, working_val, new_val,
+ (mergestream, diff, conflict_base_val, working_val, new_val,
NULL, NULL, NULL, NULL,
svn_diff_conflict_display_modified_latest, filepool));
SVN_ERR(svn_stream_close(mergestream));
svn commit: r1134219 - /subversion/trunk/configure.ac
Author: philip Date: Fri Jun 10 07:50:17 2011 New Revision: 1134219 URL: http://svn.apache.org/viewvc?rev=1134219&view=rev Log: * configure.ac: Don't replace svn_private_config.h if the content is unchanged. Modified: subversion/trunk/configure.ac Modified: subversion/trunk/configure.ac URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1134219&r1=1134218&r2=1134219&view=diff == --- subversion/trunk/configure.ac (original) +++ subversion/trunk/configure.ac Fri Jun 10 07:50:17 2011 @@ -1297,10 +1297,15 @@ AC_SUBST(INCLUDE_OUTPUTS) # Detection complete - output and run config.status = -AC_CONFIG_HEADERS(subversion/svn_private_config.h) -AC_CONFIG_COMMANDS([svn_private_config.h], - [$SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h > subversion/svn_private_config.h.new -mv -f subversion/svn_private_config.h.new subversion/svn_private_config.h], +AC_CONFIG_HEADERS(subversion/svn_private_config.h.tmp) +AC_CONFIG_COMMANDS([svn_private_config.h.tmp], + [$SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h.tmp > subversion/svn_private_config.h.tmp.new +if test -e subversion/svn_private_config.h && diff subversion/svn_private_config.h subversion/svn_private_config.h.tmp.new >/dev/null ; then + rm -f subversion/svn_private_config.h.tmp.new +else + mv -f subversion/svn_private_config.h.tmp.new subversion/svn_private_config.h +fi +rm -f subversion/svn_private_config.h.tmp], [SED="$SED" SVN_DB_HEADER="$SVN_DB_HEADER"]) AC_CONFIG_FILES([Makefile])
