kfogel@tigris.org wrote:
> Author: kfogel
> Date: Wed Mar 21 19:20:47 2007
> New Revision: 23994
>
> Log:
> Merge the sparse-directories branch to trunk.
>
> See notes/sparse-directories.txt for work remaining. Special thanks
> to dlr, lundblad, and malcolm for their help in getting the branch to
> mergeability.
>
>
> Removed:
> trunk/notes/incomplete-directories.txt
> Modified:
> trunk/ (props changed)
> trunk/build.conf
> trunk/subversion/bindings/java/javahl/native/SVNClient.cpp
> trunk/subversion/include/svn_client.h
> trunk/subversion/include/svn_ra.h
> trunk/subversion/include/svn_repos.h
> trunk/subversion/include/svn_types.h
> trunk/subversion/include/svn_wc.h
> trunk/subversion/libsvn_client/checkout.c
> trunk/subversion/libsvn_client/client.h
> trunk/subversion/libsvn_client/copy.c
> trunk/subversion/libsvn_client/delete.c
> trunk/subversion/libsvn_client/diff.c
> trunk/subversion/libsvn_client/export.c
> trunk/subversion/libsvn_client/externals.c
> trunk/subversion/libsvn_client/info.c
> trunk/subversion/libsvn_client/repos_diff.c
> trunk/subversion/libsvn_client/status.c
> trunk/subversion/libsvn_client/switch.c
> trunk/subversion/libsvn_client/update.c
> trunk/subversion/libsvn_ra/ra_loader.c
> trunk/subversion/libsvn_ra/ra_loader.h
> trunk/subversion/libsvn_ra/wrapper_template.h
> trunk/subversion/libsvn_ra_dav/fetch.c
> trunk/subversion/libsvn_ra_dav/ra_dav.h
> trunk/subversion/libsvn_ra_local/ra_plugin.c
> trunk/subversion/libsvn_ra_serf/ra_serf.h
> trunk/subversion/libsvn_ra_serf/update.c
> trunk/subversion/libsvn_ra_svn/client.c
> trunk/subversion/libsvn_ra_svn/protocol
> trunk/subversion/libsvn_repos/delta.c
> trunk/subversion/libsvn_repos/dump.c
> trunk/subversion/libsvn_repos/reporter.c
> trunk/subversion/libsvn_subr/kitchensink.c
> trunk/subversion/libsvn_wc/README
> trunk/subversion/libsvn_wc/adm_crawler.c
> trunk/subversion/libsvn_wc/adm_files.c
> trunk/subversion/libsvn_wc/adm_ops.c
> trunk/subversion/libsvn_wc/adm_ops.h
> trunk/subversion/libsvn_wc/diff.c
> trunk/subversion/libsvn_wc/entries.c
> trunk/subversion/libsvn_wc/entries.h
> trunk/subversion/libsvn_wc/update_editor.c
> trunk/subversion/mod_dav_svn/authz.c
> trunk/subversion/mod_dav_svn/reports/update.c
> trunk/subversion/svn/add-cmd.c
> trunk/subversion/svn/checkout-cmd.c
> trunk/subversion/svn/cl.h
> trunk/subversion/svn/commit-cmd.c
> trunk/subversion/svn/diff-cmd.c
> trunk/subversion/svn/export-cmd.c
> trunk/subversion/svn/import-cmd.c
> trunk/subversion/svn/info-cmd.c
> trunk/subversion/svn/list-cmd.c
> trunk/subversion/svn/main.c
> trunk/subversion/svn/merge-cmd.c
> trunk/subversion/svn/propdel-cmd.c
> trunk/subversion/svn/propget-cmd.c
> trunk/subversion/svn/proplist-cmd.c
> trunk/subversion/svn/propset-cmd.c
> trunk/subversion/svn/resolved-cmd.c
> trunk/subversion/svn/revert-cmd.c
> trunk/subversion/svn/schema/info.rnc
> trunk/subversion/svn/status-cmd.c
> trunk/subversion/svn/switch-cmd.c
> trunk/subversion/svn/update-cmd.c
> trunk/subversion/svnserve/serve.c
> trunk/subversion/tests/cmdline/checkout_tests.py
> trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
> trunk/subversion/tests/libsvn_repos/repos-test.c
>
> Modified: trunk/build.conf
> URL: http://svn.collab.net/viewvc/svn/trunk/build.conf?pathrev=23994&r1=23993&r2=23994
> ==============================================================================
> --- trunk/build.conf (original)
> +++ trunk/build.conf Wed Mar 21 19:20:47 2007
> @@ -89,6 +89,7 @@
> subversion/tests/cmdline/import_tests.py
> subversion/tests/cmdline/svnsync_tests.py
> subversion/tests/cmdline/authz_tests.py
> + subversion/tests/cmdline/depth_tests.py
>
> bdb-test-scripts =
>
>
>
This merge fails to take 'depth_tests.py' from the sparse-directories
branch.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 22 08:08:10 2007