You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/07/20 01:06:07 UTC
svn commit: r1148581 [1/12] - in
/subversion/branches/gpg-agent-password-store: ./ build/ build/ac-macros/
build/generator/ build/generator/templates/ contrib/hook-scripts/
contrib/hook-scripts/enforcer/ contrib/server-side/
contrib/server-side/fsfsfix...
Author: stsp
Date: Tue Jul 19 23:05:44 2011
New Revision: 1148581
URL: http://svn.apache.org/viewvc?rev=1148581&view=rev
Log:
Sync the gpg-agent-password-store branch with trunk.
Added:
subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/
- copied from r1148548, subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/
subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/
- copied from r1148548, subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/
subversion/branches/gpg-agent-password-store/tools/server-side/svnpredumpfilter.py
- copied unchanged from r1148548, subversion/trunk/tools/server-side/svnpredumpfilter.py
Removed:
subversion/branches/gpg-agent-password-store/build/config.guess
subversion/branches/gpg-agent-password-store/build/config.sub
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/revprops-db.sql
subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/
subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/osx10.6-x64/
subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c
subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c
subversion/branches/gpg-agent-password-store/tools/dist/write-announcement.py
Modified:
subversion/branches/gpg-agent-password-store/ (props changed)
subversion/branches/gpg-agent-password-store/CHANGES
subversion/branches/gpg-agent-password-store/COMMITTERS
subversion/branches/gpg-agent-password-store/INSTALL
subversion/branches/gpg-agent-password-store/Makefile.in
subversion/branches/gpg-agent-password-store/README
subversion/branches/gpg-agent-password-store/autogen.sh
subversion/branches/gpg-agent-password-store/build/ (props changed)
subversion/branches/gpg-agent-password-store/build.conf
subversion/branches/gpg-agent-password-store/build/ac-macros/apr.m4
subversion/branches/gpg-agent-password-store/build/ac-macros/apr_memcache.m4
subversion/branches/gpg-agent-password-store/build/ac-macros/aprutil.m4
subversion/branches/gpg-agent-password-store/build/ac-macros/serf.m4
subversion/branches/gpg-agent-password-store/build/ac-macros/sqlite.m4
subversion/branches/gpg-agent-password-store/build/ac-macros/zlib.m4
subversion/branches/gpg-agent-password-store/build/buildcheck.sh
subversion/branches/gpg-agent-password-store/build/generator/gen_make.py
subversion/branches/gpg-agent-password-store/build/generator/gen_win.py
subversion/branches/gpg-agent-password-store/build/generator/templates/serf.dsp.ezt
subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcproj.ezt
subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcxproj.ezt
subversion/branches/gpg-agent-password-store/build/run_tests.py
subversion/branches/gpg-agent-password-store/configure.ac
subversion/branches/gpg-agent-password-store/contrib/hook-scripts/enforcer/enforcer
subversion/branches/gpg-agent-password-store/contrib/hook-scripts/hook_toolbox.py (props changed)
subversion/branches/gpg-agent-password-store/contrib/server-side/fsfsfixer/fixer/fixer_config.py (props changed)
subversion/branches/gpg-agent-password-store/contrib/server-side/fsfsverify.py
subversion/branches/gpg-agent-password-store/get-deps.sh
subversion/branches/gpg-agent-password-store/notes/merge-tracking/func-spec.html
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/Targets.h
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java (props changed)
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java (props changed)
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback3.java (props changed)
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Base.pm
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Client.pm
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Core.pm
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Delta.pm
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Fs.pm
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Ra.pm
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/Repos.pm
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/compile_all.pl
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/scripts/fast_svnbase.pl
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/1repos.t
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/2fs.t
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/3client.t
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/4pool.t
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta-compat.t
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/5delta.t
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/7editor.t
subversion/branches/gpg-agent-password-store/subversion/bindings/swig/perl/native/t/8lock.t
subversion/branches/gpg-agent-password-store/subversion/include/private/svn_adler32.h (props changed)
subversion/branches/gpg-agent-password-store/subversion/include/private/svn_io_private.h (props changed)
subversion/branches/gpg-agent-password-store/subversion/include/private/svn_opt_private.h
subversion/branches/gpg-agent-password-store/subversion/include/private/svn_string_private.h (props changed)
subversion/branches/gpg-agent-password-store/subversion/include/private/svn_temp_serializer.h (props changed)
subversion/branches/gpg-agent-password-store/subversion/include/private/svn_wc_private.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_client.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_dav.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_dirent_uri.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_error.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_error_codes.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_fs.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_opt.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_ra.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_ra_svn.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_repos.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_types.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_version.h
subversion/branches/gpg-agent-password-store/subversion/include/svn_wc.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/blame.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/cat.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/client.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/cmdline.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/commit.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/copy.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/delete.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/deprecated.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/diff.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/info.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/locking_commands.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/merge.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/mergeinfo.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/mergeinfo.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/patch.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/prop_commands.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/ra.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/relocate.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/status.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/update.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_client/util.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_delta/svndiff.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_diff/diff3.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_diff/diff_file.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_diff/parse-diff.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs/fs-loader.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs/fs-loader.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_base/fs.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/caching.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/fs.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/fs.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/id.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/structure
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/temp_serializer.c (contents, props changed)
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/temp_serializer.h (contents, props changed)
subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_fs/tree.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra/deprecated.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra/ra_loader.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra/ra_loader.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_neon/commit.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_neon/fetch.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_neon/mergeinfo.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_neon/options.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_neon/props.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_neon/session.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_serf/options.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_serf/serf.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_serf/update.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_serf/util.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_svn/client.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_svn/editorp.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_svn/marshal.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_ra_svn/protocol
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/commit.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/deprecated.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/dump.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/fs-wrap.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/hooks.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/log.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/reporter.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/repos.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_repos/rev_hunt.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/adler32.c (props changed)
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/deprecated.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/dirent_uri.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/dso.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/hash.c (contents, props changed)
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/io.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/magic.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/mergeinfo.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/simple_providers.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/sqlite.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/stream.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/subst.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/svn_base64.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/svn_string.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_subr/svn_temp_serializer.c (props changed)
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/adm_crawler.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/adm_files.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/adm_ops.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/conflicts.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/copy.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/crop.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/deprecated.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/diff_editor.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/diff_local.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/entries.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/info.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/lock.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/merge.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/node.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/props.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/questions.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/relocate.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/status.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/translate.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/update_editor.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/upgrade.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/wc-queries.sql
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/wc_db.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/wc_db.h
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/gpg-agent-password-store/subversion/libsvn_wc/workqueue.c
subversion/branches/gpg-agent-password-store/subversion/mod_dav_svn/dav_svn.h
subversion/branches/gpg-agent-password-store/subversion/mod_dav_svn/liveprops.c
subversion/branches/gpg-agent-password-store/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/gpg-agent-password-store/subversion/mod_dav_svn/reports/mergeinfo.c
subversion/branches/gpg-agent-password-store/subversion/mod_dav_svn/reports/update.c
subversion/branches/gpg-agent-password-store/subversion/mod_dav_svn/repos.c
subversion/branches/gpg-agent-password-store/subversion/mod_dav_svn/util.c
subversion/branches/gpg-agent-password-store/subversion/mod_dav_svn/version.c
subversion/branches/gpg-agent-password-store/subversion/svn/cat-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/changelist-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/checkout-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/cl.h
subversion/branches/gpg-agent-password-store/subversion/svn/copy-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/export-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/import-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/info-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/list-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/main.c
subversion/branches/gpg-agent-password-store/subversion/svn/notify.c
subversion/branches/gpg-agent-password-store/subversion/svn/patch-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/proplist-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/relocate-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/status.c
subversion/branches/gpg-agent-password-store/subversion/svn/switch-cmd.c
subversion/branches/gpg-agent-password-store/subversion/svn/util.c
subversion/branches/gpg-agent-password-store/subversion/svnadmin/main.c
subversion/branches/gpg-agent-password-store/subversion/svnrdump/dump_editor.c
subversion/branches/gpg-agent-password-store/subversion/svnserve/serve.c
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/changelist_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/commit_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/davautocheck.sh
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/info_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/input_validation_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/lock_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/log_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/merge_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/prop_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/redirect_tests.py (props changed)
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/stat_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svntest/actions.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svntest/err.py (props changed)
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svntest/main.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svntest/objects.py (props changed)
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/svntest/wc.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/switch_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/update_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/gpg-agent-password-store/subversion/tests/libsvn_fs_base/fs-base-test.c
subversion/branches/gpg-agent-password-store/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/gpg-agent-password-store/subversion/tests/libsvn_subr/opt-test.c
subversion/branches/gpg-agent-password-store/subversion/tests/libsvn_wc/db-test.c
subversion/branches/gpg-agent-password-store/subversion/tests/manual/tree-conflicts-add-vs-add.py (props changed)
subversion/branches/gpg-agent-password-store/subversion/tests/svn_test_fs.c
subversion/branches/gpg-agent-password-store/tools/buildbot/master/Feeder.py (props changed)
subversion/branches/gpg-agent-password-store/tools/buildbot/master/SVNMailNotifier.py (props changed)
subversion/branches/gpg-agent-password-store/tools/buildbot/master/private-sample.py (props changed)
subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/ubuntu-x64/svnclean.sh
subversion/branches/gpg-agent-password-store/tools/client-side/svnmucc/svnmucc.c
subversion/branches/gpg-agent-password-store/tools/dev/benchmarks/suite1/benchmark.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/gen-py-errors.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/gen_junit_report.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/log_revnum_change_asf.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/mklog.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/unix-build/Makefile.svn
subversion/branches/gpg-agent-password-store/tools/dev/wc-format.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/wc-ng/bump-to-19.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/wc-ng/count-progress.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/wc-ng/graph-data.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/wc-ng/populate-pristine.py (props changed)
subversion/branches/gpg-agent-password-store/tools/dev/which-error.py
subversion/branches/gpg-agent-password-store/tools/dev/windows-build/document-version.pl (contents, props changed)
subversion/branches/gpg-agent-password-store/tools/dist/backport.pl (props changed)
subversion/branches/gpg-agent-password-store/tools/dist/collect_sigs.py
subversion/branches/gpg-agent-password-store/tools/dist/release.py (contents, props changed)
subversion/branches/gpg-agent-password-store/tools/hook-scripts/svnperms.py
subversion/branches/gpg-agent-password-store/tools/hook-scripts/validate-extensions.py (props changed)
subversion/branches/gpg-agent-password-store/tools/server-side/svn-populate-node-origins-index.c
subversion/branches/gpg-agent-password-store/tools/server-side/svn-rep-sharing-stats.c
subversion/branches/gpg-agent-password-store/win-tests.py
Propchange: subversion/branches/gpg-agent-password-store/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 19 23:05:44 2011
@@ -39,6 +39,7 @@
/subversion/branches/py-tests-as-modules:956579-1033052
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements:918519-934609
@@ -52,4 +53,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1005036-1139365
+/subversion/trunk:1005036-1148548
Modified: subversion/branches/gpg-agent-password-store/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/CHANGES?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/CHANGES (original)
+++ subversion/branches/gpg-agent-password-store/CHANGES Tue Jul 19 23:05:44 2011
@@ -13,7 +13,6 @@ the 1.6 release: http://subversion.apac
* Less verbose HTTP-based repository access protocol (issue #1161, #3371)
* Rewritten working copy metadata storage (issue #3357)
* New 'svn patch' subcommand (issue #511)
- * Property packing on FSFS backends (issue #3444)
* Limit FSFS memory consumption (issue #3478, #3593)
- Minor new features and improvements:
@@ -42,6 +41,7 @@ the 1.6 release: http://subversion.apac
* add configurable caching to svnadmin (r1078357)
* make server-side network data compression rate configurable (r1072288)
* added support for auto-detecting mime-types with libmagic (r1131120)
+ * 'svn rm url1 url2 url3' uses single txn per repo (issue #1199)
- Client-side bugfixes:
* 'svn cp A B; svn mv B C' is equivalent to 'svn cp A C' (issue #756)
@@ -80,6 +80,9 @@ the 1.6 release: http://subversion.apac
* can now commit multiple wc paths lacking a common parent (issue #2381)
* 'svn export --depth $WC' now works correctly (issue #3800)
* added support for case-only renames on Windows (issue #3702)
+ * 'svn delete --force' removes tree conflicts (issue #3805)
+ * don't throw an error when skipping tree conflicts in update (issue #3329)
+ * don't break commits of wc->wc copies with file externals (issue #3589)
* fixed: wc-to-wc copy of a switch source (issue #1802)
* fixed: 'svn st' reports symlinks as obstructed items (issue #2284)
* fixed: 'cd e:\; svn up e:\' fails (issue #2556)
@@ -117,6 +120,10 @@ the 1.6 release: http://subversion.apac
* fixed: 'svn unlock' attempts to unlock wrong token on DAV (issue #3794)
* fixed: forced DAV 'svn unlock' results in 403, not warning (issue #3801)
* fixed: rm -> ci -> cp = missing directory (issue #2763)
+ * fixed: 'svn info' returns parent info on missing dirs (issue #3178)
+ * fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919)
+ * fixed: 'svn --version' fails with non-existant $HOME (issue #3947)
+ * fixed: unforced export silently overwites existing file (issue #3799)
* many other minor bugfixes, optimizations, plugs of memory leaks, etc
- Server-side bugfixes:
@@ -132,9 +139,11 @@ the 1.6 release: http://subversion.apac
* fixed: hotcopy may corrupt target rep-cache.db (issue #3596)
* fixed: mod_dav_svn can cause spurious merge conflicts (issue #3657)
* fixed: DAV can overwrite directories during copy (issue #3314)
+ * fixed: 'svn log' returns log of unrelated path (issue #3931)
* match paths against authz rules in case sensitive way (issue #3781)
* svnserve can now force usernames to upper/lower case (issue #3726)
* reduce duplicate log messages in 'log -g' (issue #3650)
+ * don't crash on shutdown with SASL in inetd mode (issue #3664)
* many other minor bugfixes too numerous to list here
- Other tool improvements and bugfixes:
@@ -153,6 +162,7 @@ the 1.6 release: http://subversion.apac
* support running tests against older servers (r876016)
* notification of unversioned obstructions (r877344)
* removed virtually all abort() calls (issue #2780)
+ * don't include client-specific suggestions in error msgs (issue #3887)
- API changes:
* don't crash svn_client_copy if ctx->log_msg_func is NULL (issue #3234)
Modified: subversion/branches/gpg-agent-password-store/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/COMMITTERS?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/COMMITTERS [UTF-8] (original)
+++ subversion/branches/gpg-agent-password-store/COMMITTERS [UTF-8] Tue Jul 19 23:05:44 2011
@@ -115,8 +115,7 @@ Commit access for specific areas:
jrepenning Jack Repenning <jr...@collab.net> (tools/dev)
jlonestar Martin Maurer <ma...@email.de> (svnshow) [EMAIL
IS BOUNCING]
- shlomif Shlomi Fish <sh...@vipe.technion.ac.il> (svn-push) [EMAIL
- IS BOUNCING]
+ shlomif Shlomi Fish <sh...@shlomifish.org> (svn-push)
mthelen Michael W Thelen <mi...@pietdepsi.com> (doc)
jeremybettis Jeremy Bettis <je...@deadbeef.com> (case-insensitive)
martinto Martin Tomes <li...@tomes.org> (case-insensitive)
@@ -154,6 +153,7 @@ Commit access for specific areas:
gmcdonald Gavin McDonald <ga...@16degrees.com.au> (build/hudson,
tools/buildbot)
artagnon Ramkumar Ramachandra <ar...@gmail.com> (svnrdump, svntest)
+ arwin Arwin Arni <ar...@collab.net> (svn-bisect)
Translation of message files:
@@ -194,6 +194,7 @@ giorgio_valoti Giorgio Valoti <giorgio
cacknin Charles Acknin <ch...@gmail.com> (svnpatch-diff
br.)
holden Holden Karau <ho...@pigscanfly.ca> (scheme-bindings br.)
+ moklo Morten Kloster <mo...@gmail.com> (diff-improvements br.)
Subprojects that are complete, abandoned or have moved elsewhere:
Modified: subversion/branches/gpg-agent-password-store/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/INSTALL?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/INSTALL (original)
+++ subversion/branches/gpg-agent-password-store/INSTALL Tue Jul 19 23:05:44 2011
@@ -225,19 +225,10 @@ I. INTRODUCTION
| expected to either have the APR libraries already installed |
| on their system, or to be capable of fetching them easily. |
| |
- | For convenience, we still offer a "deps" distribution too, |
- | containing APR, APR-UTIL, and various other dependencies. |
- | The deps dist used to contain APR[-UTIL] 0.9.x, but as of |
- | 1.5.0 we are finally upgrading it to APR[-UTIL] 1.X. This |
- | is because we think by now there are very few systems that |
- | will have binary compatibility issues, and of those, few are |
- | likely to build using the "deps" dist. |
- | |
| Note that it's *perfectly* safe to use APR 1.X from the |
| beginning. In fact, we recommend it. If you're building |
| Subversion for the first time, there's no compatibility |
- | issue to worry about, so grab the latest version of APR (or |
- | just use our deps dist). |
+ | issue to worry about, so grab the latest version of APR.
| |
| If you already have a Subversion installation using APR |
| 0.9.x, it's still possible to move to APR 1.X safely. Just |
@@ -448,7 +439,7 @@ I. INTRODUCTION
If the Simple Authentication and Security Layer (SASL) library
is detected on your system, then the Subversion client and
- svnserve server can utilize its abilities for various form of
+ svnserve server can utilize its abilities for various forms of
authentication. To learn more about SASL or to get the source
code, visit:
Modified: subversion/branches/gpg-agent-password-store/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/Makefile.in?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/Makefile.in (original)
+++ subversion/branches/gpg-agent-password-store/Makefile.in Tue Jul 19 23:05:44 2011
@@ -154,21 +154,10 @@ CTYPES_PYTHON_SRC_DIR = $(abs_srcdir)/su
JAVAHL_JAR=subversion/bindings/javahl/svn-javahl.jar
JAVAHL_INCLUDES= @JNI_INCLUDES@ -I$(abs_builddir)/subversion/bindings/javahl/include
-SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
-SVN_APR_PREFIX = @SVN_APR_PREFIX@
SVN_APR_CONFIG = @SVN_APR_CONFIG@
-SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@
-SVN_APRUTIL_PREFIX = @SVN_APRUTIL_PREFIX@
+SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
SVN_APRUTIL_CONFIG = @SVN_APRUTIL_CONFIG@
-
-SVN_APR_MEMCACHE_PREFIX = @SVN_APR_MEMCACHE_PREFIX@
-SVN_APR_MEMCACHE_INCLUDES = @SVN_APR_MEMCACHE_INCLUDES@
-
-SVN_SERF_INCLUDES = @SVN_SERF_INCLUDES@
-SVN_SERF_PREFIX = @SVN_SERF_PREFIX@
-
-SVN_ZLIB_PREFIX = @SVN_ZLIB_PREFIX@
-SVN_ZLIB_INCLUDES = @SVN_ZLIB_INCLUDES@
+SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@
MKDIR = @MKDIR@
@@ -399,13 +388,15 @@ local-extraclean: local-distclean extrac
$(top_srcdir)/subversion/svn_private_config.h.in \
$(top_srcdir)/configure \
$(top_srcdir)/gen-make.opts \
- $(top_srcdir)/build/transform_libtool_scripts.sh \
+ $(top_srcdir)/build/config.guess \
+ $(top_srcdir)/build/config.sub \
$(top_srcdir)/build/libtool.m4 \
$(top_srcdir)/build/ltoptions.m4 \
$(top_srcdir)/build/ltsugar.m4 \
$(top_srcdir)/build/ltversion.m4 \
$(top_srcdir)/build/lt~obsolete.m4 \
$(top_srcdir)/build/ltmain.sh \
+ $(top_srcdir)/build/transform_libtool_scripts.sh \
$(EXTRACLEAN_FILES)
@@ -449,7 +440,7 @@ check-javahl: javahl javahl-compat
# "make check CLEANUP=true" will clean up directories for successful tests.
# "make check TESTS=subversion/tests/cmdline/basic_tests.py"
# will perform only basic tests (likewise for other tests).
-check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@
+check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@if test "$(PYTHON)" != "none"; then \
flags="--verbose"; \
if test "$(CLEANUP)" != ""; then \
@@ -498,38 +489,38 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
# First, set up Apache as documented in
# subversion/tests/cmdline/README.
-davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
+davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
@$(MAKE) check BASE_URL=http://localhost
# Automatically configure and run Apache httpd on a random port, and then
# run make check.
-davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
- @# Takes MODULE_PATH and USE_HTTPV1 in the environment.
+davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
+ @# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
@APXS=$(APXS) bash $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
# First, run:
# subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
-svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@$(MAKE) check BASE_URL=svn://127.0.0.1
# 'make svnserveautocheck' runs svnserve for you and kills it.
-svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@
- @env THREADED=$(THREADED) \
- bash $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
+svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
+ @env PYTHON=$(PYTHON) THREADED=$(THREADED) \
+ $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
# First, run:
# subversion/svnserve/svnserve --listen-host "::1" -d -r `pwd`/subversion/tests/cmdline
-svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@$(MAKE) check BASE_URL=svn://\[::1\]
# First make sure you can ssh to localhost and that "svnserve" is in
# the path of the resulting shell.
-svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@$(MAKE) check \
BASE_URL=svn+ssh://localhost`pwd`/subversion/tests/cmdline
-bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@$(MAKE) check FS_TYPE=bdb
check-clean:
Modified: subversion/branches/gpg-agent-password-store/README
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/README?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/README (original)
+++ subversion/branches/gpg-agent-password-store/README Tue Jul 19 23:05:44 2011
@@ -36,7 +36,7 @@ II. DOCUMENTATION
It is written in DocBook XML, and the sources can be found at:
- http://svn.red-bean.com/svnbook/
+ http://svnbook.googlecode.com/svn/trunk/
If you wish to build the documentation from source, read the
src/en/README file within the book source.
Modified: subversion/branches/gpg-agent-password-store/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/autogen.sh?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/autogen.sh (original)
+++ subversion/branches/gpg-agent-password-store/autogen.sh Tue Jul 19 23:05:44 2011
@@ -53,6 +53,69 @@ done
# ### sees an empty arg rather than missing one.
./build/buildcheck.sh "$RELEASE_MODE" || exit 1
+# Handle some libtool helper files
+#
+# ### eventually, we can/should toss this in favor of simply using
+# ### APR's libtool. deferring to a second round of change...
+#
+
+libtoolize="`./build/PrintPath glibtoolize libtoolize libtoolize15`"
+lt_major_version=`$libtoolize --version 2>/dev/null | sed -e 's/^[^0-9]*//' -e 's/\..*//' -e '/^$/d' -e 1q`
+
+if [ "x$libtoolize" = "x" ]; then
+ echo "libtoolize not found in path"
+ exit 1
+fi
+
+rm -f build/config.guess build/config.sub
+$libtoolize --copy --automake --force
+
+ltpath="`dirname $libtoolize`"
+ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+
+if [ ! -f $ltfile ]; then
+ echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+ exit 1
+fi
+
+echo "Copying libtool helper: $ltfile"
+# An ancient helper might already be present from previous builds,
+# and it might be write-protected (e.g. mode 444, seen on FreeBSD).
+# This would cause cp to fail and print an error message, but leave
+# behind a potentially outdated libtool helper. So, remove before
+# copying:
+rm -f build/libtool.m4
+cp $ltfile build/libtool.m4
+
+for file in ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4; do
+ rm -f build/$file
+
+ if [ $lt_major_version -ge 2 ]; then
+ ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/$file}
+
+ if [ ! -f $ltfile ]; then
+ echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+ exit 1
+ fi
+
+ echo "Copying libtool helper: $ltfile"
+ cp $ltfile build/$file
+ fi
+done
+
+if [ $lt_major_version -ge 2 ]; then
+ for file in config.guess config.sub; do
+ configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ; pwd`/$file}
+
+ if [ ! -f $configfile ]; then
+ echo "$configfile not found (try setting the LIBTOOL_CONFIG environment variable)"
+ exit 1
+ fi
+
+ cp $configfile build/$file
+ done
+fi
+
# Create the file detailing all of the build outputs for SVN.
#
# Note: this dependency on Python is fine: only SVN developers use autogen.sh
Propchange: subversion/branches/gpg-agent-password-store/build/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 19 23:05:44 2011
@@ -6,4 +6,6 @@ ltversion.m4
lt~obsolete.m4
ltmain.sh
pkg.m4
+config.guess
+config.sub
transform_libtool_scripts.sh
Modified: subversion/branches/gpg-agent-password-store/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build.conf?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build.conf (original)
+++ subversion/branches/gpg-agent-password-store/build.conf Tue Jul 19 23:05:44 2011
@@ -41,7 +41,6 @@ private-includes =
private-built-includes =
subversion/svn_private_config.h
subversion/libsvn_fs_fs/rep-cache-db.h
- subversion/libsvn_fs_fs/revprops-db.h
subversion/libsvn_wc/wc-metadata.h
subversion/libsvn_wc/wc-queries.h
subversion/libsvn_wc/wc-checks.h
@@ -223,7 +222,7 @@ msvc-export = svn_delta.h
description = Subversion Diff Library
type = lib
path = subversion/libsvn_diff
-libs = libsvn_subr apriconv apr
+libs = libsvn_subr apriconv apr zlib
install = lib
msvc-export = svn_diff.h
@@ -333,7 +332,7 @@ msvc-export =
svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h
svn_utf.h svn_version.h svn_xml.h
private\svn_atomic.h private\svn_cache.h private\svn_cmdline_private.h
- private\svn_debug.h private\svn_fspath.h
+ private\svn_debug.h private\svn_error_private.h private\svn_fspath.h
private\svn_log.h private\svn_mergeinfo_private.h
private\svn_opt_private.h private\svn_skel.h private\svn_sqlite.h
private\svn_utf_private.h private\svn_eol_private.h
@@ -381,12 +380,6 @@ type = sql-header
path = subversion/libsvn_fs_fs
sources = rep-cache-db.sql
-[revprops]
-description = Schema for revprop packing
-type = sql-header
-path = subversion/libsvn_fs_fs
-sources = revprops-db.sql
-
[wc_queries]
desription = Queries on the WC database
type = sql-header
Modified: subversion/branches/gpg-agent-password-store/build/ac-macros/apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/ac-macros/apr.m4?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/ac-macros/apr.m4 (original)
+++ subversion/branches/gpg-agent-password-store/build/ac-macros/apr.m4 Tue Jul 19 23:05:44 2011
@@ -88,11 +88,6 @@ AC_DEFUN(SVN_LIB_APR,
AC_MSG_ERROR([apr-config --includes failed])
fi
- SVN_APR_PREFIX="`$apr_config --prefix`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apr-config --prefix failed])
- fi
-
if test "$enable_all_static" = "yes"; then
SVN_APR_LIBS="`$apr_config --link-ld --libs`"
if test $? -ne 0; then
@@ -111,7 +106,6 @@ AC_DEFUN(SVN_LIB_APR,
AC_MSG_ERROR([apr-config --shlib-path-var failed])
fi
- AC_SUBST(SVN_APR_PREFIX)
AC_SUBST(SVN_APR_CONFIG, ["$apr_config"])
AC_SUBST(SVN_APR_INCLUDES)
AC_SUBST(SVN_APR_LIBS)
Modified: subversion/branches/gpg-agent-password-store/build/ac-macros/apr_memcache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/ac-macros/apr_memcache.m4?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/ac-macros/apr_memcache.m4 (original)
+++ subversion/branches/gpg-agent-password-store/build/ac-macros/apr_memcache.m4 Tue Jul 19 23:05:44 2011
@@ -70,19 +70,16 @@ dnl Try just looking in apr-util (>= 1
if test $apr_memcache_found = "reconfig"; then
SVN_EXTERNAL_PROJECT([apr_memcache], [--with-apr=$apr_config --with-apr-util=$apu_config])
apr_memcache_prefix=$prefix
- SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix"
SVN_APR_MEMCACHE_INCLUDES="-I$srcdir/memcache"
SVN_APR_MEMCACHE_LIBS="$abs_builddir/memcache/libapr_memcache.la"
fi
if test $apr_memcache_found = "standalone"; then
- SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix"
SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0"
SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la"
svn_lib_apr_memcache=yes
elif test $apr_memcache_found = "aprutil"; then
dnl We are already linking apr-util everywhere, so no special treatement needed.
- SVN_APR_MEMCACHE_PREFIX=""
SVN_APR_MEMCACHE_INCLUDES=""
SVN_APR_MEMCACHE_LIBS=""
svn_lib_apr_memcache=yes
@@ -92,7 +89,6 @@ dnl We are already linking apr-util ever
svn_lib_apr_memcache=no
fi
- AC_SUBST(SVN_APR_MEMCACHE_PREFIX)
AC_SUBST(SVN_APR_MEMCACHE_INCLUDES)
AC_SUBST(SVN_APR_MEMCACHE_LIBS)
])
Modified: subversion/branches/gpg-agent-password-store/build/ac-macros/aprutil.m4
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/ac-macros/aprutil.m4?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/ac-macros/aprutil.m4 (original)
+++ subversion/branches/gpg-agent-password-store/build/ac-macros/aprutil.m4 Tue Jul 19 23:05:44 2011
@@ -92,11 +92,6 @@ AC_DEFUN(SVN_LIB_APRUTIL,
AC_MSG_ERROR([apu-config --includes failed])
fi
- SVN_APRUTIL_PREFIX="`$apu_config --prefix`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apu-config --prefix failed])
- fi
-
if test "$enable_all_static" = "yes"; then
SVN_APRUTIL_LIBS="`$apu_config --link-ld --libs`"
if test $? -ne 0; then
@@ -113,7 +108,6 @@ AC_DEFUN(SVN_LIB_APRUTIL,
AC_SUBST(SVN_APRUTIL_INCLUDES)
AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
AC_SUBST(SVN_APRUTIL_LIBS)
- AC_SUBST(SVN_APRUTIL_PREFIX)
dnl What version of Expat are we using? -----------------
SVN_HAVE_OLD_EXPAT="`$apu_config --old-expat`"
Modified: subversion/branches/gpg-agent-password-store/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/ac-macros/serf.m4?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/ac-macros/serf.m4 (original)
+++ subversion/branches/gpg-agent-password-store/build/ac-macros/serf.m4 Tue Jul 19 23:05:44 2011
@@ -39,13 +39,15 @@ AC_DEFUN(SVN_LIB_SERF,
elif test "$withval" != "no" ; then
AC_MSG_NOTICE([serf library configuration])
serf_prefix=$withval
- save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/serf-0"
- AC_CHECK_HEADERS(serf.h,[
- save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
- AC_CHECK_LIB(serf-0, serf_context_create,[
- AC_TRY_COMPILE([
+ for serf_major in serf-2 serf-1 serf-0; do
+ if ! test -d $serf_prefix/include/$serf_major; then continue; fi
+ save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/$serf_major"
+ AC_CHECK_HEADERS(serf.h,[
+ save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ AC_CHECK_LIB($serf_major, serf_context_create,[
+ AC_TRY_COMPILE([
#include <stdlib.h>
#include "serf.h"
],[
@@ -53,10 +55,12 @@ AC_DEFUN(SVN_LIB_SERF,
#error Serf version too old: need $serf_check_major.$serf_check_minor.$serf_check_patch
#endif
], [serf_found=yes], [AC_MSG_WARN([Serf version too old: need $serf_check_major.$serf_check_minor.$serf_check_patch])
- serf_found=no])], ,
- $SVN_APRUTIL_LIBS $SVN_APR_LIBS -lz)
- LDFLAGS="$save_ldflags"])
- CPPFLAGS="$save_cppflags"
+ serf_found=no])], ,
+ $SVN_APRUTIL_LIBS $SVN_APR_LIBS -lz)
+ LDFLAGS="$save_ldflags"])
+ CPPFLAGS="$save_cppflags"
+ test $serf_found = yes && break
+ done
fi
], [
if test -d "$srcdir/serf"; then
@@ -67,19 +71,18 @@ AC_DEFUN(SVN_LIB_SERF,
if test $serf_found = "reconfig"; then
SVN_EXTERNAL_PROJECT([serf], [--with-apr=$apr_config --with-apr-util=$apu_config])
+ serf_major=serf-`$srcdir/serf/build/get-version.sh major $srcdir/serf/serf.h SERF`
serf_prefix=$prefix
- SVN_SERF_PREFIX="$serf_prefix"
SVN_SERF_INCLUDES="-I$srcdir/serf"
- SVN_SERF_LIBS="$abs_builddir/serf/libserf-0.la"
+ SVN_SERF_LIBS="$abs_builddir/serf/lib$serf_major.la"
fi
if test $serf_found = "yes"; then
- SVN_SERF_PREFIX="$serf_prefix"
- SVN_SERF_INCLUDES="-I$serf_prefix/include/serf-0"
- if test -e "$serf_prefix/lib/libserf-0.la"; then
- SVN_SERF_LIBS="$serf_prefix/lib/libserf-0.la"
+ SVN_SERF_INCLUDES="-I$serf_prefix/include/$serf_major"
+ if test -e "$serf_prefix/lib/lib$serf_major.la"; then
+ SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
else
- SVN_SERF_LIBS="-lserf-0"
+ SVN_SERF_LIBS="-l$serf_major"
LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
fi
elif test $serf_found = "reconfig"; then
@@ -88,7 +91,6 @@ AC_DEFUN(SVN_LIB_SERF,
svn_lib_serf=$serf_found
- AC_SUBST(SVN_SERF_PREFIX)
AC_SUBST(SVN_SERF_INCLUDES)
AC_SUBST(SVN_SERF_LIBS)
])
Modified: subversion/branches/gpg-agent-password-store/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/ac-macros/sqlite.m4?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/gpg-agent-password-store/build/ac-macros/sqlite.m4 Tue Jul 19 23:05:44 2011
@@ -244,7 +244,6 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
echo "unpack the archive using tar/gunzip and copy sqlite3.c from the"
echo "resulting directory to:"
echo "$abs_srcdir/sqlite-amalgamation/sqlite3.c"
- echo "This file also ships as part of the subversion-deps distribution."
echo ""
AC_MSG_ERROR([Subversion requires SQLite])
])
Modified: subversion/branches/gpg-agent-password-store/build/ac-macros/zlib.m4
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/ac-macros/zlib.m4?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/ac-macros/zlib.m4 (original)
+++ subversion/branches/gpg-agent-password-store/build/ac-macros/zlib.m4 Tue Jul 19 23:05:44 2011
@@ -57,14 +57,12 @@ AC_DEFUN(SVN_LIB_Z,
fi
if test "$zlib_found" = "yes"; then
- SVN_ZLIB_PREFIX="$zlib_prefix"
SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$zlib_prefix/lib)`"
fi
SVN_ZLIB_LIBS="-lz"
- AC_SUBST(SVN_ZLIB_PREFIX)
AC_SUBST(SVN_ZLIB_INCLUDES)
AC_SUBST(SVN_ZLIB_LIBS)
])
Modified: subversion/branches/gpg-agent-password-store/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/buildcheck.sh?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/buildcheck.sh (original)
+++ subversion/branches/gpg-agent-password-store/build/buildcheck.sh Tue Jul 19 23:05:44 2011
@@ -76,6 +76,61 @@ fi
echo "buildcheck: autoheader version $ah_version (ok)"
#--------------------------------------------------------------------------
+# libtool 1.4 or newer
+#
+LIBTOOL_WANTED_MAJOR=1
+LIBTOOL_WANTED_MINOR=4
+LIBTOOL_WANTED_PATCH=
+LIBTOOL_WANTED_VERSION=1.4
+
+# The minimum version for source releases is 1.4.3,
+# because it's required by (at least) Solaris.
+if test "$VERSION_CHECK" = "--release"; then
+ LIBTOOL_WANTED_PATCH=3
+ LIBTOOL_WANTED_VERSION=1.4.3
+else
+ case `uname -sr` in
+ SunOS\ 5.*)
+ LIBTOOL_WANTED_PATCH=3
+ LIBTOOL_WANTED_VERSION=1.4.3
+ ;;
+ esac
+fi
+
+libtool=${LIBTOOL:-`./build/PrintPath glibtool libtool libtool15`}
+# Extract the libtool version number: everything from the first number in
+# the version text until a hyphen or space.
+lt_pversion=`$libtool --version 2>/dev/null |
+ sed -e 's/^[^0-9]*//' -e 's/[- ].*//' -e '/^$/d' |
+ sed -e 1q`
+if test -z "$lt_pversion"; then
+ echo "buildcheck: libtool not found."
+ echo " You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
+ exit 1
+fi
+lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+IFS=.; set $lt_version; IFS=' '
+lt_status="good"
+if test "$1" = "$LIBTOOL_WANTED_MAJOR"; then
+ if test "$2" -gt "$LIBTOOL_WANTED_MINOR"; then
+ lt_status="good"
+ elif test "$2" -lt "$LIBTOOL_WANTED_MINOR"; then
+ lt_status="bad"
+ elif test ! -z "$LIBTOOL_WANTED_PATCH"; then
+ if test "$3" -lt "$LIBTOOL_WANTED_PATCH"; then
+ lt_status="bad"
+ fi
+ fi
+fi
+if test $lt_status != "good"; then
+ echo "buildcheck: libtool version $lt_pversion found."
+ echo " You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
+ exit 1
+fi
+
+echo "buildcheck: libtool version $lt_pversion (ok)"
+
+#--------------------------------------------------------------------------
# check that our local copies of files match up with those in APR(UTIL)
#
if test -d ./apr; then
Modified: subversion/branches/gpg-agent-password-store/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/generator/gen_make.py?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/generator/gen_make.py (original)
+++ subversion/branches/gpg-agent-password-store/build/generator/gen_make.py Tue Jul 19 23:05:44 2011
@@ -531,6 +531,8 @@ DIR=`pwd`
''')
libdep_cache = {}
paths = {}
+ for lib in ('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'):
+ paths[lib] = self.sections[lib].options.get('path')
for target_ob in install_sources:
if not isinstance(target_ob, gen_base.TargetExe):
continue
@@ -548,7 +550,7 @@ DIR=`pwd`
def _get_all_lib_deps(self, target_name, libdep_cache, paths):
if not target_name in libdep_cache:
- libs = {}
+ libs = set()
path = None
if target_name in self.sections:
section = self.sections[target_name]
@@ -557,11 +559,12 @@ DIR=`pwd`
if opt_libs:
for lib_name in opt_libs.split():
if lib_name.startswith('libsvn_'):
- libs[lib_name] = True
+ libs.add(lib_name)
for lib in self._get_all_lib_deps(lib_name, libdep_cache, paths):
- libs[lib] = True
- libdep_cache[target_name] = libs.keys()[:]
- libdep_cache[target_name].sort()
+ libs.add(lib)
+ if target_name == 'libsvn_subr':
+ libs.update(('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'))
+ libdep_cache[target_name] = sorted(libs)
return libdep_cache[target_name]
class UnknownDependency(Exception):
Modified: subversion/branches/gpg-agent-password-store/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/generator/gen_win.py?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/generator/gen_win.py (original)
+++ subversion/branches/gpg-agent-password-store/build/generator/gen_win.py Tue Jul 19 23:05:44 2011
@@ -1021,7 +1021,10 @@ class WinGeneratorBase(GeneratorBase):
neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
if self.serf_lib:
- serflib = 'serf.lib'
+ if self.serf_ver_maj != 0:
+ serflib = 'serf-1.lib'
+ else:
+ serflib = 'serf.lib'
zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
sasllib = None
@@ -1178,6 +1181,11 @@ class WinGeneratorBase(GeneratorBase):
return
serf_path = os.path.abspath(self.serf_path)
+ if self.serf_ver_maj != 0:
+ serflib = 'serf-1.lib'
+ else:
+ serflib = 'serf.lib'
+
self.move_proj_file(self.serf_path, name,
(('serf_sources',
glob.glob(os.path.join(serf_path, '*.c'))
@@ -1198,6 +1206,7 @@ class WinGeneratorBase(GeneratorBase):
('apr_util_path', os.path.abspath(self.apr_util_path)),
('project_guid', self.makeguid('serf')),
('apr_static', self.static_apr),
+ ('serf_lib', serflib),
))
def move_proj_file(self, path, name, params=()):
@@ -1433,27 +1442,27 @@ class WinGeneratorBase(GeneratorBase):
# shouldn't be called unless serf is there
assert self.serf_path and os.path.exists(self.serf_path)
+ self.serf_ver_maj = None
+ self.serf_ver_min = None
+ self.serf_ver_patch = None
+
# serf.h should be present
if not os.path.exists(os.path.join(self.serf_path, 'serf.h')):
return None, None, None
- ver_maj = None
- ver_min = None
- ver_patch = None
-
txt = open(os.path.join(self.serf_path, 'serf.h')).read()
maj_match = re.search(r'SERF_MAJOR_VERSION\s+(\d+)', txt)
min_match = re.search(r'SERF_MINOR_VERSION\s+(\d+)', txt)
patch_match = re.search(r'SERF_PATCH_VERSION\s+(\d+)', txt)
if maj_match:
- ver_maj = int(maj_match.group(1))
+ self.serf_ver_maj = int(maj_match.group(1))
if min_match:
- ver_min = int(min_match.group(1))
+ self.serf_ver_min = int(min_match.group(1))
if patch_match:
- ver_patch = int(patch_match.group(1))
+ self.serf_ver_patch = int(patch_match.group(1))
- return ver_maj, ver_min, ver_patch
+ return self.serf_ver_maj, self.serf_ver_min, self.serf_ver_patch
def _find_serf(self):
"Check if serf and its dependencies are available"
Modified: subversion/branches/gpg-agent-password-store/build/generator/templates/serf.dsp.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/generator/templates/serf.dsp.ezt?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/generator/templates/serf.dsp.ezt (original)
+++ subversion/branches/gpg-agent-password-store/build/generator/templates/serf.dsp.ezt Tue Jul 19 23:05:44 2011
@@ -32,7 +32,7 @@ CFG=serf - Win32 Debug
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_File "Release/serf.lib"
+# PROP BASE Target_File "Release/[serf_lib]"
# PROP BASE Bsc_Name ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
@@ -40,7 +40,7 @@ CFG=serf - Win32 Debug
# PROP Intermediate_Dir "Release"
# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
# PROP Rebuild_Opt "/a"
-# PROP Target_File "Release/serf.lib"
+# PROP Target_File "Release/[serf_lib]"
# PROP Bsc_Name ""
!ELSEIF "$(CFG)" == "serf - Win32 Debug"
@@ -50,7 +50,7 @@ CFG=serf - Win32 Debug
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "Debug/serf.lib"
+# PROP BASE Target_File "Debug/[serf_lib]"
# PROP BASE Bsc_Name ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
@@ -58,7 +58,7 @@ CFG=serf - Win32 Debug
# PROP Intermediate_Dir "Debug"
# PROP Cmd_Line "nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
# PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug/serf.lib"
+# PROP Target_File "Debug/[serf_lib]"
# PROP Bsc_Name ""
!ENDIF
Modified: subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcproj.ezt?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcproj.ezt (original)
+++ subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcproj.ezt Tue Jul 19 23:05:44 2011
@@ -43,7 +43,7 @@
BuildCommandLine="nmake /s /nologo /f serf.mak ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN DEBUG_BUILD=1 APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- Output="$(OutDir)\serf.lib"/>
+ Output="$(OutDir)\[serf_lib]"/>
</Configuration>
<Configuration
Name="Release|[platforms]"
@@ -59,7 +59,7 @@
BuildCommandLine="nmake /s /nologo /f serf.mak ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
ReBuildCommandLine="nmake /s /nologo /f serf.mak CLEAN ALL APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
CleanCommandLine="nmake /s /nologo /f serf.mak CLEAN APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
- Output="$(OutDir)\serf.lib"/>
+ Output="$(OutDir)\[serf_lib]"/>
</Configuration>
[end] </Configurations>
<Files>
Modified: subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcxproj.ezt?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcxproj.ezt (original)
+++ subversion/branches/gpg-agent-password-store/build/generator/templates/serf.vcxproj.ezt Tue Jul 19 23:05:44 2011
@@ -48,7 +48,7 @@
<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeBuildCommandLine>
<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN ALL [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeReBuildCommandLine>
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">"$(VCInstallDir)bin\nmake.exe" /s /nologo /f serf.mak CLEAN [is configs "Debug"]DEBUG_BUILD=1 [end]APR_SRC=[apr_path] APRUTIL_SRC=[apr_util_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]</NMakeCleanCommandLine>
- <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\serf.lib</NMakeOutput>
+ <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">$(OutDir)\[serf_lib]</NMakeOutput>
[end][end] </PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
Modified: subversion/branches/gpg-agent-password-store/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/build/run_tests.py?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/build/run_tests.py (original)
+++ subversion/branches/gpg-agent-password-store/build/run_tests.py Tue Jul 19 23:05:44 2011
@@ -108,6 +108,12 @@ class TestHarness:
self.fs_type = fs_type
self.http_library = http_library
self.server_minor_version = server_minor_version
+ # If you change the below condition then change in
+ # ../subversion/tests/cmdline/svntest/main.py too.
+ if server_minor_version is not None:
+ if int(server_minor_version) < 3 or int(server_minor_version) > 7:
+ sys.stderr.write("Test harness only supports server minor versions 3-7\n")
+ sys.exit(1)
self.verbose = verbose
self.cleanup = cleanup
self.enable_sasl = enable_sasl
Modified: subversion/branches/gpg-agent-password-store/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/configure.ac?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/configure.ac (original)
+++ subversion/branches/gpg-agent-password-store/configure.ac Tue Jul 19 23:05:44 2011
@@ -105,7 +105,6 @@ if test `expr $apr_version : 2` -ne 0; t
AC_SUBST(SVN_APRUTIL_INCLUDES)
AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
AC_SUBST(SVN_APRUTIL_LIBS)
- AC_SUBST(SVN_APRUTIL_PREFIX)
else
SVN_LT_SOVERSION="-version-info 0"
APU_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\."]
@@ -215,15 +214,21 @@ AC_DEFINE_UNQUOTED(SVN_LOCALE_DIR, "${sv
[Defined to be the path to the installed locale dirs])
dnl Check for libtool -- we'll definitely need it for all our shared libs!
-AC_ARG_WITH(custom-libtool,
-AS_HELP_STRING([--with-custom-libtool=PATH],
- [Specify the command to run libtool]),
- [ AC_MSG_NOTICE([using $withval as libtool])
- sh_libtool="$withval" ],
- [ AC_MSG_NOTICE([using APR's libtool])
- sh_libtool="`$apr_config --apr-libtool`" ])
-LIBTOOL="$sh_libtool"
-SVN_LIBTOOL="$sh_libtool"
+AC_MSG_NOTICE([configuring libtool now])
+ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
+AC_ARG_ENABLE(experimental-libtool,
+ AS_HELP_STRING([--enable-experimental-libtool],[Use APR's libtool]),
+ [experimental_libtool=$enableval],[experimental_libtool=no])
+
+if test "$experimental_libtool" = "yes"; then
+ echo "using APR's libtool"
+ sh_libtool="`$apr_config --apr-libtool`"
+ LIBTOOL="$sh_libtool"
+ SVN_LIBTOOL="$sh_libtool"
+else
+ sh_libtool="$abs_builddir/libtool"
+ SVN_LIBTOOL="\$(SHELL) $sh_libtool"
+fi
AC_SUBST(SVN_LIBTOOL)
dnl Determine the libtool version
@@ -1125,12 +1130,20 @@ SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
AC_PATH_PROG(PERL, perl, none)
-AC_PATH_PROGS(RUBY, "$RUBY" ruby ruby1.9 ruby19 ruby1.8 ruby18, none)
+if test -n "$RUBY"; then
+ AC_PATH_PROG(RUBY, "$RUBY", none)
+else
+ AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18, none)
+fi
if test "$RUBY" != "none"; then
AC_MSG_CHECKING([rb_hash_foreach])
if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)' >/dev/null; then
AC_MSG_RESULT([yes])
- AC_PATH_PROGS(RDOC, "$RDOC" rdoc rdoc1.9 rdoc19 rdoc1.8 rdoc18, none)
+ if test -n "$RDOC"; then
+ AC_PATH_PROG(RDOC, "$RDOC", none)
+ else
+ AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
+ fi
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
])
@@ -1143,6 +1156,13 @@ if test "$RUBY" != "none"; then
AC_SUBST(RUBY_MAJOR)
AC_SUBST(RUBY_MINOR)
+ if test ! \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "8" \); then
+ # Disallow Ruby 1.9 or later until the binding tests get fixed
+ # to run with those versions.
+ RUBY="none"
+ AC_MSG_WARN([The detected Ruby is too new for Subversion to use])
+ AC_MSG_WARN([Only 1.8.x releases are supported at this time])
+ fi
else
AC_MSG_RESULT([no])
RUBY="none"
Modified: subversion/branches/gpg-agent-password-store/contrib/hook-scripts/enforcer/enforcer
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/contrib/hook-scripts/enforcer/enforcer?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/contrib/hook-scripts/enforcer/enforcer (original)
+++ subversion/branches/gpg-agent-password-store/contrib/hook-scripts/enforcer/enforcer Tue Jul 19 23:05:44 2011
@@ -127,7 +127,7 @@ changes to files.
These example scenarios are implemented in the provided example
configuration file "enforcer.conf".
-When writing hooks, it is usually easier to test the hooks on commited
+When writing hooks, it is usually easier to test the hooks on committed
transactions already in the repository, rather than installing the
hook and making commits to test the them. Enforcer allows you to
specify either a transaction ID (for use in a hook script) or a
Propchange: subversion/branches/gpg-agent-password-store/contrib/hook-scripts/hook_toolbox.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/gpg-agent-password-store/contrib/server-side/fsfsfixer/fixer/fixer_config.py
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/gpg-agent-password-store/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/contrib/server-side/fsfsverify.py?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/contrib/server-side/fsfsverify.py (original)
+++ subversion/branches/gpg-agent-password-store/contrib/server-side/fsfsverify.py Tue Jul 19 23:05:44 2011
@@ -665,7 +665,7 @@ class NodeRev(object):
currentOffset = f.tell()
line = f.readline()
if line == '':
- raise IOError, "Unexpected end of file"
+ raise IOError, "Unexpected end of file at offset %d" % currentOffset
if line == '\n':
break
@@ -673,11 +673,17 @@ class NodeRev(object):
try:
(field, value) = line.split(':', 1)
except:
- print repr(line)
- print self.nodeOffset
- print f.tell()
+ print("line: '%s'" % repr(line))
+ print("Node revision offset: %i" % self.nodeOffset)
+ print("Current file position: %i" % f.tell())
raise
+ if field == "":
+ print("line: '%s'" % repr(line))
+ print("Node revision offset: %i" % self.nodeOffset)
+ print("Current file position: %i" % f.tell())
+ raise Exception("Empty field in node revision")
+
# pull of the leading space and trailing new line
if len(value) < 2:
raise FsfsVerifyException("value needs to contain 2 or more bytes (%d)" % currentOffset)
@@ -742,6 +748,10 @@ class NodeRev(object):
self.copyroot = value
elif field == 'copyfrom':
self.copyfrom = value
+ elif field == 'count' or field == 'minfo-cnt' or field == 'minfo-here':
+ pass
+ else:
+ raise Exception("Unrecognized field '%s'\n" % field)
if self.type.type == 'dir':
if self.text:
Modified: subversion/branches/gpg-agent-password-store/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/get-deps.sh?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/get-deps.sh (original)
+++ subversion/branches/gpg-agent-password-store/get-deps.sh Tue Jul 19 23:05:44 2011
@@ -37,53 +37,108 @@ APR_ICONV=apr-iconv-1.2.1
BASEDIR=`pwd`
TEMPDIR=$BASEDIR/temp
+HTTP_FETCH=
+[ -z "$HTTP_FETCH" ] && type wget >/dev/null 2>&1 && HTTP_FETCH="wget -nc"
+[ -z "$HTTP_FETCH" ] && type curl >/dev/null 2>&1 && HTTP_FETCH="curl -O"
+[ -z "$HTTP_FETCH" ] && type fetch >/dev/null 2>&1 && HTTP_FETCH="fetch"
+
# Need this uncommented if any of the specific versions of the ASF tarballs to
# be downloaded are no longer available on the general mirrors.
APACHE_MIRROR=http://archive.apache.org/dist
-get_deps() {
- mkdir -p $TEMPDIR
+# helpers
+usage() {
+ echo "Usage: $0"
+ echo "Usage: $0 [ apr | neon | serf | zlib | sqlite ] ..."
+ exit $1
+}
+
+# getters
+get_apr() {
cd $TEMPDIR
+ $HTTP_FETCH $APACHE_MIRROR/apr/$APR.tar.bz2
+ $HTTP_FETCH $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
+ cd $BASEDIR
- for d in neon zlib serf sqlite-amalgamation apr apr-util; do
- if [ -d $i ]; then
- echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
- fi
- done
+ bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
+ bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
- wget -nc $APACHE_MIRROR/apr/$APR.tar.bz2
- wget -nc $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
- wget -nc http://webdav.org/neon/$NEON.tar.gz
- wget -nc http://serf.googlecode.com/files/$SERF.tar.bz2
- wget -nc http://www.zlib.net/$ZLIB.tar.bz2
- wget -nc http://www.sqlite.org/$SQLITE.zip
+ mv $APR apr
+ mv $APR_UTIL apr-util
+}
+get_neon() {
+ cd $TEMPDIR
+ $HTTP_FETCH http://webdav.org/neon/$NEON.tar.gz
cd $BASEDIR
+
gzip -dc $TEMPDIR/$NEON.tar.gz | tar -xf -
- bzip2 -dc $TEMPDIR/$ZLIB.tar.bz2 | tar -xf -
- bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf -
- unzip -q $TEMPDIR/$SQLITE.zip
mv $NEON neon
- mv $ZLIB zlib
+}
+
+get_serf() {
+ cd $TEMPDIR
+ $HTTP_FETCH http://serf.googlecode.com/files/$SERF.tar.bz2
+ cd $BASEDIR
+
+ bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf -
+
mv $SERF serf
- mv $SQLITE sqlite-amalgamation
+}
- bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
- bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
- mv $APR apr
- mv $APR_UTIL apr-util
+get_zlib() {
+ cd $TEMPDIR
+ $HTTP_FETCH http://www.zlib.net/$ZLIB.tar.bz2
+ cd $BASEDIR
+
+ bzip2 -dc $TEMPDIR/$ZLIB.tar.bz2 | tar -xf -
+
+ mv $ZLIB zlib
+}
+
+get_sqlite() {
+ cd $TEMPDIR
+ $HTTP_FETCH http://www.sqlite.org/$SQLITE.zip
cd $BASEDIR
- echo
- echo "If you require mod_dav_svn, the recommended version of httpd is:"
- echo " $APACHE_MIRROR/httpd/$HTTPD.tar.bz2"
-
- echo
- echo "If you require apr-iconv, its recommended version is:"
- echo " $APACHE_MIRROR/apr/$APR_ICONV.tar.bz2"
+ unzip -q $TEMPDIR/$SQLITE.zip
+
+ mv $SQLITE sqlite-amalgamation
+
+}
+
+# main()
+get_deps() {
+ mkdir -p $TEMPDIR
+
+ for i in neon zlib serf sqlite-amalgamation apr apr-util; do
+ if [ -d $i ]; then
+ echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
+ fi
+ done
+
+ if [ $# -gt 0 ]; then
+ for target; do
+ get_$target || usage
+ done
+ else
+ get_apr
+ get_neon
+ get_serf
+ get_zlib
+ get_sqlite
+
+ echo
+ echo "If you require mod_dav_svn, the recommended version of httpd is:"
+ echo " $APACHE_MIRROR/httpd/$HTTPD.tar.bz2"
+
+ echo
+ echo "If you require apr-iconv, its recommended version is:"
+ echo " $APACHE_MIRROR/apr/$APR_ICONV.tar.bz2"
+ fi
rm -rf $TEMPDIR
}
-get_deps
+get_deps "$@"
Modified: subversion/branches/gpg-agent-password-store/notes/merge-tracking/func-spec.html
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/notes/merge-tracking/func-spec.html?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/notes/merge-tracking/func-spec.html (original)
+++ subversion/branches/gpg-agent-password-store/notes/merge-tracking/func-spec.html Tue Jul 19 23:05:44 2011
@@ -121,7 +121,7 @@ status</code> and <code>svn status -u</c
<p>While some state indicating delayed merge info retrieval and
handling could instead be stored in WC to preserve offline operation,
-there are complications with this when subsequent uncommited revert
+there are complications with this when subsequent uncommitted revert
operations should change the merge info (we'd have to store negative
merge info in the WC).</p>
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/JNIUtil.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/JNIUtil.h Tue Jul 19 23:05:44 2011
@@ -31,7 +31,6 @@
#include <vector>
#include "Pool.h"
struct apr_pool_t;
-struct svn_error;
class JNIMutex;
class SVNBase;
#include <jni.h>
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/SVNClient.cpp?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/SVNClient.cpp Tue Jul 19 23:05:44 2011
@@ -500,11 +500,11 @@ jlong SVNClient::doExport(const char *sr
if (ctx == NULL)
return -1;
- SVN_JNI_ERR(svn_client_export4(&rev, sourcePath.c_str(),
+ SVN_JNI_ERR(svn_client_export5(&rev, sourcePath.c_str(),
destinationPath.c_str(),
pegRevision.revision(),
revision.revision(), force,
- ignoreExternals,
+ ignoreExternals, FALSE,
depth,
nativeEOL, ctx,
requestPool.pool()),
@@ -613,12 +613,12 @@ void SVNClient::merge(const char *path1,
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_merge3(srcPath1.c_str(), revision1.revision(),
+ SVN_JNI_ERR(svn_client_merge4(srcPath1.c_str(), revision1.revision(),
srcPath2.c_str(), revision2.revision(),
intLocalPath.c_str(),
depth,
ignoreAncestry, force, recordOnly, dryRun,
- NULL, ctx, requestPool.pool()), );
+ TRUE, NULL, ctx, requestPool.pool()), );
}
void SVNClient::merge(const char *path, Revision &pegRevision,
@@ -668,13 +668,13 @@ void SVNClient::merge(const char *path,
return;
}
- SVN_JNI_ERR(svn_client_merge_peg3(srcPath.c_str(),
+ SVN_JNI_ERR(svn_client_merge_peg4(srcPath.c_str(),
ranges,
pegRevision.revision(),
intLocalPath.c_str(),
depth,
ignoreAncestry, force, recordOnly,
- dryRun, NULL, ctx,
+ dryRun, TRUE, NULL, ctx,
requestPool.pool()), );
}
@@ -1462,10 +1462,10 @@ SVNClient::info2(const char *path, Revis
SVN_JNI_ERR(svn_client_info3(checkedPath.c_str(),
pegRevision.revision(),
revision.revision(),
- InfoCallback::callback,
- callback, depth,
- changelists.array(requestPool), ctx,
- requestPool.pool()), );
+ depth, FALSE, TRUE,
+ changelists.array(requestPool),
+ InfoCallback::callback, callback,
+ ctx, requestPool.pool()), );
}
void
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/Targets.h
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/Targets.h?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/Targets.h (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/native/Targets.h Tue Jul 19 23:05:44 2011
@@ -32,7 +32,6 @@
#include "StringArray.h"
struct apr_array_header_t;
-struct svn_error_t;
#include "Path.h"
#include <vector>
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Tue Jul 19 23:05:44 2011
@@ -468,6 +468,9 @@ public class ClientNotifyInformation ext
/** Skipping a working only node */
update_skip_working_only ("update skip working only"),
+ /** Skipped a file or directory to which access couldn't be obtained */
+ update_skip_access_denied ("update skip access denied"),
+
/** An update operation removed an external working copy. */
update_external_removed ("update external removed"),
Modified: subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java?rev=1148581&r1=1148580&r2=1148581&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java (original)
+++ subversion/branches/gpg-agent-password-store/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java Tue Jul 19 23:05:44 2011
@@ -28,7 +28,7 @@ import java.util.Date;
import org.apache.subversion.javahl.types.LogDate;
/**
- * This class describes a item which will be commited.
+ * This class describes a item which will be committed.
*/
public class CommitInfo implements java.io.Serializable
{
@@ -41,7 +41,7 @@ public class CommitInfo implements java.
// http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
- /** the revision commited */
+ /** the revision committed */
long revision;
/** the date of the revision */