You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 22:56:05 UTC
svn commit: r984206 [1/35] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/generator/ build/generator/templates/ build/hudson/
build/hudson/jobs/subversion-1.6.x-solaris/
build/hudson/jobs/subversion-1.6.x-ubuntu/ build/hudson/jobs/subversi...
Author: hwright
Date: Tue Aug 10 20:55:56 2010
New Revision: 984206
URL: http://svn.apache.org/viewvc?rev=984206&view=rev
Log:
On the ignore-mergeinfo branch:
Bring up-to-date with trunk@950000, resolving conflicts along the way.
This leaves a test failure in stat tests 32 (new on this branch) which will
be fixed in a subsequent commit.
Added:
subversion/branches/ignore-mergeinfo/get-deps.sh
- copied unchanged from r950000, subversion/trunk/get-deps.sh
subversion/branches/ignore-mergeinfo/notes/api-errata/wc006.txt
- copied unchanged from r950000, subversion/trunk/notes/api-errata/wc006.txt
subversion/branches/ignore-mergeinfo/notes/api-errata/wc007.txt
- copied unchanged from r950000, subversion/trunk/notes/api-errata/wc007.txt
subversion/branches/ignore-mergeinfo/notes/repos-dictated-config
- copied unchanged from r950000, subversion/trunk/notes/repos-dictated-config
subversion/branches/ignore-mergeinfo/notes/wc-ng/copying
- copied unchanged from r950000, subversion/trunk/notes/wc-ng/copying
subversion/branches/ignore-mergeinfo/notes/wc-ng/modularization
- copied unchanged from r950000, subversion/trunk/notes/wc-ng/modularization
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InputStream.cpp
- copied unchanged from r950000, subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/InputStream.h
- copied unchanged from r950000, subversion/trunk/subversion/bindings/javahl/native/InputStream.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/OutputStream.cpp
- copied unchanged from r950000, subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/OutputStream.h
- copied unchanged from r950000, subversion/trunk/subversion/bindings/javahl/native/OutputStream.h
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/utils.py
- copied unchanged from r950000, subversion/trunk/subversion/bindings/swig/python/tests/utils.py
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.h
- copied unchanged from r950000, subversion/trunk/subversion/libsvn_subr/dirent_uri.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/internal_statements.sql
- copied unchanged from r950000, subversion/trunk/subversion/libsvn_subr/internal_statements.sql
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/conflicts.h
- copied unchanged from r950000, subversion/trunk/subversion/libsvn_wc/conflicts.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db_pdh.c
- copied unchanged from r950000, subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db_private.h
- copied unchanged from r950000, subversion/trunk/subversion/libsvn_wc/wc_db_private.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db_util.c
- copied unchanged from r950000, subversion/trunk/subversion/libsvn_wc/wc_db_util.c
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_reintegrate_tests.py
- copied unchanged from r950000, subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_tree_conflict_tests.py
- copied unchanged from r950000, subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svndumpfilter_tests_data/mergeinfo_included_partial.dump
- copied unchanged from r950000, subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/mergeinfo_included_partial.dump
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/entries-compat.c
- copied unchanged from r950000, subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/pristine-store-test.c
- copied unchanged from r950000, subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
- copied unchanged from r950000, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
- copied unchanged from r950000, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
- copied unchanged from r950000, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
- copied unchanged from r950000, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
- copied unchanged from r950000, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
- copied unchanged from r950000, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
- copied unchanged from r950000, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
Removed:
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Inputer.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Outputer.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Outputer.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/IInput.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/IOutput.java
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnadmin_tests_data/mergeinfo_included_partial.dump
Modified:
subversion/branches/ignore-mergeinfo/ (props changed)
subversion/branches/ignore-mergeinfo/CHANGES
subversion/branches/ignore-mergeinfo/COMMITTERS
subversion/branches/ignore-mergeinfo/build.conf
subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py
subversion/branches/ignore-mergeinfo/build/generator/gen_win.py
subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/ignore-mergeinfo/build/hudson/README
subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-solaris/config.xml
subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml
subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-doxygen/config.xml
subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-javadoc/config.xml
subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-solaris/config.xml
subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-ubuntu/config.xml
subversion/branches/ignore-mergeinfo/build/run_tests.py
subversion/branches/ignore-mergeinfo/configure.ac
subversion/branches/ignore-mergeinfo/contrib/client-side/asvn
subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py
subversion/branches/ignore-mergeinfo/doc/doxygen.conf
subversion/branches/ignore-mergeinfo/notes/commit-access-templates/contrib-committer.tmpl
subversion/branches/ignore-mergeinfo/notes/commit-access-templates/full-committer.tmpl
subversion/branches/ignore-mergeinfo/notes/commit-access-templates/partial-committer.tmpl
subversion/branches/ignore-mergeinfo/notes/editor-v2.txt
subversion/branches/ignore-mergeinfo/notes/feedback/hwright-user-visits
subversion/branches/ignore-mergeinfo/notes/wc-ng/conflict-storage
subversion/branches/ignore-mergeinfo/notes/wc-ng/design
subversion/branches/ignore-mergeinfo/notes/wc-ng/use-of-tmp-text-base-path
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Array.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ChangelistCallback.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CommitMessage.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/CreateJ.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIStackElement.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/MessageReceiver.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/NotifyCallback.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ProgressListener.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNAdmin.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/InputInterface.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/OutputInterface.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNAdminTests.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/include/svn_types.swg
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/perl/native/t/3client.t
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/svn/core.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/client.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/wc.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/ruby/svn/delta.rb
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/ruby/test/test_delta.rb
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_atomic.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_dep_compat.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_skel.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_sqlite.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_wc_private.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_client.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_delta.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_diff.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_editor.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_fs.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_io.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_iter.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_props.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_repos.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_subst.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_wc.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/add.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/blame.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/cat.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/changelist.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/checkout.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/cleanup.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/client.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/commit.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/commit_util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/copy.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/delete.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/export.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/externals.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/info.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/locking_commands.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/merge.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/mergeinfo.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/patch.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/prop_commands.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/ra.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/repos_diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/revisions.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/status.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/switch.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/update.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/url.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compose_delta.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/editor.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/svndiff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/xdelta.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff3.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_memory.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/parse-diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/fs.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/revs-txns.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/tree.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/tree.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra/compat.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/options.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/session.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/commit.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/update.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/win32_auth_sspi.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/load.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/reporter.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/repos.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/ (props changed)
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/atomic.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/checksum.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cmdline.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/error.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/io.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/iter.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/opt.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/path.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/skel.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/sqlite.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/stream.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/subst.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/utf.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/version.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/win32_xlate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/ (props changed)
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/README
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_crawler.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_ops.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_ops.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/conflicts.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/copy.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/crop.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/entries.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/entries.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/log.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/log.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/merge.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/node.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/old-and-busted.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/props.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/props.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/questions.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/relocate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/revision_status.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/status.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/translate.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/update_editor.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/upgrade.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc-queries.sql
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/workqueue.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/workqueue.h
subversion/branches/ignore-mergeinfo/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/dav_svn.h
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/deadprops.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/mirror.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/dated-rev.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/deleted-rev.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/file-revs.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/get-location-segments.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/get-locations.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/get-locks.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/log.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/replay.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/update.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/repos.c
subversion/branches/ignore-mergeinfo/subversion/po/fr.po
subversion/branches/ignore-mergeinfo/subversion/po/zh_CN.po
subversion/branches/ignore-mergeinfo/subversion/svn/cl.h
subversion/branches/ignore-mergeinfo/subversion/svn/diff-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/log-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/main.c
subversion/branches/ignore-mergeinfo/subversion/svn/patch-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/propedit-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/status-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/status.c
subversion/branches/ignore-mergeinfo/subversion/svn/tree-conflicts.c
subversion/branches/ignore-mergeinfo/subversion/svnadmin/main.c
subversion/branches/ignore-mergeinfo/subversion/svndumpfilter/main.c
subversion/branches/ignore-mergeinfo/subversion/svnserve/cyrus_auth.c
subversion/branches/ignore-mergeinfo/subversion/svnsync/main.c
subversion/branches/ignore-mergeinfo/subversion/svnversion/main.c
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/authz_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/basic_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/changelist_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/commit_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/copy_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/depth_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/externals_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/lock_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/obliterate_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/patch_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/prop_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/schedule_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/special_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svndumpfilter_tests_data/with_merges.dump
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/actions.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/factory.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/main.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/objects.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/wc.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnversion_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/switch_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/trans_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/update_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_client/client-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/compat-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/string-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/translate-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/ (props changed)
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/db-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.c
subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.h
subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_main.c
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/centos/svncheck.sh
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
subversion/branches/ignore-mergeinfo/tools/buildbot/slaves/win32-SharpSvn/ (props changed)
subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c
subversion/branches/ignore-mergeinfo/tools/dev/unix-build/Makefile.svn
subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/count-progress.py
subversion/branches/ignore-mergeinfo/tools/dist/construct-rolling-environment.sh
subversion/branches/ignore-mergeinfo/tools/dist/dist.sh
subversion/branches/ignore-mergeinfo/tools/dist/getsigs.py
subversion/branches/ignore-mergeinfo/tools/dist/nightly.sh
subversion/branches/ignore-mergeinfo/tools/dist/roll.sh
subversion/branches/ignore-mergeinfo/tools/dist/write-announcement.py
subversion/branches/ignore-mergeinfo/win-tests.py
Propchange: subversion/branches/ignore-mergeinfo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 20:55:56 2010
@@ -24,6 +24,7 @@
/subversion/branches/reintegrate-improvements:873853-874164
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements:918519-934609
/subversion/branches/svnpatch-diff:865738-876477
/subversion/branches/svnraisetc:874709-875149
/subversion/branches/svnserve-logging:869828-870893
@@ -33,4 +34,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:873097-930000
+/subversion/trunk:873097-950000
Modified: subversion/branches/ignore-mergeinfo/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/CHANGES?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/CHANGES (original)
+++ subversion/branches/ignore-mergeinfo/CHANGES Tue Aug 10 20:55:56 2010
@@ -1,6 +1,6 @@
-Version 1.6.10
-(02 Apr 2010, from /branches/1.6.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.6.10
+Version 1.6.11
+(19 Apr 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.11
User-visible changes:
* fix for repositories mounted via NFS (issue #3501)
@@ -16,6 +16,7 @@ http://svn.apache.org/repos/asf/subversi
* update relative externals during a switch (issue #3390)
* fix 'merge --reintegrate' with self-referential mergeinfo (r892050, -85)
* improve wc-ng working copy detection (r929382)
+ * improve handling of mergeinfo when using serf (r880461)
* fixed: 'svnlook plist --revprop' with '-t TXN_NAME' (r917640, -8211)
* fixed: file external from URL cannot overwrite existing item (issue #3552)
* fixed: potential memory error in 'svn status' (r923674, -9)
@@ -29,6 +30,10 @@ http://svn.apache.org/repos/asf/subversi
* ensure rangelist APIs are commutative (r923389, -91)
+Version 1.6.10
+(Not released, see changes for 1.6.11.)
+
+
Version 1.6.9
(25 Jan 2010, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.9
Modified: subversion/branches/ignore-mergeinfo/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/COMMITTERS?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/COMMITTERS [UTF-8] (original)
+++ subversion/branches/ignore-mergeinfo/COMMITTERS [UTF-8] Tue Aug 10 20:55:56 2010
@@ -54,6 +54,7 @@ Blanket commit access:
neels Neels J. Hofmeyr <ne...@elego.de>
jwhitlock Jeremy Whitlock <jc...@gmail.com>
sbutler Stephen Butler <sb...@elego.de>
+ dannas Daniel Näslund <da...@elego.de>
[[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
@@ -140,6 +141,8 @@ Commit access for specific areas:
rocksun Rock Sun <da...@gmail.com> (www: zh)
kmradke Kevin Radke <km...@gmail.com> (add-needs-lock.py)
esr Eric S. Raymond <es...@thyrsus.com> (svncutter)
+ gmcdonald Gavin McDonald <ga...@16degrees.com.au> (build/hudson,
+ tools/buildbot)
Translation of message files:
@@ -175,8 +178,6 @@ giorgio_valoti Giorgio Valoti <giorgio
cacknin Charles Acknin <ch...@gmail.com> (svnpatch-diff
br.)
holden Holden Karau <ho...@pigscanfly.ca> (scheme-bindings br.)
- dannas Daniel Näslund <da...@elego.de> (svn-patch-
- improvements br.)
Subprojects that are complete, abandoned or have moved elsewhere:
Modified: subversion/branches/ignore-mergeinfo/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build.conf?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build.conf (original)
+++ subversion/branches/ignore-mergeinfo/build.conf Tue Aug 10 20:55:56 2010
@@ -45,6 +45,7 @@ private-built-includes =
subversion/libsvn_wc/wc-metadata.h
subversion/libsvn_wc/wc-queries.h
subversion/libsvn_wc/wc-checks.h
+ subversion/libsvn_subr/internal_statements.h
subversion/bindings/swig/proxy/swig_python_external_runtime.swg
subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
@@ -380,6 +381,12 @@ type = sql-header
path = subversion/libsvn_wc
sources = wc-checks.sql
+[subr_sqlite]
+description = Internal statements for SQLite interface
+type = sql-header
+path = subversion/libsvn_subr
+sources = internal_statements.sql
+
# ----------------------------------------------------------------------------
#
@@ -926,6 +933,22 @@ sources = db-test.c
install = test
libs = libsvn_test libsvn_wc libsvn_subr apriconv apr
+[pristine-store-test]
+description = Test the wc-ng pristine text storage subsystem
+type = exe
+path = subversion/tests/libsvn_wc
+sources = pristine-store-test.c
+install = test
+libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+
+[entries-compat-test]
+description = Test backwards compat for the entry interface
+type = exe
+path = subversion/tests/libsvn_wc
+sources = entries-compat.c
+install = test
+libs = libsvn_test libsvn_wc libsvn_subr apriconv apr
+
# ----------------------------------------------------------------------------
# These are not unit tests at all, they are small programs that exercise
# parts of the libsvn_delta API from the command line. They are stuck here
@@ -1062,7 +1085,7 @@ libs = __ALL__
entries-dump
diff-test diff3-test diff4-test
client-test
- tree-conflict-data-test db-test
+ tree-conflict-data-test db-test pristine-store-test entries-compat-test
dirent_uri-test
auth-test
parse-diff-test
@@ -1100,6 +1123,11 @@ type = project
path = build/win32
libs = javahl-java javahl-javah libsvnjavahl
+[__JAVAHL_TESTS__]
+type = project
+path = build/win32
+libs = __JAVAHL__ javahl-tests javahl-compat-tests
+
# ----------------------------------------------------------------------------
# Contrib and tools
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py Tue Aug 10 20:55:56 2010
@@ -230,8 +230,7 @@ class Generator(gen_win.WinGeneratorBase
# groupname = 'java'
elif isinstance(target, gen_base.TargetExe):
if target.name.endswith('-test') \
- or target.name.endswith('-tests') \
- or target.name.startswith('diff'):
+ or target.name.endswith('-tests'):
groupname = 'test'
else:
groupname = 'exe'
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_win.py?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_win.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_win.py Tue Aug 10 20:55:56 2010
@@ -563,9 +563,12 @@ class WinGeneratorBase(GeneratorBase):
cbuild = '%s %s -o %s $(InputPath)' \
% (self.swig_exe, " ".join(swig_options), cout)
+ cdesc = 'Generating %s' % cout
+
sources.append(ProjectItem(path=isrc, reldir=None,
custom_build=cbuild,
custom_target=csrc,
+ custom_desc=cdesc,
user_deps=user_deps,
extension=''))
@@ -580,8 +583,13 @@ class WinGeneratorBase(GeneratorBase):
cbuild = "python $(InputPath) %s > %s" \
% (" ".join(deps), def_file)
- sources.append(ProjectItem(path=gsrc, reldir=None, custom_build=cbuild,
- user_deps=deps, custom_target=def_file,
+ cdesc = 'Generating %s ' % def_file
+
+ sources.append(ProjectItem(path=gsrc, reldir=None,
+ custom_build=cbuild,
+ custom_target=def_file,
+ custom_desc=cdesc,
+ user_deps=deps,
extension=''))
sources.append(ProjectItem(path=def_file, reldir=None,
@@ -698,7 +706,7 @@ class WinGeneratorBase(GeneratorBase):
#
# This section parses those dependencies and adds them to the dependency list
# for this target.
- if name[0:7] == 'javahl-' or name == 'libsvnjavahl':
+ if name.startswith('javahl') or name == 'libsvnjavahl':
for dep in re.findall('\$\(([^\)]*)_DEPS\)', target.add_deps):
dep = dep.replace('_', '-')
depends.extend(self.sections[dep].get_targets())
@@ -1497,7 +1505,7 @@ class WinGeneratorBase(GeneratorBase):
fp = open(header_file)
txt = fp.read()
fp.close()
- vermatch = re.search(r'^\s*#define\s+SQLITE_VERSION\s+"(\d+)\.(\d+)\.(\d+)"', txt, re.M)
+ vermatch = re.search(r'^\s*#define\s+SQLITE_VERSION\s+"(\d+)\.(\d+)\.(\d+)(?:\.\d)?"', txt, re.M)
version = tuple(map(int, vermatch.groups()))
Modified: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcproj.ezt Tue Aug 10 20:55:56 2010
@@ -76,7 +76,7 @@
[else] LinkIncremental="1"
[end] AdditionalLibraryDirectories="..\..\..\db4-win32\lib;[for configs.libdirs][configs.libdirs];[end]"
TargetMachine="[is platforms "Win32"]1[end][is platforms "x64"]17[end]"
- IgnoreDefaultLibraryNames="libc.lib"
+ IgnoreDefaultLibraryNames="libc.lib[is configs.name "debug"];msvcrt.lib[end]"
[if-any def_file] ModuleDefinitionFile="[def_file]"
[end] GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"[is configs.name "Debug"]
@@ -89,7 +89,8 @@
<Tool
Name="VCLibrarianTool"
AdditionalOptions="[is platforms "win32"]/MACHINE:X86[end][is platforms "x64"]/MACHINE:X64[end]"
- OutputFile="$(OutDir)\[target.output_name]"/>
+ OutputFile="$(OutDir)\[target.output_name]"[is configs.name "debug"]
+ IgnoreDefaultLibraryNames="msvcrt.lib"[end]/>
[end] <Tool
Name="VCMIDLTool"/>
<Tool
Modified: subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/templates/vcnet_vcxproj.ezt Tue Aug 10 20:55:56 2010
@@ -67,17 +67,20 @@
<AdditionalLibraryDirectories>[for configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
-[is configs.name "Debug"][else] <OptimizeReferences>true</OptimizeReferences>
+[is configs.name "Debug"] <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
+[else] <OptimizeReferences>true</OptimizeReferences>
[end] </Link>
[else][is config_type "DynamicLibrary"] <Link>
<AdditionalDependencies>[for configs.libs][configs.libs];[end]%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>[for configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
-[if-any def_file] <ModuleDefinitionFile>[def_file]</ModuleDefinitionFile>
+[is configs.name "Debug"] <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
+[end][if-any def_file] <ModuleDefinitionFile>[def_file]</ModuleDefinitionFile>
[end] </Link>
[else][is config_type "StaticLibrary"] <Lib>
<TargetMachine>[is platforms "X64"]MachineX64[else]MachineX86[end]</TargetMachine>
- </Lib>
+[is configs.name "Debug"] <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
+[end] </Lib>
[end][end][end] </ItemDefinitionGroup>
[end][end][if-any target.desc] <ItemGroup>
<ResourceCompile Include="..\svn.rc">
Modified: subversion/branches/ignore-mergeinfo/build/hudson/README
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/hudson/README?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/hudson/README (original)
+++ subversion/branches/ignore-mergeinfo/build/hudson/README Tue Aug 10 20:55:56 2010
@@ -11,10 +11,10 @@ The test results can be viewed in this p
SETUP DETAILS
-------------
- The last 40 build reports are retained.
- - The Subversion repository is polled every 1 hour.
+ - The Subversion repository is polled every 1 hour (staggered).
- The failure notifications are sent to
notifications@subversion.apache.org mailing list.
- The builds corresponding to Linux are performed in a Ubuntu system.
- The Linux builds are tied to minerva.apache.org host.
- The builds corresponding to Solaris are performed in a Solaris 10 system.
- - The Solaris builds are tied to lucene.zones.apache.org host.
+ - The Solaris builds are tied to hudson-solaris.zones.apache.org host.
Modified: subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-solaris/config.xml
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-solaris/config.xml?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-solaris/config.xml (original)
+++ subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-solaris/config.xml Tue Aug 10 20:55:56 2010
@@ -16,90 +16,99 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
+-->
<project>
- <actions/>
- <description>Build Subversion from 1.6.x branch on Solaris10 system</description>
+ <actions />
+ <description>Build Subversion from 1.6.x branch on Solaris10 system</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/branches/1.6.x</remote>
- <local>subversion-1.6.x</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/branches/1.6.x</remote>
+ <local>subversion-1.6.x</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>lucene.zones.apache.org (Solaris 10)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>hudson-solaris (Solaris)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 * * * *</spec>
+ <spec>0 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-1.6.x
+ <command>
+ cd subversion-1.6.x
+ PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:$PATH";
+ export PATH
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-custom-libtool=/opt/sfw/bin/libtool
+ --with-apr=/opt/subversion-current/apr
+ --with-apr-util=/opt/subversion-current/apr-util-1.3.9
+ --with-sqlite=/opt/subversion-current/sqlite-3.6.23.1/sqlite3.c
-PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:$PATH"; export PATH
-
-/usr/ccs/bin/make clean
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared --with-custom-libtool=/opt/sfw/bin/libtool --with-apr=apr/ --with-apr-util=apr-util/
-
-/usr/ccs/bin/make</command>
+ /usr/ccs/bin/make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-1.6.x
-
-PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin"; export PATH
-
-/usr/ccs/bin/make check
-
-ret=$?
-
-echo "Generating junit files ..."
-
-python ../../subversion-trunk-solaris/subversion-trunk/tools/dev/gen_junit_report.py --log-file=./tests.log --output-dir=build/junit-reports
-
-exit $ret</command>
+ <command>
+ #!/bin/bash
+ cd subversion-1.6.x
+ PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin";
+ export PATH
+ /usr/ccs/bin/make check
+ ret=$?
+ echo "Generating junit files ..."
+ python ../../subversion-trunk-solaris/subversion-trunk/tools/dev/gen_junit_report.py
+ --log-file=./tests.log
+ --output-dir=build/junit-reports
+ exit
+ $ret
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>subversion-1.6.x/build/junit-reports/*</testResults>
- <testDataPublishers/>
+ <testResults>subversion-1.6.x/build/junit-reports/*</testResults>
+ <testDataPublishers />
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>notifications@subversion.apache.org</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml (original)
+++ subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml Tue Aug 10 20:55:56 2010
@@ -18,85 +18,95 @@
under the License.
-->
<project>
- <actions/>
- <description>Build Subversion from 1.6.x branch on Ubuntu system</description>
+ <actions />
+ <description>Build Subversion from 1.6.x branch on Ubuntu system</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/branches/1.6.x</remote>
- <local>subversion-1.6.x</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/branches/1.6.x</remote>
+ <local>subversion-1.6.x</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 * * * *</spec>
+ <spec>0 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-1.6.x
-
-make distclean
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared
-
-make
-</command>
+ <command>
+ cd subversion-1.6.x
+ # make distclean
+ ./autogen.sh
+ # cp /home/bhuvan/apr . -r
+ # cp /home/bhuvan/apr-util . -r
+ # cp /home/bhuvan/sqlite-amalgamation . -r
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-apr=/usr/local/apr/apr-1.4.2
+ --with-apr-util=/usr/local/apr/apr-util-1.3.9
+ --with-sqlite=/usr/local/svn-deps/subversion-1.6.11/sqlite-amalgamation/sqlite3.c
+ make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-1.6.x
-
-make check
-
-ret=$?
-
-echo "Generating junit files ..."
-
-python ../../subversion-trunk-ubuntu/subversion-trunk/tools/dev/gen_junit_report.py --log-file=./tests.log --output-dir=build/junit-reports
-
-exit $ret</command>
+ <command>
+ #!/bin/bash
+ cd subversion-1.6.x
+ make check
+ ret=$?
+ echo "Generating junit files ..."
+ python ../../subversion-trunk-ubuntu/subversion-trunk/tools/dev/gen_junit_report.py
+ --log-file=./tests.log
+ --output-dir=build/junit-reports
+ exit
+ $ret
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>subversion-1.6.x/build/junit-reports/*</testResults>
- <testDataPublishers/>
+ <testResults>subversion-1.6.x/build/junit-reports/*</testResults>
+ <testDataPublishers />
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>notifications@subversion.apache.org</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-doxygen/config.xml
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-doxygen/config.xml?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-doxygen/config.xml (original)
+++ subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-doxygen/config.xml Tue Aug 10 20:55:56 2010
@@ -16,74 +16,87 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
+-->
<project>
- <actions/>
- <description>Build Subversion doxygen doc from "trunk" branch</description>
+ <actions />
+ <description>Build Subversion doxygen doc from "trunk" branch</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
- <local>subversion-trunk</local>
- </hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
+ <local>subversion-trunk</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 23 * * *</spec>
+ <spec>0 23 * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-trunk
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared --with-apr=../../subversion-trunk-ubuntu/subversion-trunk/apr --with-apr-util=../../subversion-trunk-ubuntu/subversion-trunk/apr-util --with-jdk=/home/hudson/tools/java/jdk1.6.0_17-64/
-
-make
-</command>
+ <command>
+ cd subversion-trunk
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-apr=/usr/local/apr/apr-1.4.2
+ --with-apr-util=/usr/local/apr/apr-util-1.3.9
+ --with-jdk=/home/hudson/tools/java/jdk1.6.0_17-64/
+ make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-trunk
-
-export PATH=doxygen-1.6.1/bin:$PATH
-
-make doc-api</command>
+ <command>
+ #!/bin/bash
+ cd subversion-trunk
+ export PATH=doxygen-1.6.1/bin:$PATH
+ make doc-api
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.JavadocArchiver>
- <javadocDir>subversion-trunk/doc/doxygen/html</javadocDir>
- <keepAll>false</keepAll>
+ <javadocDir>subversion-trunk/doc/doxygen/html</javadocDir>
+ <keepAll>false</keepAll>
</hudson.tasks.JavadocArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-javadoc/config.xml
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-javadoc/config.xml?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-javadoc/config.xml (original)
+++ subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-javadoc/config.xml Tue Aug 10 20:55:56 2010
@@ -16,74 +16,87 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
+-->
<project>
- <actions/>
- <description>Build Subversion javadoc from "trunk" branch</description>
+ <actions />
+ <description>Build Subversion javadoc from "trunk" branch</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
- <local>subversion-trunk</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
+ <local>subversion-trunk</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 23 * * *</spec>
+ <spec>0 23 * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-trunk
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared --with-apr=../../subversion-trunk-ubuntu/subversion-trunk/apr --with-apr-util=../../subversion-trunk-ubuntu/subversion-trunk/apr-util --with-jdk=/home/hudson/tools/java/jdk1.6.0_17-64/
-
-make
-</command>
+ <command>
+ cd subversion-trunk
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-apr=/usr/local/apr/apr-1.4.2
+ --with-apr-util=/usr/local/apr/apr-util-1.3.9
+ --with-jdk=/home/hudson/tools/java/jdk1.6.0_17-64/
+ make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-trunk
-
-export PATH=doxygen-1.6.1/bin:$PATH
-
-make doc-javahl</command>
+ <command>
+ #!/bin/bash
+ cd subversion-trunk
+ export PATH=doxygen-1.6.1/bin:$PATH
+ make doc-javahl
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.JavadocArchiver>
- <javadocDir>subversion-trunk/doc/javadoc/</javadocDir>
- <keepAll>false</keepAll>
+ <javadocDir>subversion-trunk/doc/javadoc/</javadocDir>
+ <keepAll>false</keepAll>
</hudson.tasks.JavadocArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-solaris/config.xml
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-solaris/config.xml?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-solaris/config.xml (original)
+++ subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-solaris/config.xml Tue Aug 10 20:55:56 2010
@@ -18,85 +18,93 @@
under the License.
-->
<project>
- <actions/>
- <description>Build Subversion from "trunk" branch on Solaris10 system</description>
+ <actions />
+ <description>Build Subversion from "trunk" branch on Solaris10 system</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
- <local>subversion-trunk</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
+ <local>subversion-trunk</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>lucene.zones.apache.org (Solaris 10)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>hudson-solaris (Solaris)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 * * * *</spec>
+ <spec>30 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-trunk
-
-PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:$PATH"; export PATH
-
-/usr/ccs/bin/make clean
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared --with-custom-libtool=/opt/sfw/bin/libtool --with-apr=apr/ --with-apr-util=apr-util/
-
-/usr/ccs/bin/make</command>
+ <command>
+ cd subversion-trunk
+ PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/opt/subversion-current/sqlite-3.6.23.1:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:$PATH";
+ export PATH
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-custom-libtool=/opt/sfw/bin/libtool
+ --with-apr=/opt/subversion-current/apr
+ --with-apr-util=/opt/subversion-current/apr-util-1.3.9
+ --with-sqlite=/opt/subversion-current/sqlite-3.6.23.1/sqlite3.c
+ make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-trunk
-
-PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin"; export PATH
-
-/usr/ccs/bin/make check
-
-ret=$?
-
-echo "Generating junit files ..."
-
-python tools/dev/gen_junit_report.py --log-file=./tests.log --output-dir=build/junit-reports
-
-exit $ret</command>
+ <command>
+ #!/bin/bash
+ cd subversion-trunk
+ PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin";
+ export PATH
+ make check
+ ret=$?
+ echo "Generating junit files ..."
+ python tools/dev/gen_junit_report.py
+ --log-file=./tests.log
+ --output-dir=build/junit-reports
+ exit
+ $ret
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>subversion-trunk/build/junit-reports/*</testResults>
- <testDataPublishers/>
+ <testResults>subversion-trunk/build/junit-reports/*</testResults>
+ <testDataPublishers />
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>notifications@subversion.apache.org</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-ubuntu/config.xml
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-ubuntu/config.xml?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-ubuntu/config.xml (original)
+++ subversion/branches/ignore-mergeinfo/build/hudson/jobs/subversion-trunk-ubuntu/config.xml Tue Aug 10 20:55:56 2010
@@ -18,85 +18,89 @@
under the License.
-->
<project>
- <actions/>
- <description>Build Subversion from "trunk" branch on Ubuntu system</description>
+ <actions />
+ <description>Build Subversion from "trunk" branch on Ubuntu system</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
- <local>subversion-trunk</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
+ <local>subversion-trunk</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 * * * *</spec>
+ <spec>15 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-trunk
-
-make distclean
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared
-
-make
-</command>
+ <command>
+ cd subversion-trunk
+ #make distclean
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-apr=/usr/local/apr/apr-1.4.2
+ --with-apr-util=/usr/local/apr/apr-util-1.3.9
+ --with-sqlite=/usr/local/svn-deps/subversion-1.6.11/sqlite-amalgamation/sqlite3.c make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-trunk
-
-make check
-
-ret=$?
-
-echo "Generating junit files ..."
-
-python tools/dev/gen_junit_report.py --log-file=./tests.log --output-dir=build/junit-reports
-
-exit $ret</command>
+ <command>
+ #!/bin/bash
+ cd subversion-trunk
+ make check
+ ret=$?
+ echo "Generating junit files ..."
+ python tools/dev/gen_junit_report.py
+ --log-file=./tests.log
+ --output-dir=build/junit-reports
+ exit $ret
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>subversion-trunk/build/junit-reports/*</testResults>
- <testDataPublishers/>
+ <testResults>subversion-trunk/build/junit-reports/*</testResults>
+ <testDataPublishers />
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>notifications@subversion.apache.org</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
Modified: subversion/branches/ignore-mergeinfo/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/run_tests.py?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/run_tests.py (original)
+++ subversion/branches/ignore-mergeinfo/build/run_tests.py Tue Aug 10 20:55:56 2010
@@ -23,12 +23,14 @@
# run_tests.py - run the tests in the regression test suite.
#
-'''usage: python run_tests.py [--url=<base-url>] [--fs-type=<fs-type>]
- [--verbose] [--cleanup] [--enable-sasl] [--parallel]
- [--http-library=<http-library>]
- [--config-file=<file>]
- [--server-minor-version=<version>] <abs_srcdir> <abs_builddir>
- <prog ...>
+'''usage: python run_tests.py
+ [--verbose] [--log-to-stdout] [--cleanup] [--parallel]
+ [--url=<base-url>] [--http-library=<http-library>] [--enable-sasl]
+ [--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
+ [--server-minor-version=<version>]
+ [--config-file=<file>]
+ <abs_srcdir> <abs_builddir>
+ <prog ...>
The optional flags and the first two parameters are passed unchanged
to the TestHarness constructor. All other parameters are names of
@@ -125,6 +127,10 @@ class TestHarness:
self._open_log('rb')
log_lines = self.log.readlines()
+ # Remove \r characters introduced by opening the log as binary
+ if sys.platform == 'win32':
+ log_lines = [x.replace('\r', '') for x in log_lines]
+
# Print the results, from least interesting to most interesting.
# Helper for Work-In-Progress indications for XFAIL tests.
@@ -229,7 +235,7 @@ class TestHarness:
# Using write here because we don't want even a trailing space
test_info = '%s [%d/%d]' % (progbase, test_nr + 1, total_tests)
sys.stdout.write('Running tests in %s' % (test_info, ))
- sys.stdout.write('.'*(35 - len(test_info)))
+ sys.stdout.write('.'*(40 - len(test_info)))
log.write('START: %s\n' % progbase)
log.flush()
Modified: subversion/branches/ignore-mergeinfo/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/configure.ac?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/configure.ac (original)
+++ subversion/branches/ignore-mergeinfo/configure.ac Tue Aug 10 20:55:56 2010
@@ -907,6 +907,17 @@ elif test "$enable_debugging" = "no" ; t
# # do nothing
fi
+AC_ARG_ENABLE(full-version-match,
+AS_HELP_STRING([--disable-full-version-match],
+ [Disable the full version match rules when checking
+ Subversion library compatibility.]),
+[
+ if test "$enableval" = "no" ; then
+ AC_MSG_NOTICE([Disabling svn full version matching])
+ AC_DEFINE(SVN_DISABLE_FULL_VERSION_MATCH, 1,
+ [Defined if the full version matching rules are disabled])
+ fi
+])
AC_ARG_WITH(editor,
AS_HELP_STRING([--with-editor=PATH],
Modified: subversion/branches/ignore-mergeinfo/contrib/client-side/asvn
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/contrib/client-side/asvn?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/contrib/client-side/asvn (original)
+++ subversion/branches/ignore-mergeinfo/contrib/client-side/asvn Tue Aug 10 20:55:56 2010
@@ -389,11 +389,11 @@ case "$1" in
*);;
esac
-[ "$ACTION" = "pre" ] && pre_checkin $@
+[ "$ACTION" = "pre" ] && pre_checkin "$@"
-$SVN $@
+$SVN "$@"
-[ $? = 0 -a "$ACTION" = "post" ] && post_checkout $@
+[ $? = 0 -a "$ACTION" = "post" ] && post_checkout "$@"
cleanup
#
Modified: subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py (original)
+++ subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py Tue Aug 10 20:55:56 2010
@@ -1038,7 +1038,7 @@ def handleError(error, withTraceback=Fal
if __name__ == '__main__':
from optparse import OptionParser
- parser = OptionParser("usage: %prog [-w | -i | -r | -n] REV-FILE")
+ parser = OptionParser("usage: %prog [OPTIONS] REV-FILE")
parser.add_option("-c", "--changed-paths",
action="store_true", dest="dumpChanged",
help="Dump changed path information", default=False)
Modified: subversion/branches/ignore-mergeinfo/doc/doxygen.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/doc/doxygen.conf?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/doc/doxygen.conf (original)
+++ subversion/branches/ignore-mergeinfo/doc/doxygen.conf Tue Aug 10 20:55:56 2010
@@ -647,7 +647,7 @@ EXAMPLE_RECURSIVE = NO
# directories that contain image that are included in the documentation (see
# the \image command).
-IMAGE_PATH = www/images
+IMAGE_PATH =
# The INPUT_FILTER tag can be used to specify a program that doxygen should
# invoke to filter for each input file. Doxygen will invoke the filter program
Modified: subversion/branches/ignore-mergeinfo/notes/commit-access-templates/contrib-committer.tmpl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/notes/commit-access-templates/contrib-committer.tmpl?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/notes/commit-access-templates/contrib-committer.tmpl (original)
+++ subversion/branches/ignore-mergeinfo/notes/commit-access-templates/contrib-committer.tmpl Tue Aug 10 20:55:56 2010
@@ -7,7 +7,7 @@ this template is based.
--------------------8-<-------cut-here---------8-<-----------------------
To: J. Random <jr...@remember_to_fix_the_recipient_please.com>
-CC: svn-full-committers@red-bean.com
+CC: private{AT}subversion.apache.org
Subject: Subversion commit access for XXXXX
J. Random,
Modified: subversion/branches/ignore-mergeinfo/notes/commit-access-templates/full-committer.tmpl
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/notes/commit-access-templates/full-committer.tmpl?rev=984206&r1=984205&r2=984206&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/notes/commit-access-templates/full-committer.tmpl (original)
+++ subversion/branches/ignore-mergeinfo/notes/commit-access-templates/full-committer.tmpl Tue Aug 10 20:55:56 2010
@@ -9,13 +9,13 @@ fool the spam address harvesters.
From: "Some Committer" <a....@wherever.example.com>
To: New Full Committer <ne...@wherever.new.committers.live>
-Cc: svn-full-committers{AT}red-bean.com
+Cc: private{AT}subversion.apache.org
Subject: Full commit access to Subversion
Hi New Full Committer,
The other committers and I would like to offer you full commit access
-to Subversion.
+to Subversion.
If you already have partial commit access, you can accept this offer
by simply replying to this mail. We'll update the COMMITTERS file (or
@@ -30,7 +30,7 @@ modify the COMMITTERS file appropriately
of your new username and password.
Please remember to subscribe to the private (PMC) mailing list by
-emailing <pr...@subversion.apache.org>.
+emailing <private-subscribe{AT}subversion.apache.org>.
Remember that you can still post patches for review before committing,
when you want to. Commit access just means that you can rely on your