You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/03/14 14:07:09 UTC
svn commit: r1300532 [1/9] - in /subversion/branches/multi-layer-moves: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ notes/ notes/directory-index/ subversion/bindings/javahl/
subversion/bindings/javahl/native/ sub...
Author: philip
Date: Wed Mar 14 13:07:02 2012
New Revision: 1300532
URL: http://svn.apache.org/viewvc?rev=1300532&view=rev
Log:
Sync the multi-layer-move branch with trunk@1300512 resolving a conflict
on wc_db.c.
Added:
subversion/branches/multi-layer-moves/notes/directory-index/
- copied from r1300512, subversion/trunk/notes/directory-index/
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/
- copied from r1295003, subversion/trunk/tools/server-side/svnpubsub/
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/daemonize.py
- copied unchanged from r1300512, subversion/trunk/tools/server-side/svnpubsub/daemonize.py
Modified:
subversion/branches/multi-layer-moves/ (props changed)
subversion/branches/multi-layer-moves/CHANGES
subversion/branches/multi-layer-moves/COMMITTERS
subversion/branches/multi-layer-moves/INSTALL
subversion/branches/multi-layer-moves/Makefile.in
subversion/branches/multi-layer-moves/autogen.sh
subversion/branches/multi-layer-moves/build/ac-macros/apache.m4
subversion/branches/multi-layer-moves/build/find_python.sh
subversion/branches/multi-layer-moves/build/generator/gen_vcnet_vcproj.py
subversion/branches/multi-layer-moves/build/generator/gen_win.py
subversion/branches/multi-layer-moves/build/generator/templates/neon.vcxproj.ezt
subversion/branches/multi-layer-moves/build/generator/templates/serf.vcxproj.ezt
subversion/branches/multi-layer-moves/build/generator/templates/svn_config.vcxproj.ezt
subversion/branches/multi-layer-moves/build/generator/templates/svn_locale.vcxproj.ezt
subversion/branches/multi-layer-moves/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/multi-layer-moves/build/generator/templates/zlib.vcxproj.ezt
subversion/branches/multi-layer-moves/build/win32/make_dist.py
subversion/branches/multi-layer-moves/build/win32/vc6-build.bat.in
subversion/branches/multi-layer-moves/configure.ac
subversion/branches/multi-layer-moves/get-deps.sh
subversion/branches/multi-layer-moves/notes/subversion-design.html
subversion/branches/multi-layer-moves/subversion/bindings/javahl/README
subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/File.cpp
subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/multi-layer-moves/subversion/bindings/swig/INSTALL
subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_types.swg
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Base.pm (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Client.pm (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Core.pm (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Delta.pm (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Fs.pm (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Ra.pm (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Repos.pm (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Wc.pm (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/0use.t (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/1repos.t (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/2fs.t (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/3client.t (contents, props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/4pool.t (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/5delta-compat.t (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/5delta.t (props changed)
subversion/branches/multi-layer-moves/subversion/bindings/swig/python/svn/repos.py
subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/repository.py
subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/wc.py
subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/test_repos.rb
subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/util.rb
subversion/branches/multi-layer-moves/subversion/include/private/svn_cache.h
subversion/branches/multi-layer-moves/subversion/include/private/svn_cmdline_private.h
subversion/branches/multi-layer-moves/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/multi-layer-moves/subversion/include/private/svn_mutex.h
subversion/branches/multi-layer-moves/subversion/include/private/svn_ra_private.h
subversion/branches/multi-layer-moves/subversion/include/private/svn_repos_private.h
subversion/branches/multi-layer-moves/subversion/include/private/svn_wc_private.h
subversion/branches/multi-layer-moves/subversion/include/svn_client.h
subversion/branches/multi-layer-moves/subversion/include/svn_delta.h
subversion/branches/multi-layer-moves/subversion/include/svn_editor.h
subversion/branches/multi-layer-moves/subversion/include/svn_error.h
subversion/branches/multi-layer-moves/subversion/include/svn_fs.h
subversion/branches/multi-layer-moves/subversion/include/svn_ra_svn.h
subversion/branches/multi-layer-moves/subversion/include/svn_repos.h
subversion/branches/multi-layer-moves/subversion/include/svn_wc.h
subversion/branches/multi-layer-moves/subversion/libsvn_client/add.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/checkout.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/client.h
subversion/branches/multi-layer-moves/subversion/libsvn_client/commit.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/copy.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/delete.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/diff.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/externals.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/merge.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/mergeinfo.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/prop_commands.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/repos_diff.c
subversion/branches/multi-layer-moves/subversion/libsvn_client/util.c
subversion/branches/multi-layer-moves/subversion/libsvn_delta/compat.c
subversion/branches/multi-layer-moves/subversion/libsvn_delta/editor.c
subversion/branches/multi-layer-moves/subversion/libsvn_delta/svndiff.c
subversion/branches/multi-layer-moves/subversion/libsvn_delta/text_delta.c
subversion/branches/multi-layer-moves/subversion/libsvn_delta/xdelta.c
subversion/branches/multi-layer-moves/subversion/libsvn_fs/fs-loader.c
subversion/branches/multi-layer-moves/subversion/libsvn_fs/fs-loader.h
subversion/branches/multi-layer-moves/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/multi-layer-moves/subversion/libsvn_fs_base/fs.c
subversion/branches/multi-layer-moves/subversion/libsvn_fs_base/notes/structure
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/fs.c
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/fs.h
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/structure
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/temp_serializer.h
subversion/branches/multi-layer-moves/subversion/libsvn_fs_fs/tree.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra/ra_loader.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra/ra_loader.h
subversion/branches/multi-layer-moves/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_neon/commit.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_neon/log.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/multi-layer-moves/subversion/libsvn_ra_neon/session.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_neon/util.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_serf/commit.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_serf/locks.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/multi-layer-moves/subversion/libsvn_ra_serf/serf.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_serf/util.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_svn/client.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_svn/editorp.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_svn/marshal.c
subversion/branches/multi-layer-moves/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/multi-layer-moves/subversion/libsvn_repos/commit.c
subversion/branches/multi-layer-moves/subversion/libsvn_repos/dump.c
subversion/branches/multi-layer-moves/subversion/libsvn_repos/hooks.c
subversion/branches/multi-layer-moves/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/multi-layer-moves/subversion/libsvn_repos/log.c
subversion/branches/multi-layer-moves/subversion/libsvn_repos/replay.c
subversion/branches/multi-layer-moves/subversion/libsvn_repos/rev_hunt.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/auth.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/cache-memcache.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/gpg_agent.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/mergeinfo.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/skel.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/sqlite.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/stream.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/svn_mutex.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/svn_string.c
subversion/branches/multi-layer-moves/subversion/libsvn_subr/utf.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/adm_crawler.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/adm_ops.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/entries.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/externals.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/props.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/status.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/update_editor.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/util.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.h
subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db_private.h
subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/multi-layer-moves/subversion/mod_dav_svn/liveprops.c
subversion/branches/multi-layer-moves/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/multi-layer-moves/subversion/mod_dav_svn/repos.c
subversion/branches/multi-layer-moves/subversion/mod_dav_svn/version.c
subversion/branches/multi-layer-moves/subversion/po/de.po
subversion/branches/multi-layer-moves/subversion/po/fr.po
subversion/branches/multi-layer-moves/subversion/po/zh_CN.po
subversion/branches/multi-layer-moves/subversion/svn/cat-cmd.c
subversion/branches/multi-layer-moves/subversion/svn/list-cmd.c
subversion/branches/multi-layer-moves/subversion/svn/log-cmd.c
subversion/branches/multi-layer-moves/subversion/svn/main.c
subversion/branches/multi-layer-moves/subversion/svn/proplist-cmd.c
subversion/branches/multi-layer-moves/subversion/svn/status.c
subversion/branches/multi-layer-moves/subversion/svnadmin/main.c
subversion/branches/multi-layer-moves/subversion/svndumpfilter/main.c
subversion/branches/multi-layer-moves/subversion/svnlook/main.c
subversion/branches/multi-layer-moves/subversion/svnrdump/dump_editor.c
subversion/branches/multi-layer-moves/subversion/svnserve/main.c
subversion/branches/multi-layer-moves/subversion/svnserve/serve.c
subversion/branches/multi-layer-moves/subversion/svnversion/main.c
subversion/branches/multi-layer-moves/subversion/tests/README
subversion/branches/multi-layer-moves/subversion/tests/cmdline/README
subversion/branches/multi-layer-moves/subversion/tests/cmdline/authz_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/basic_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/checkout_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/commit_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/copy_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/davautocheck.sh
subversion/branches/multi-layer-moves/subversion/tests/cmdline/depth_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/diff_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/externals_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/info_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/lock_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/log_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/merge_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/patch_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/special_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/stat_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svntest/__init__.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svntest/actions.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svntest/factory.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svntest/main.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svntest/tree.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svntest/verify.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/svntest/wc.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/update_tests.py
subversion/branches/multi-layer-moves/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/multi-layer-moves/subversion/tests/libsvn_client/client-test.c
subversion/branches/multi-layer-moves/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/multi-layer-moves/subversion/tests/libsvn_subr/spillbuf-test.c
subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/multi-layer-moves/subversion/tests/libsvn_wc/wc-incomplete-tester.c
subversion/branches/multi-layer-moves/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
subversion/branches/multi-layer-moves/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/multi-layer-moves/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/multi-layer-moves/tools/client-side/detach.py
subversion/branches/multi-layer-moves/tools/client-side/mergeinfo-sanitizer.py
subversion/branches/multi-layer-moves/tools/dev/merge-graph.py
subversion/branches/multi-layer-moves/tools/dev/mergegraph/mergegraph.py
subversion/branches/multi-layer-moves/tools/dev/unix-build/Makefile.svn
subversion/branches/multi-layer-moves/tools/dev/which-error.py
subversion/branches/multi-layer-moves/tools/dev/windows-build/Makefile
subversion/branches/multi-layer-moves/tools/diff/diff.c
subversion/branches/multi-layer-moves/tools/dist/backport.pl
subversion/branches/multi-layer-moves/tools/dist/release.py
subversion/branches/multi-layer-moves/tools/server-side/svnpredumpfilter.py
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/README.txt
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/rc.d/svnwcsub
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/svnpubsub/client.py
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/svnpubsub/server.py
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/svntweet.py
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/svnwcsub.py
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/test.conf
subversion/branches/multi-layer-moves/tools/server-side/svnpubsub/watcher.py
Propchange: subversion/branches/multi-layer-moves/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 14 13:07:02 2012
@@ -57,4 +57,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1239019-1243459
+/subversion/trunk:1239019-1295003,1295006-1300512
Modified: subversion/branches/multi-layer-moves/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/CHANGES?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/CHANGES (original)
+++ subversion/branches/multi-layer-moves/CHANGES Wed Mar 14 13:07:02 2012
@@ -20,6 +20,7 @@ http://svn.apache.org/repos/asf/subversi
* new SVNHooksEnv configuration option for mod_dav_svn (r1239966)
* new --ignore-properties option for 'svn diff' (r1239553. -617)
* new --patch-compatible option for 'svn diff' (r1239561)
+ * new SvnPubSub distributed commit hooks (tools/server-side/svnpubsub)
- Client-side bugfixes:
*
@@ -32,7 +33,7 @@ http://svn.apache.org/repos/asf/subversi
Developer-visible changes:
- General:
- *
+ * Now require Python 2.5 for tests and dev tools (r1243627)
- API changes:
* fix inconsistent handling of log revs without changed paths (issue #3694)
@@ -41,6 +42,26 @@ http://svn.apache.org/repos/asf/subversi
*
+Version 1.7.4
+(08 Mar 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.4
+
+ User-visible changes:
+ * fix 'svn log --diff' for moved paths (r1210147, et al)
+ * fix ra_serf problem with reading directory entries via HTTPv2 (r1238121)
+ * prepend "sqlite:" to error messages from SQLite (r1245738, -817)
+ * fix randomly missing "Merged via" notifications in 'svn log -g' (r1293229)
+ * fix spurious conflict when merging deleted symbolic link (issue #4052)
+ * fix URL-to-WC copy of externals on Windows (issue #4123)
+ * improve an FSFS sanity-check error message (r1294470)
+ * fix regressions with symlinks pointing at externals (issue #4102)
+ * fix 'svn log --diff' output ordering issue on Windows (r1295671)
+
+ Developer-visible changes:
+ * don't build mod_dontdothat if not building with httpd (r1243976)
+ * fix the testsuite to avoid FAILs on APR hash order (r1230714, et al)
+
+
Version 1.7.3
(14 Feb 2012, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.3
Modified: subversion/branches/multi-layer-moves/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/COMMITTERS?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/COMMITTERS [UTF-8] (original)
+++ subversion/branches/multi-layer-moves/COMMITTERS [UTF-8] Wed Mar 14 13:07:02 2012
@@ -137,7 +137,7 @@ Commit access for specific areas:
madanus Madan U S <ma...@collab.net> (svnmerge) [EMAIL
IS BOUNCING]
wein Mathias Weinert <we...@mccw.de> (mailer)
- bhuvan Bhuvaneswaran <bh...@collab.net> (svn2feed.py,
+ bhuvan Bhuvaneswaran A <bh...@apache.org> (svn2feed.py,
build/hudson)
aogier Anthony Ogier <ao...@iorga.com> (svn-merge-vendor.py)
dkagedal David Kågedal <da...@lysator.liu.se> (dsvn.el)
@@ -154,12 +154,15 @@ Commit access for specific areas:
tools/buildbot)
artagnon Ramkumar Ramachandra <ar...@gmail.com> (svnrdump, svntest)
arwin Arwin Arni <ar...@collab.net> (svn-bisect)
+ joes Joe Schaefer <jo...@yahoo.com> (svnpubsub)
+
Translation of message files:
niqueco Nicolás Lichtmaier <ni...@reloco.com.ar> (po: es)
luebbe Lübbe Onken <lu...@tigris.org> (po: de)
jensseidel Jens Seidel <je...@users.sf.net> (po: de)
+ astieger Andreas Stieger <an...@gmx.de> (po: de)
oyvindmo Øyvind Møll <sv...@moll.no> (po: nb)
sunny256 Øyvind A. Holm <su...@sunbase.org> (po: nb)
jzgoda Jaroslaw Zgoda <jz...@o2.pl> (po: pl)
Modified: subversion/branches/multi-layer-moves/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/INSTALL?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/INSTALL (original)
+++ subversion/branches/multi-layer-moves/INSTALL Wed Mar 14 13:07:02 2012
@@ -478,11 +478,11 @@ I. INTRODUCTION
is done: See section III for details.
- 10. Python 2.4 or newer (http://www.python.org/) (OPTIONAL)
+ 10. Python 2.5 or newer (http://www.python.org/) (OPTIONAL)
If you want to run "make check" or build from the latest source
under Unix as described in section II.B and III.D, install
- Python 2.4 or higher on your system. The majority of the test
+ Python 2.5 or higher on your system. The majority of the test
suite is written in Python, as is part of Subversion's build
system.
@@ -842,7 +842,7 @@ II. INSTALLATION
is compatible with VC6, which is the one from february 2003.
You can get it from MSDN:
http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
- * Python 2.4 or higher, downloaded from http://www.python.org/ which is
+ * Python 2.5 or higher, downloaded from http://www.python.org/ which is
used to generate the project files.
* Perl 5.8 or higher from http://www.activestate.com/
* Awk (from http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe) is
Modified: subversion/branches/multi-layer-moves/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/Makefile.in?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/Makefile.in (original)
+++ subversion/branches/multi-layer-moves/Makefile.in Wed Mar 14 13:07:02 2012
@@ -497,7 +497,7 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
$$flags \
'$(abs_srcdir)' '$(abs_builddir)' $(TESTS); \
else \
- echo "make check: Python 2.4 or greater is required,"; \
+ echo "make check: Python 2.5 or greater is required,"; \
echo " but was not detected during configure"; \
exit 1; \
fi;
Modified: subversion/branches/multi-layer-moves/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/autogen.sh?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/autogen.sh (original)
+++ subversion/branches/multi-layer-moves/autogen.sh Wed Mar 14 13:07:02 2012
@@ -120,11 +120,11 @@ fi
#
# Note: this dependency on Python is fine: only SVN developers use autogen.sh
# and we can state that dev people need Python on their machine. Note
-# that running gen-make.py requires Python 2.4 or newer.
+# that running gen-make.py requires Python 2.5 or newer.
PYTHON="`./build/find_python.sh`"
if test -z "$PYTHON"; then
- echo "Python 2.4 or later is required to run autogen.sh"
+ echo "Python 2.5 or later is required to run autogen.sh"
echo "If you have a suitable Python installed, but not on the"
echo "PATH, set the environment variable PYTHON to the full path"
echo "to the Python executable, and re-run autogen.sh"
Modified: subversion/branches/multi-layer-moves/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/ac-macros/apache.m4?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/ac-macros/apache.m4 (original)
+++ subversion/branches/multi-layer-moves/build/ac-macros/apache.m4 Wed Mar 14 13:07:02 2012
@@ -100,7 +100,7 @@ if test -n "$APXS" && test "$APXS" != "n
apache_minor_version_wanted_regex=["[1-4]"]
;;
2)
- apache_minor_version_wanted_regex=["[3-4]"]
+ apache_minor_version_wanted_regex=["[3-5]"]
;;
*)
AC_MSG_ERROR([unknown APR version])
Modified: subversion/branches/multi-layer-moves/build/find_python.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/find_python.sh?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/find_python.sh (original)
+++ subversion/branches/multi-layer-moves/build/find_python.sh Wed Mar 14 13:07:02 2012
@@ -23,7 +23,7 @@
# Required version of Python
# Python 2.0 = 0x2000000
# Python 2.4 = 0x2040000
-VERSION=${1:-0x2040000}
+VERSION=${1:-0x2050000}
for pypath in "$PYTHON" "$PYTHON2" "$PYTHON3" python python2 python3; do
if [ "x$pypath" != "x" ]; then
Modified: subversion/branches/multi-layer-moves/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/generator/gen_vcnet_vcproj.py?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/multi-layer-moves/build/generator/gen_vcnet_vcproj.py Wed Mar 14 13:07:02 2012
@@ -115,6 +115,7 @@ class Generator(gen_win.WinGeneratorBase
'instrument_apr_pools' : self.instrument_apr_pools,
'instrument_purify_quantify' : self.instrument_purify_quantify,
'version' : self.vcproj_version,
+ 'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
}
if self.vcproj_extension == '.vcproj':
Modified: subversion/branches/multi-layer-moves/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/generator/gen_win.py?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/generator/gen_win.py (original)
+++ subversion/branches/multi-layer-moves/build/generator/gen_win.py Wed Mar 14 13:07:02 2012
@@ -90,6 +90,7 @@ class GeneratorBase(gen_base.GeneratorBa
self.sqlite_path = 'sqlite-amalgamation'
self.skip_sections = { 'mod_dav_svn': None,
'mod_authz_svn': None,
+ 'mod_dontdothat' : None,
'libsvn_auth_kwallet': None,
'libsvn_auth_gnome_keyring': None }
@@ -126,6 +127,7 @@ class GeneratorBase(gen_base.GeneratorBa
self.httpd_path = val
del self.skip_sections['mod_dav_svn']
del self.skip_sections['mod_authz_svn']
+ del self.skip_sections['mod_dontdothat']
elif opt == '--with-libintl':
self.libintl_path = val
self.enable_nls = 1
@@ -186,6 +188,11 @@ class GeneratorBase(gen_base.GeneratorBa
self.sln_version = '11.00'
self.vcproj_version = '10.0'
self.vcproj_extension = '.vcxproj'
+ elif val == '11':
+ self.vs_version = '11'
+ self.sln_version = '12.00'
+ self.vcproj_version = '11.0'
+ self.vcproj_extension = '.vcxproj'
else:
print('WARNING: Unknown VS.NET version "%s",'
' assuming "%s"\n' % (val, '7.00'))
@@ -294,7 +301,7 @@ class WinGeneratorBase(GeneratorBase):
# Generate the build_zlib.bat file
if self.zlib_path:
- data = {'zlib_path': os.path.abspath(self.zlib_path),
+ data = {'zlib_path': os.path.relpath(self.zlib_path, self.projfilesdir),
'zlib_version': self.zlib_version,
'use_ml': self.have_ml and 1 or None}
bat = os.path.join(self.projfilesdir, 'build_zlib.bat')
@@ -334,7 +341,7 @@ class WinGeneratorBase(GeneratorBase):
def find_rootpath(self):
"Gets the root path as understand by the project system"
- return ".." + "\\.." * self.projfilesdir.count(os.sep) + "\\"
+ return os.path.relpath('.', self.projfilesdir) + "\\"
def makeguid(self, data):
"Generate a windows style GUID"
@@ -952,6 +959,8 @@ class WinGeneratorBase(GeneratorBase):
fakeincludes.append(self.apath(self.swig_libdir, 'perl5'))
else:
fakeincludes.append(self.swig_libdir)
+ if target.lang == "perl":
+ fakeincludes.extend(self.perl_includes)
if target.lang == "python":
fakeincludes.extend(self.python_includes)
if target.lang == "ruby":
@@ -1004,6 +1013,8 @@ class WinGeneratorBase(GeneratorBase):
if self.swig_libdir \
and (isinstance(target, gen_base.TargetSWIG)
or isinstance(target, gen_base.TargetSWIGLib)):
+ if target.lang == "perl" and self.perl_libdir:
+ fakelibdirs.append(self.perl_libdir)
if target.lang == "python" and self.python_libdir:
fakelibdirs.append(self.python_libdir)
if target.lang == "ruby" and self.ruby_libdir:
@@ -1141,16 +1152,20 @@ class WinGeneratorBase(GeneratorBase):
if not self.zlib_path:
return
zlib_path = os.path.abspath(self.zlib_path)
+ zlib_sources = map(lambda x : os.path.relpath(x, self.projfilesdir),
+ glob.glob(os.path.join(zlib_path, '*.c')) +
+ glob.glob(os.path.join(zlib_path,
+ 'contrib/masmx86/*.c')) +
+ glob.glob(os.path.join(zlib_path,
+ 'contrib/masmx86/*.asm')))
+ zlib_headers = map(lambda x : os.path.relpath(x, self.projfilesdir),
+ glob.glob(os.path.join(zlib_path, '*.h')))
+
self.move_proj_file(self.projfilesdir, name,
- (('zlib_path', zlib_path),
- ('zlib_sources',
- glob.glob(os.path.join(zlib_path, '*.c'))
- + glob.glob(os.path.join(zlib_path,
- 'contrib/masmx86/*.c'))
- + glob.glob(os.path.join(zlib_path,
- 'contrib/masmx86/*.asm'))),
- ('zlib_headers',
- glob.glob(os.path.join(zlib_path, '*.h'))),
+ (('zlib_path', os.path.relpath(zlib_path,
+ self.projfilesdir)),
+ ('zlib_sources', zlib_sources),
+ ('zlib_headers', zlib_headers),
('zlib_version', self.zlib_version),
('project_guid', self.makeguid('zlib')),
('use_ml', self.have_ml and 1 or None),
@@ -1161,19 +1176,22 @@ class WinGeneratorBase(GeneratorBase):
return
neon_path = os.path.abspath(self.neon_path)
+ neon_sources = map(lambda x : os.path.relpath(x, self.neon_path),
+ glob.glob(os.path.join(neon_path, 'src', '*.c')))
+ neon_headers = map(lambda x : os.path.relpath(x, self.neon_path),
+ glob.glob(os.path.join(neon_path, 'src', '*.h')))
+
self.move_proj_file(self.neon_path, name,
- (('neon_sources',
- glob.glob(os.path.join(neon_path, 'src', '*.c'))),
- ('neon_headers',
- glob.glob(os.path.join(neon_path, 'src', '*.h'))),
+ (('neon_sources', neon_sources),
+ ('neon_headers', neon_headers),
('expat_path',
- os.path.join(os.path.abspath(self.apr_util_path),
- 'xml', 'expat', 'lib')),
- ('zlib_path', self.zlib_path
- and os.path.abspath(self.zlib_path)),
- ('openssl_path',
- self.openssl_path
- and os.path.abspath(self.openssl_path)),
+ os.path.relpath(os.path.join(self.apr_util_path,
+ 'xml', 'expat', 'lib'),
+ self.neon_path)),
+ ('zlib_path', os.path.relpath(self.zlib_path,
+ self.neon_path)),
+ ('openssl_path', os.path.relpath(self.openssl_path,
+ self.neon_path)),
('project_guid', self.makeguid('neon')),
))
@@ -1182,29 +1200,31 @@ class WinGeneratorBase(GeneratorBase):
return
serf_path = os.path.abspath(self.serf_path)
+ serf_sources = map(lambda x : os.path.relpath(x, self.serf_path),
+ glob.glob(os.path.join(serf_path, '*.c'))
+ + glob.glob(os.path.join(serf_path, 'auth', '*.c'))
+ + glob.glob(os.path.join(serf_path, 'buckets',
+ '*.c')))
+ serf_headers = map(lambda x : os.path.relpath(x, self.serf_path),
+ glob.glob(os.path.join(serf_path, '*.h'))
+ + glob.glob(os.path.join(serf_path, 'auth', '*.h'))
+ + glob.glob(os.path.join(serf_path, 'buckets', '*.h')))
if self.serf_ver_maj != 0:
serflib = 'serf-%d.lib' % self.serf_ver_maj
else:
serflib = 'serf.lib'
self.move_proj_file(self.serf_path, name,
- (('serf_sources',
- glob.glob(os.path.join(serf_path, '*.c'))
- + glob.glob(os.path.join(serf_path, 'auth', '*.c'))
- + glob.glob(os.path.join(serf_path, 'buckets',
- '*.c'))),
- ('serf_headers',
- glob.glob(os.path.join(serf_path, '*.h'))
- + glob.glob(os.path.join(serf_path, 'auth', '*.h'))
- + glob.glob(os.path.join(serf_path, 'buckets',
- '*.h'))),
- ('zlib_path', self.zlib_path
- and os.path.abspath(self.zlib_path)),
- ('openssl_path',
- self.openssl_path
- and os.path.abspath(self.openssl_path)),
- ('apr_path', os.path.abspath(self.apr_path)),
- ('apr_util_path', os.path.abspath(self.apr_util_path)),
+ (('serf_sources', serf_sources),
+ ('serf_headers', serf_headers),
+ ('zlib_path', os.path.relpath(self.zlib_path,
+ self.serf_path)),
+ ('openssl_path', os.path.relpath(self.openssl_path,
+ self.serf_path)),
+ ('apr_path', os.path.relpath(self.apr_path,
+ self.serf_path)),
+ ('apr_util_path', os.path.relpath(self.apr_util_path,
+ self.serf_path)),
('project_guid', self.makeguid('serf')),
('apr_static', self.static_apr),
('serf_lib', serflib),
@@ -1219,7 +1239,8 @@ class WinGeneratorBase(GeneratorBase):
data = {
'version' : self.vcproj_version,
'configs' : self.configs,
- 'platforms' : self.platforms
+ 'platforms' : self.platforms,
+ 'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
}
for key, val in params:
data[key] = val
@@ -1232,13 +1253,15 @@ class WinGeneratorBase(GeneratorBase):
def _find_perl(self):
"Find the right perl library name to link swig bindings with"
+ self.perl_includes = []
+ self.perl_libdir = None
fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
'print "$Config{PERL_REVISION}$Config{PERL_VERSION}"'), 'r')
try:
- num = fp.readline()
- if num:
+ line = fp.readline()
+ if line:
msg = 'Found installed perl version number.'
- self.perl_lib = 'perl' + num.rstrip() + '.lib'
+ self.perl_lib = 'perl' + line.rstrip() + '.lib'
else:
msg = 'Could not detect perl version.'
self.perl_lib = 'perl56.lib'
@@ -1247,6 +1270,16 @@ class WinGeneratorBase(GeneratorBase):
finally:
fp.close()
+ fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
+ 'print $Config{archlib}'), 'r')
+ try:
+ line = fp.readline()
+ if line:
+ self.perl_libdir = os.path.join(line, 'CORE')
+ self.perl_includes = [os.path.join(line, 'CORE')]
+ finally:
+ fp.close()
+
def _find_ruby(self):
"Find the right Ruby library name to link swig bindings with"
self.ruby_includes = []
Modified: subversion/branches/multi-layer-moves/build/generator/templates/neon.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/generator/templates/neon.vcxproj.ezt?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/generator/templates/neon.vcxproj.ezt (original)
+++ subversion/branches/multi-layer-moves/build/generator/templates/neon.vcxproj.ezt Wed Mar 14 13:07:02 2012
@@ -33,7 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/multi-layer-moves/build/generator/templates/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/generator/templates/serf.vcxproj.ezt?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/generator/templates/serf.vcxproj.ezt (original)
+++ subversion/branches/multi-layer-moves/build/generator/templates/serf.vcxproj.ezt Wed Mar 14 13:07:02 2012
@@ -34,7 +34,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/multi-layer-moves/build/generator/templates/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/generator/templates/svn_config.vcxproj.ezt?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/branches/multi-layer-moves/build/generator/templates/svn_config.vcxproj.ezt Wed Mar 14 13:07:02 2012
@@ -33,6 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/multi-layer-moves/build/generator/templates/svn_locale.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/generator/templates/svn_locale.vcxproj.ezt?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/generator/templates/svn_locale.vcxproj.ezt (original)
+++ subversion/branches/multi-layer-moves/build/generator/templates/svn_locale.vcxproj.ezt Wed Mar 14 13:07:02 2012
@@ -34,6 +34,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CLRSupport>false</CLRSupport>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/multi-layer-moves/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/generator/templates/vcnet_vcxproj.ezt?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/multi-layer-moves/build/generator/templates/vcnet_vcxproj.ezt Wed Mar 14 13:07:02 2012
@@ -33,6 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'" Label="Configuration">
<ConfigurationType>[config_type]</ConfigurationType>
<UseDebugLibraries>[is configs.name "Debug"]true[else]false[end]</UseDebugLibraries>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/multi-layer-moves/build/generator/templates/zlib.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/generator/templates/zlib.vcxproj.ezt?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/generator/templates/zlib.vcxproj.ezt (original)
+++ subversion/branches/multi-layer-moves/build/generator/templates/zlib.vcxproj.ezt Wed Mar 14 13:07:02 2012
@@ -33,7 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/multi-layer-moves/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/win32/make_dist.py?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/win32/make_dist.py (original)
+++ subversion/branches/multi-layer-moves/build/win32/make_dist.py Wed Mar 14 13:07:02 2012
@@ -209,6 +209,8 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(blddir)s/svnserve/svnserve.pdb'),
File('%(blddir)s/svnversion/svnversion.exe'),
File('%(blddir)s/svnversion/svnversion.pdb'),
+ File('%(blddir)s/svnrdump/svnrdump.exe'),
+ File('%(blddir)s/svnrdump/svnrdump.pdb'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'),
File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.exe'),
Modified: subversion/branches/multi-layer-moves/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/build/win32/vc6-build.bat.in?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/build/win32/vc6-build.bat.in (original)
+++ subversion/branches/multi-layer-moves/build/win32/vc6-build.bat.in Wed Mar 14 13:07:02 2012
@@ -136,6 +136,7 @@ copy src-%DIR%\Release\subversion\svndum
copy src-%DIR%\Release\subversion\svnlook\svnlook.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin
+copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so svn-win32-%VER%\httpd
copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so svn-win32-%VER%\httpd
copy svn-win32-%VER%\bin\intl.dll "%APACHEDIR%\bin"
Modified: subversion/branches/multi-layer-moves/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/configure.ac?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/configure.ac (original)
+++ subversion/branches/multi-layer-moves/configure.ac Wed Mar 14 13:07:02 2012
@@ -1134,7 +1134,7 @@ AS_HELP_STRING([--enable-gprof],
PYTHON="`$abs_srcdir/build/find_python.sh`"
if test -z "$PYTHON"; then
- AC_MSG_WARN([Python 2.4 or later is required to run the testsuite])
+ AC_MSG_WARN([Python 2.5 or later is required to run the testsuite])
AC_MSG_WARN([or to use the Subversion Python bindings])
AC_MSG_WARN([])
AC_MSG_WARN([If you have a suitable Python installed, but not on the])
Modified: subversion/branches/multi-layer-moves/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/get-deps.sh?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/get-deps.sh (original)
+++ subversion/branches/multi-layer-moves/get-deps.sh Wed Mar 14 13:07:02 2012
@@ -23,15 +23,15 @@
# get-deps.sh -- download the dependencies useful for building Subversion
#
-APR=apr-1.4.5
-APR_UTIL=apr-util-1.3.12
+APR=apr-1.4.6
+APR_UTIL=apr-util-1.4.1
NEON=neon-0.29.6
-SERF=serf-0.7.2
-ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.7.8
+SERF=serf-1.0.1
+ZLIB=zlib-1.2.6
+SQLITE_VERSION=3.7.10
SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
-HTTPD=httpd-2.2.21
+HTTPD=httpd-2.2.22
APR_ICONV=apr-iconv-1.2.1
BASEDIR=`pwd`
Modified: subversion/branches/multi-layer-moves/notes/subversion-design.html
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/notes/subversion-design.html?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/notes/subversion-design.html (original)
+++ subversion/branches/multi-layer-moves/notes/subversion-design.html Wed Mar 14 13:07:02 2012
@@ -2340,7 +2340,10 @@ write/Makefile:6
<p>Once you've done this, read Jim Blandy's own structural overview,
which explains how nodes and revisions are organized (among other
things) in the filesystem implementation:
- <tt class="filename">subversion/libsvn_fs/structure</tt>.</p>
+ <tt class="filename">subversion/libsvn_fs_base/notes/structure</tt>.
+ (Some details in that document are specific to the BDB-based
+ filesystem implementation. Details specific to FSFS are recorded in
+ <tt class="filename">subversion/libsvn_fs_fs/structure</tt>.)</p>
<p>Finally, read the well-documented API in
<tt class="filename">subversion/include/svn_fs.h</tt>.</p>
Modified: subversion/branches/multi-layer-moves/subversion/bindings/javahl/README
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/javahl/README?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/javahl/README (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/javahl/README Wed Mar 14 13:07:02 2012
@@ -5,7 +5,7 @@ JavaHL provides a (mostly native, using
a high level Java API for Subversion, which was originally targeted for
implementors of GUI clients and IDE plug-ins for Subversion. JavaHL
currently provides a minimal-but-complete set of APIs which expose the
-core Subversion C API to Java. It requires a JRE 1.2+ (runtime).
+core Subversion C API to Java. It requires a JRE 1.5+ (runtime).
It is currently quite mature, and can be considered for production use.
@@ -14,7 +14,7 @@ Build system
------------
JavaHL should compile and run under Linux, Win32, and Mac OS X with a
-JDK 1.3+.
+JDK 1.5+.
Its build will produce both a native library (libsvnjavahl-1.so on Unix
or libsvnjavahl-1.dll on Win32) and a platform independent archive of
@@ -62,9 +62,6 @@ Success stories
Subclipse, Eclipse IDE plug-in <http://subclipse.tigris.org/>
-Svn-Up, Swing GUI and plug-in for the IDEA IDE
-<http://svnup.tigris.org/>
-
Why not 100% pure Java?
-----------------------
Modified: subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/ClientContext.cpp?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/ClientContext.cpp Wed Mar 14 13:07:02 2012
@@ -111,7 +111,7 @@ ClientContext::~ClientContext()
/* Helper function to make sure that we don't keep dangling pointers in ctx.
Note that this function might be called multiple times if getContext()
is called on the same pool.
-
+
The use of this function assumes a proper subpool behavior by its user,
(read: SVNClient) usually per request.
*/
Modified: subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/File.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/File.cpp?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/File.cpp (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/javahl/native/File.cpp Wed Mar 14 13:07:02 2012
@@ -82,7 +82,7 @@ const char *File::getAbsPath()
/* We don't remove the local ref for jabsolutePath here, because
JNIStringHolder expects that ref to be valid for the life of
the object, which in this case is allocated on the stack.
-
+
So we just "leak" the reference, and it will get cleaned up when
we eventually exit back to Java-land. */
env->DeleteLocalRef(clazz);
Modified: subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Wed Mar 14 13:07:02 2012
@@ -148,10 +148,10 @@ public class BasicTests extends SVNTests
CommitItemStateFlags.Add);
Set<String> urls = new HashSet<String>(1);
urls.add(thisTest.getUrl() + "/Y");
- try
+ try
{
tempclient.mkdir(urls, false, null, new ConstMsg("log_msg"), null);
- }
+ }
catch(JNIError e)
{
return; // Test passes!
@@ -3142,12 +3142,12 @@ public class BasicTests extends SVNTests
// check the status of the working copy
thisTest.checkStatus();
-
+
// now edit the propval directly in the repository
long baseRev = 2L;
client.propertySetRemote(thisTest.getUrl()+"/A/D/G/rho", baseRev, PROP, NEWVALUE,
new ConstMsg("edit prop"), false, null, null);
-
+
// update the WC and verify that the property was changed
client.update(thisTest.getWCPathSet(), Revision.HEAD, Depth.infinity, false, false,
false, false);
Modified: subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Wed Mar 14 13:07:02 2012
@@ -520,7 +520,7 @@ public class WC
item.reposLastCmtAuthor,
status.getReposLastCmtAuthor());
Assert.assertNotNull("URL for path " + item.myPath
- + " should not be null",
+ + " should not be null",
status.getUrl());
}
}
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/INSTALL?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/INSTALL (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/INSTALL Wed Mar 14 13:07:02 2012
@@ -80,7 +80,7 @@ Step 1: Install a suitable version of S
--with-python=/path/to/correct/python/binary
- to the configure script. You need Python 2.4 or above.
+ to the configure script. You need Python 2.5 or above.
If you plan to build the Perl bindings, and have a system
with more than one version of perl installed, you may need
@@ -109,7 +109,7 @@ Step 2: Build and Install Subversion.
python executable you used to configure SWIG as above. If it does not then
you can specify the correct path by adding PYTHON=/path/to/python or
PERL=/path/to/perl onto the command line for configure. For example:
- ./configure PYTHON=/usr/bin/python2.4 PERL=/usr/bin/perl5.8.0
+ ./configure PYTHON=/usr/bin/python2.5 PERL=/usr/bin/perl5.8.0
If Subversion's ./configure finds a SWIG that it's happy with, then
it will build special glue libraries to link svn to the swig bindings:
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_containers.swg
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_containers.swg?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_containers.swg (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_containers.swg Wed Mar 14 13:07:02 2012
@@ -482,6 +482,16 @@
svn_wc_parse_externals_description3()
*/
+#ifdef SWIGPYTHON
+%typemap(argout) apr_array_header_t **externals_p {
+ %append_output
+ (svn_swig_py_pointerlist_to_list(*$1, $descriptor(svn_wc_external_item2_t *),
+ _global_py_pool));
+ if (PyErr_Occurred()) {
+ SWIG_fail;
+ }
+}
+#endif
#ifdef SWIGRUBY
%typemap(argout) apr_array_header_t **externals_p {
%append_output(svn_swig_rb_apr_array_to_array_external_item2(*$1));
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_types.swg
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_types.swg?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_types.swg (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/include/svn_types.swg Wed Mar 14 13:07:02 2012
@@ -101,6 +101,8 @@
svn_auth_provider_object_t **,
svn_config_t **,
svn_diff_t **,
+ svn_patch_file_t **,
+ svn_patch_t **,
void **credentials,
void **iter_baton,
void **token,
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Base.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Client.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Core.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Delta.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Fs.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Ra.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Repos.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/Wc.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/0use.t
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/1repos.t
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/2fs.t
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/3client.t
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/3client.t?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/3client.t (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/3client.t Wed Mar 14 13:07:02 2012
@@ -20,7 +20,7 @@
#
#
-use Test::More tests => 120;
+use Test::More tests => 121;
use strict;
# shut up about variables that are only used once.
@@ -46,6 +46,11 @@ my $reposurl = 'file://' . (substr($repo
my $wcpath = catdir($testpath,'wc');
my $importpath = catdir($testpath,'import');
+# Use internal style paths on Windows
+$reposurl =~ s/\\/\//g;
+$wcpath =~ s/\\/\//g;
+$importpath =~ s/\\/\//g;
+
# track current rev ourselves to test against
my $current_rev = 0;
@@ -53,7 +58,7 @@ my $current_rev = 0;
$SVN::Error::handler = undef;
# Get username we are running as
-my $username = getpwuid($>);
+my $username = getlogin() || getpwuid($>);
# This is ugly to create the test repo with SVN::Repos, but
# it seems to be the most reliable way.
@@ -86,36 +91,32 @@ my ($rpgval,$rpgrev) = $ctx->revprop_get
is($rpgval,$username,'svn:author set to expected username from revprop_get');
is($rpgrev,$current_rev,'Returned revnum of current rev from revprop_get');
-SKIP: {
- skip 'Difficult to test on Win32', 3 if $^O eq 'MSWin32';
-
+if ($^O eq 'MSWin32') {
+ ok(open(NEW, ">$repospath/hooks/pre-revprop-change.bat"),
+ 'Open pre-revprop-change hook for writing');
+ ok(print(NEW 'exit 0'), 'Print to hook');
+ ok(close(NEW), 'Close hook');
+} else {
ok(rename("$repospath/hooks/pre-revprop-change.tmpl",
"$repospath/hooks/pre-revprop-change"),
'Rename pre-revprop-change hook');
ok(chmod(0700,"$repospath/hooks/pre-revprop-change"),
'Change permissions on pre-revprop-change hook');
-
- my ($rps_rev) = $ctx->revprop_set('svn:log','mkdir dir1',
- $reposurl, $current_rev, 0);
- is($rps_rev,$current_rev,
- 'Returned revnum of current rev from revprop_set');
-
+ is(1, 1, '-')
}
+my ($rps_rev) = $ctx->revprop_set('svn:log','mkdir dir1',
+ $reposurl, $current_rev, 0);
+is($rps_rev,$current_rev,
+ 'Returned revnum of current rev from revprop_set');
my ($rph, $rplrev) = $ctx->revprop_list($reposurl,$current_rev);
isa_ok($rph,'HASH','Returned hash reference form revprop_list');
is($rplrev,$current_rev,'Returned current rev from revprop_list');
is($rph->{'svn:author'},$username,
'svn:author is expected user from revprop_list');
-if ($^O eq 'MSWin32') {
- # we skip the log change test on win32 so we have to test
- # for a different var here
- is($rph->{'svn:log'},'Make dir1',
- 'svn:log is expected value from revprop_list');
-} else {
- is($rph->{'svn:log'},'mkdir dir1',
- 'svn:log is expected value from revprop_list');
-}
+is($rph->{'svn:log'},'mkdir dir1',
+ 'svn:log is expected value from revprop_list');
+
ok($rph->{'svn:date'},'svn:date is set from revprop_list');
is($ctx->checkout($reposurl,$wcpath,'HEAD',1),$current_rev,
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/3client.t
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/4pool.t
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/5delta-compat.t
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/multi-layer-moves/subversion/bindings/swig/perl/native/t/5delta.t
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/python/svn/repos.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/python/svn/repos.py?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/python/svn/repos.py (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/python/svn/repos.py Wed Mar 14 13:07:02 2012
@@ -88,7 +88,7 @@ class ChangeCollector(_svndelta.Editor):
At this time, two ChangedPath objects will be passed for a path that had
been replaced in the revision/transaction. This may change in the future.
-
+
### Can't we deduce FS_PTR from ROOT?
### POOL is unused
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/repository.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/repository.py?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/repository.py (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/repository.py Wed Mar 14 13:07:02 2012
@@ -170,9 +170,11 @@ class SubversionRepositoryTestCase(unitt
repos.dir_delta(prev_root, '', '', this_root, '', e_ptr, e_baton,
_authz_callback, 1, 1, 0, 0)
- # Check results
- self.assertEqual(editor.textdeltas[0].new_data, "This is a test.\n")
- self.assertEqual(editor.textdeltas[1].new_data, "A test.\n")
+ # Check results.
+ # Ignore the order in which the editor delivers the two sibling files.
+ self.assertEqual(set([editor.textdeltas[0].new_data,
+ editor.textdeltas[1].new_data]),
+ set(["This is a test.\n", "A test.\n"]))
self.assertEqual(len(editor.textdeltas), 2)
def test_retrieve_and_change_rev_prop(self):
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py Wed Mar 14 13:07:02 2012
@@ -264,30 +264,50 @@ class SubversionRepositoryTestCase(unitt
def test_diff_dir_different_revs(self):
diffs = self.repos.get_deltas('trunk', 4, 'trunk', 8)
- self._cmp_diff((None, ('trunk/dir1/dir2', 8),
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
- self._cmp_diff((None, ('trunk/dir1/dir3', 8),
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
- self._cmp_diff((None, ('trunk/README2.txt', 6),
- (Node.FILE, Changeset.ADD)), diffs.next())
- self._cmp_diff((('trunk/dir2', 4), None,
- (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
- self._cmp_diff((('trunk/dir3', 4), None,
- (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
+ expected = [
+ (None, ('trunk/README2.txt', 6),
+ (Node.FILE, Changeset.ADD)),
+ (None, ('trunk/dir1/dir2', 8),
+ (Node.DIRECTORY, Changeset.ADD)),
+ (None, ('trunk/dir1/dir3', 8),
+ (Node.DIRECTORY, Changeset.ADD)),
+ (('trunk/dir2', 4), None,
+ (Node.DIRECTORY, Changeset.DELETE)),
+ (('trunk/dir3', 4), None,
+ (Node.DIRECTORY, Changeset.DELETE)),
+ ]
+ actual = [diffs.next() for i in range(5)]
+ actual = sorted(actual,
+ key=lambda diff: ((diff[0] or diff[1]).path,
+ (diff[0] or diff[1]).rev))
+ self.assertEqual(len(expected), len(actual))
+ for e,a in zip(expected, actual):
+ self._cmp_diff(e,a)
self.assertRaises(StopIteration, diffs.next)
def test_diff_dir_different_dirs(self):
diffs = self.repos.get_deltas('trunk', 1, 'branches/v1x', 12)
- self._cmp_diff((None, ('branches/v1x/dir1', 12),
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
- self._cmp_diff((None, ('branches/v1x/dir1/dir2', 12),
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
- self._cmp_diff((None, ('branches/v1x/dir1/dir3', 12),
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
- self._cmp_diff((None, ('branches/v1x/README.txt', 12),
- (Node.FILE, Changeset.ADD)), diffs.next())
- self._cmp_diff((None, ('branches/v1x/README2.txt', 12),
- (Node.FILE, Changeset.ADD)), diffs.next())
+ expected = [
+ (None, ('branches/v1x/README.txt', 12),
+ (Node.FILE, Changeset.ADD)),
+ (None, ('branches/v1x/README2.txt', 12),
+ (Node.FILE, Changeset.ADD)),
+ (None, ('branches/v1x/dir1', 12),
+ (Node.DIRECTORY, Changeset.ADD)),
+ (None, ('branches/v1x/dir1/dir2', 12),
+ (Node.DIRECTORY, Changeset.ADD)),
+ (None, ('branches/v1x/dir1/dir3', 12),
+ (Node.DIRECTORY, Changeset.ADD)),
+ ]
+ actual = [diffs.next() for i in range(5)]
+ actual = sorted(actual, key=lambda diff: (diff[1].path, diff[1].rev))
+ # for e,a in zip(expected, actual):
+ # t.write("%r\n" % (e,))
+ # t.write("%r\n" % ((None, (a[1].path, a[1].rev), (a[2], a[3])),) )
+ # t.write('\n')
+ self.assertEqual(len(expected), len(actual))
+ for e,a in zip(expected, actual):
+ self._cmp_diff(e,a)
self.assertRaises(StopIteration, diffs.next)
def test_diff_dir_no_change(self):
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/wc.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/wc.py?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/wc.py (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/python/tests/wc.py Wed Mar 14 13:07:02 2012
@@ -216,8 +216,9 @@ class SubversionWorkingCopyTestCase(unit
def test_entries_read(self):
entries = wc.entries_read(self.wc, True)
-
- self.assertEqual(['', 'tags', 'branches', 'trunk'], list(entries.keys()))
+ keys = list(entries.keys())
+ keys.sort()
+ self.assertEqual(['', 'branches', 'tags', 'trunk'], keys)
def test_get_ignores(self):
self.assert_(isinstance(wc.get_ignores(None, self.wc), list))
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/test_repos.rb
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/test_repos.rb?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/test_repos.rb (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/test_repos.rb Wed Mar 14 13:07:02 2012
@@ -94,7 +94,7 @@ class SvnReposTest < Test::Unit::TestCas
end
def test_create
- tmp_repos_path = File.join(@tmp_path, "repos")
+ tmp_repos_path = File.join(@tmp_path, "repos2")
fs_type = Svn::Fs::TYPE_FSFS
fs_config = {Svn::Fs::CONFIG_FS_TYPE => fs_type}
repos = nil
Modified: subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/util.rb
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/util.rb?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/util.rb (original)
+++ subversion/branches/multi-layer-moves/subversion/bindings/swig/ruby/test/util.rb Wed Mar 14 13:07:02 2012
@@ -37,15 +37,17 @@ module SvnTestUtil
@author = ENV["USER"] || "sample-user"
@password = "sample-password"
@realm = "sample realm"
- @repos_path = "repos"
- @full_repos_path = File.expand_path(@repos_path)
- @repos_uri = "file://#{@full_repos_path.sub(/^\/?/, '/')}"
+
@svnserve_host = "127.0.0.1"
@svnserve_ports = (64152..64282).collect{|x| x.to_s}
- @wc_base_dir = File.join(Dir.tmpdir, "wc-tmp")
- @wc_path = File.join(@wc_base_dir, "wc")
+
+ @tmp_path = Dir.mktmpdir
+ @wc_path = File.join(@tmp_path, "wc")
@full_wc_path = File.expand_path(@wc_path)
- @tmp_path = "tmp"
+ @repos_path = File.join(@tmp_path, "repos")
+ @full_repos_path = File.expand_path(@repos_path)
+ @repos_uri = "file://#{@full_repos_path.sub(/^\/?/, '/')}"
+
@config_path = "config"
@greek = Greek.new(@tmp_path, @wc_path, @repos_uri)
end
@@ -140,7 +142,7 @@ module SvnTestUtil
end
def teardown_wc
- remove_recursively_with_retry(@wc_base_dir)
+ remove_recursively_with_retry(@wc_path)
end
def setup_config
Modified: subversion/branches/multi-layer-moves/subversion/include/private/svn_cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/include/private/svn_cache.h?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/include/private/svn_cache.h (original)
+++ subversion/branches/multi-layer-moves/subversion/include/private/svn_cache.h Wed Mar 14 13:07:02 2012
@@ -296,7 +296,7 @@ svn_cache__membuffer_cache_create(svn_me
* assumed to be an svn_stringbuf_t.
*
* If @a thread_safe is true, and APR is compiled with threads, all
- * accesses to the cache will be protected with a mutex, if the shared
+ * accesses to the cache will be protected with a mutex, if the shared
* @a memcache has also been created with thread_safe flag set.
*
* These caches do not support svn_cache__iter.
Modified: subversion/branches/multi-layer-moves/subversion/include/private/svn_cmdline_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/include/private/svn_cmdline_private.h?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/include/private/svn_cmdline_private.h (original)
+++ subversion/branches/multi-layer-moves/subversion/include/private/svn_cmdline_private.h Wed Mar 14 13:07:02 2012
@@ -92,7 +92,7 @@ svn_cmdline__parse_config_option(apr_arr
apr_pool_t *pool);
/** Sets the config options in @a config_options, an apr array containing
- * svn_cmdline__config_argument_t* elements to the configuration in @a cfg,
+ * @c svn_cmdline__config_argument_t* elements, to the configuration in @a cfg,
* a hash mapping of <tt>const char *</tt> configuration file names to
* @c svn_config_t *'s. Write warnings to stderr.
*
Modified: subversion/branches/multi-layer-moves/subversion/include/private/svn_mergeinfo_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/include/private/svn_mergeinfo_private.h?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/include/private/svn_mergeinfo_private.h (original)
+++ subversion/branches/multi-layer-moves/subversion/include/private/svn_mergeinfo_private.h Wed Mar 14 13:07:02 2012
@@ -99,9 +99,10 @@ svn_mergeinfo__remove_empty_rangelists(s
/* Make a shallow (ie, mergeinfos are not duped, or altered at all;
keys share storage) copy of IN_CATALOG in *OUT_CATALOG, removing
- PREFIX_PATH (which is an absolute path) from the beginning of each
- key in the catalog (each of which is also an absolute path). It is
- illegal for any key to not start with PREFIX_PATH. The new hash
+ PREFIX_PATH from the beginning of each key in the catalog.
+ PREFIX_PATH and the keys of IN_CATALOG are absolute 'fspaths',
+ starting with '/'. It is illegal for any key to not start with
+ PREFIX_PATH. The keys of *OUT_CATALOG are relpaths. The new hash
and temporary values are allocated in POOL. (This is useful for
making the return value from svn_ra_get_mergeinfo relative to the
session root, say.) */
Modified: subversion/branches/multi-layer-moves/subversion/include/private/svn_mutex.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/include/private/svn_mutex.h?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/include/private/svn_mutex.h (original)
+++ subversion/branches/multi-layer-moves/subversion/include/private/svn_mutex.h Wed Mar 14 13:07:02 2012
@@ -59,7 +59,7 @@ typedef void svn_mutex__t;
* actually be created with a lifetime defined by @a result_pool. Otherwise,
* the pointer will be set to @c NULL and @ref svn_mutex__lock as well as
* @ref svn_mutex__unlock will be no-ops.
- *
+ *
* If threading is not supported by APR, this function is a no-op.
*/
svn_error_t *
@@ -68,9 +68,9 @@ svn_mutex__init(svn_mutex__t **mutex,
apr_pool_t *result_pool);
/** Acquire the @a mutex, if that has been enabled in @ref svn_mutex__init.
- * Make sure to call @ref svn_mutex__unlock some time later in the same
+ * Make sure to call @ref svn_mutex__unlock some time later in the same
* thread to release the mutex again. Recursive locking are not supported.
- *
+ *
* @note You should use @ref SVN_MUTEX__WITH_LOCK instead of explicit lock
* aquisition and release.
*/
@@ -79,14 +79,14 @@ svn_mutex__lock(svn_mutex__t *mutex);
/** Release the @a mutex, previously acquired using @ref svn_mutex__lock
* that has been enabled in @ref svn_mutex__init.
- *
- * Since this is often used as part of the calling function's exit
- * sequence, we accept that function's current return code in @a err.
+ *
+ * Since this is often used as part of the calling function's exit
+ * sequence, we accept that function's current return code in @a err.
* If it is not @ref SVN_NO_ERROR, it will be used as the return value -
* irrespective of the possible internal failures during unlock. If @a err
- * is @ref SVN_NO_ERROR, internal failures of this function will be
+ * is @ref SVN_NO_ERROR, internal failures of this function will be
* reported in the return value.
- *
+ *
* @note You should use @ref SVN_MUTEX__WITH_LOCK instead of explicit lock
* aquisition and release.
*/
@@ -99,7 +99,7 @@ svn_mutex__unlock(svn_mutex__t *mutex,
* this macro will return an @ref svn_error_t. This macro guarantees that
* the @a mutex will always be unlocked again if it got locked successfully
* locked by the first step.
- *
+ *
* @note Prefer using this macro instead of explicit lock aquisition and
* release.
*/
Modified: subversion/branches/multi-layer-moves/subversion/include/private/svn_ra_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/include/private/svn_ra_private.h?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/include/private/svn_ra_private.h (original)
+++ subversion/branches/multi-layer-moves/subversion/include/private/svn_ra_private.h Wed Mar 14 13:07:02 2012
@@ -31,6 +31,7 @@
#include "svn_error.h"
#include "svn_ra.h"
+#include "svn_delta.h"
#ifdef __cplusplus
extern "C" {
@@ -126,6 +127,11 @@ svn_ra__get_fspath_relative_to_root(svn_
const char *url,
apr_pool_t *pool);
+/** Register CALLBACKS to be used with the Ev2 shims in RA_SESSION. */
+svn_error_t *
+svn_ra__register_editor_shim_callbacks(svn_ra_session_t *ra_session,
+ svn_delta_shim_callbacks_t *callbacks);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/branches/multi-layer-moves/subversion/include/private/svn_repos_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/include/private/svn_repos_private.h?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/include/private/svn_repos_private.h (original)
+++ subversion/branches/multi-layer-moves/subversion/include/private/svn_repos_private.h Wed Mar 14 13:07:02 2012
@@ -51,7 +51,7 @@ extern "C" {
* repository via tools that use the svn_fs_* API directly (possibly
* including svnadmin and svnlook). This has happened before and there
* are known (documented, but unsupported) upgrade paths in some cases.
- *
+ *
* @since New in 1.7.
*/
svn_error_t *
Modified: subversion/branches/multi-layer-moves/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/include/private/svn_wc_private.h?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/multi-layer-moves/subversion/include/private/svn_wc_private.h Wed Mar 14 13:07:02 2012
@@ -263,6 +263,15 @@ svn_wc__externals_gather_definitions(apr
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* Close the DB for LOCAL_ABSPATH. Perform temporary allocations in
+ SCRATCH_POOL.
+
+ Wraps svn_wc__db_drop_root(). */
+svn_error_t *
+svn_wc__close_db(const char *external_abspath,
+ svn_wc_context_t *wc_ctx,
+ apr_pool_t *scratch_pool);
+
/** Set @a *tree_conflict to a newly allocated @c
* svn_wc_conflict_description_t structure describing the tree
* conflict state of @a victim_abspath, or to @c NULL if @a victim_abspath
@@ -540,7 +549,7 @@ svn_wc__node_is_status_deleted(svn_boole
* set @a *deleted_ancestor_abspath to @c NULL.
* @a *deleted_ancestor_abspath is allocated in @a result_pool.
* Use @a scratch_pool for all temporary allocations.
- */
+ */
svn_error_t *
svn_wc__node_get_deleted_ancestor(const char **deleted_ancestor_abspath,
svn_wc_context_t *wc_ctx,
Modified: subversion/branches/multi-layer-moves/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/include/svn_client.h?rev=1300532&r1=1300531&r2=1300532&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/include/svn_client.h (original)
+++ subversion/branches/multi-layer-moves/subversion/include/svn_client.h Wed Mar 14 13:07:02 2012
@@ -2255,7 +2255,7 @@ typedef struct svn_client_status_t
* This will be NULL for moved-here nodes that are just part of a subtree
* that was moved along (and are not themselves a root of a different move
* operation).
- *
+ *
* @since New in 1.8. */
const char *moved_from_abspath;