kfogel@tigris.org wrote:
> Author: kfogel
> Date: Mon Aug 21 22:51:04 2006
> New Revision: 21172
>
> Added:
> branches/incomplete-directories/subversion/libsvn_ra_svn/ra_svn_sasl.h
> - copied unchanged from r21171, /trunk/subversion/libsvn_ra_svn/ra_svn_sasl.h
> branches/incomplete-directories/subversion/libsvn_ra_svn/sasl_auth.c
> - copied unchanged from r21171, /trunk/subversion/libsvn_ra_svn/sasl_auth.c
> branches/incomplete-directories/subversion/libsvn_subr/properties.c
> - copied unchanged from r21171, /trunk/subversion/libsvn_subr/properties.c
> Removed:
> branches/incomplete-directories/www/robots.txt
> Modified:
> branches/incomplete-directories/CHANGES
> branches/incomplete-directories/COMMITTERS
> branches/incomplete-directories/INSTALL
> branches/incomplete-directories/autogen.sh
> branches/incomplete-directories/build/generator/gen_win.py
> branches/incomplete-directories/configure.in
> branches/incomplete-directories/contrib/server-side/svn-fast-backup
> branches/incomplete-directories/gen-make.py
> branches/incomplete-directories/subversion/bindings/swig/include/svn_types.swg
> branches/incomplete-directories/subversion/bindings/swig/ruby/svn/client.rb
> branches/incomplete-directories/subversion/bindings/swig/ruby/test/test_client.rb
> branches/incomplete-directories/subversion/bindings/swig/ruby/test/test_delta.rb
> branches/incomplete-directories/subversion/bindings/swig/svn_delta.i
> branches/incomplete-directories/subversion/include/svn_delta.h
> branches/incomplete-directories/subversion/include/svn_fs.h
> branches/incomplete-directories/subversion/include/svn_props.h
> branches/incomplete-directories/subversion/include/svn_ra_svn.h
> branches/incomplete-directories/subversion/libsvn_client/prop_commands.c
> branches/incomplete-directories/subversion/libsvn_ra_dav/replay.c
> branches/incomplete-directories/subversion/libsvn_ra_local/ra_plugin.c
> branches/incomplete-directories/subversion/libsvn_ra_serf/README
> branches/incomplete-directories/subversion/libsvn_ra_serf/replay.c
> branches/incomplete-directories/subversion/libsvn_ra_svn/client.c
> branches/incomplete-directories/subversion/libsvn_ra_svn/editor.c
> branches/incomplete-directories/subversion/libsvn_ra_svn/editorp.c
> branches/incomplete-directories/subversion/libsvn_ra_svn/protocol
> branches/incomplete-directories/subversion/libsvn_ra_svn/ra_svn.h
> branches/incomplete-directories/subversion/libsvn_ra_svn/simple_auth.c
> branches/incomplete-directories/subversion/libsvn_subr/sorts.c
> branches/incomplete-directories/subversion/libsvn_wc/copy.c
> branches/incomplete-directories/subversion/mod_dav_svn/reports/replay.c
> branches/incomplete-directories/subversion/po/es.po
> branches/incomplete-directories/subversion/po/fr.po
> branches/incomplete-directories/subversion/po/it.po
> branches/incomplete-directories/subversion/po/ja.po
> branches/incomplete-directories/subversion/po/nb.po
> branches/incomplete-directories/subversion/po/pt_BR.po
> branches/incomplete-directories/subversion/svn/main.c
> branches/incomplete-directories/subversion/svn/propedit-cmd.c
> branches/incomplete-directories/subversion/svn/revert-cmd.c
> branches/incomplete-directories/subversion/svnserve/serve.c
> branches/incomplete-directories/subversion/svnsync/main.c
> branches/incomplete-directories/subversion/tests/cmdline/checkout_tests.py
> branches/incomplete-directories/subversion/tests/cmdline/copy_tests.py
> branches/incomplete-directories/subversion/tests/cmdline/merge_tests.py
> branches/incomplete-directories/subversion/tests/cmdline/svnsync_tests.py
> branches/incomplete-directories/subversion/tests/cmdline/svntest/tree.py
> branches/incomplete-directories/subversion/tests/cmdline/update_tests.py
> branches/incomplete-directories/subversion/tests/libsvn_ra_local/ra-local-test.c
> branches/incomplete-directories/tools/hook-scripts/mailer/mailer.conf.example
> branches/incomplete-directories/tools/hook-scripts/mailer/mailer.py
> branches/incomplete-directories/tools/hook-scripts/mailer/tests/mailer-t1.output
> branches/incomplete-directories/www/faq.html
> branches/incomplete-directories/www/svn_1.4_releasenotes.html
> branches/incomplete-directories/www/tools_contrib.html
>
> Log:
> Merge r21033-r21166 from trunk into the incomplete-directories branch.
>
>
>
Can you use svnmerge.py to record this merge?
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 Tue Aug 22 09:16:09 2006