Fix compiler warning due to missing function prototype.
* subversion/svnserve/server.h
(): Include svn_config.h and svn_ra_svn.h
* subversion/svnserve/log-escape.c
(): Include server.h.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30833 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/svnserve/server.h
(): Include svn_config.h and svn_ra_svn.h
* subversion/svnserve/log-escape.c
(): Include server.h.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30833 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_subr/log.c
Fix doc string.
Found by: stsp
git-svn-id: http://svn.collab.net/repos/svn/trunk@30830 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix doc string.
Found by: stsp
git-svn-id: http://svn.collab.net/repos/svn/trunk@30830 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Use svn_ra_callbacks2_t.get_client_string() in ra_svn/svnserve and log
it in the new 'open' log item in svnserve.
* subversion/libsvn_ra_svn/protocol
Add optional ra-client (identifying the RA implementation) and client
(the string returned by svn_ra_callbacks2_t.get_client_string()) to the
client's response to the server greeting.
* subversion/libsvn_ra_svn/client.c
(open_session): Send ra and client strings in the greeting response.
* subversion/svnserve/serve.c
(serve): Accept ra and client strings and log them in the new 'open' log
command, along with capabilities, protocol version, and the repository
path.
* tools/server-side/svn_server_log_parse.py
(Parser._parse_open): Parse open commands.
* tools/server-side/test_svn_server_log_parse.py
Test Parser._parse_open.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30829 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
it in the new 'open' log item in svnserve.
* subversion/libsvn_ra_svn/protocol
Add optional ra-client (identifying the RA implementation) and client
(the string returned by svn_ra_callbacks2_t.get_client_string()) to the
client's response to the server greeting.
* subversion/libsvn_ra_svn/client.c
(open_session): Send ra and client strings in the greeting response.
* subversion/svnserve/serve.c
(serve): Accept ra and client strings and log them in the new 'open' log
command, along with capabilities, protocol version, and the repository
path.
* tools/server-side/svn_server_log_parse.py
(Parser._parse_open): Parse open commands.
* tools/server-side/test_svn_server_log_parse.py
Test Parser._parse_open.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30829 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* tools/server-side/svn_server_log_parse.py
Add TODO about decoding URI-encoded log items before calling the callback.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30828 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add TODO about decoding URI-encoded log items before calling the callback.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30828 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Log some svnserve errors (I'm sure we have a lot more we could log).
* subversion/svnserve/serve.c
(log_write): Add simple wrapper around svn_io_file_write().
(log_error):
- Move most of the old log_fs_warning logic to this new function,
which takes err, log_file, remote_host, user, and repos
directly, so it can be used from main(), too.
- Do nothing if err is NULL
- Log NULL repos as "-"
- Expand format to include the err debug info (file/line) when available.
- Use log_write().
(log_server_error): Add wrapper around log_error that gets most of
the arguments from server_baton_t and svn_ra_svn_conn_t
(error_create_and_log): Add helper function to create, log, and
return a new error.
(log_command): Rename from svnserve_log. Use log_write.
(SLOG, replay_one_revision): Use log_command.
(load_configs): Take server_baton_t and svn_ra_svn_conn_t arguments
in order to log errors when called from serve(). main() passes
NULL for them, in which case this still returns them, and main()
still exits non-zero. Return generic errors to the user instead
of leaking the passwd/authz file paths, but log the full error
(fixes svn issue 2271). Move below log functions.
(lookup_access): Take svn_ra_svn_conn_t argument and use it to log
authz_check_access errors before discarding (fixing an old TODO).
(must_have_access, add_lock_tokens, lock_many, unlock_many): Pass
conn along to lookup_access. Log the access denied error we
return to the user.
(unlock_paths): Take new conn argument to use in logging errors from
svn_repos_fs_unlock before discarding (fixing an old TODO).
(commit): Pass conn along to unlock_paths.
(find_repos): Take new conn argument to pass along to load_configs.
Log the access denied error we return to the user.
(fs_warning_func): Renamed from log_fs_warning and now just a simple
wrapper around log_server_error.
(serve): Log the access denied error we return to the user. Log
errors from find_repos.
* subversion/svnserve/server.h
(load_configs): Update declaration.
(log_error): Declare.
* subversion/svnserve/main.c
(main): Log errors from serve before discarding. Log fork(2) errors.
* subversion/tests/cmdline/authz_tests.py
(authz_validate): Adapt svnserve error messages.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30827 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/svnserve/serve.c
(log_write): Add simple wrapper around svn_io_file_write().
(log_error):
- Move most of the old log_fs_warning logic to this new function,
which takes err, log_file, remote_host, user, and repos
directly, so it can be used from main(), too.
- Do nothing if err is NULL
- Log NULL repos as "-"
- Expand format to include the err debug info (file/line) when available.
- Use log_write().
(log_server_error): Add wrapper around log_error that gets most of
the arguments from server_baton_t and svn_ra_svn_conn_t
(error_create_and_log): Add helper function to create, log, and
return a new error.
(log_command): Rename from svnserve_log. Use log_write.
(SLOG, replay_one_revision): Use log_command.
(load_configs): Take server_baton_t and svn_ra_svn_conn_t arguments
in order to log errors when called from serve(). main() passes
NULL for them, in which case this still returns them, and main()
still exits non-zero. Return generic errors to the user instead
of leaking the passwd/authz file paths, but log the full error
(fixes svn issue 2271). Move below log functions.
(lookup_access): Take svn_ra_svn_conn_t argument and use it to log
authz_check_access errors before discarding (fixing an old TODO).
(must_have_access, add_lock_tokens, lock_many, unlock_many): Pass
conn along to lookup_access. Log the access denied error we
return to the user.
(unlock_paths): Take new conn argument to use in logging errors from
svn_repos_fs_unlock before discarding (fixing an old TODO).
(commit): Pass conn along to unlock_paths.
(find_repos): Take new conn argument to pass along to load_configs.
Log the access denied error we return to the user.
(fs_warning_func): Renamed from log_fs_warning and now just a simple
wrapper around log_server_error.
(serve): Log the access denied error we return to the user. Log
errors from find_repos.
* subversion/svnserve/server.h
(load_configs): Update declaration.
(log_error): Declare.
* subversion/svnserve/main.c
(main): Log errors from serve before discarding. Log fork(2) errors.
* subversion/tests/cmdline/authz_tests.py
(authz_validate): Adapt svnserve error messages.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30827 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Kill spurious errors from one side legitimately closing the connection; we
couldn't see these before, but with the upcoming change to log errors,
they fill the log with noise.
One more bogus SVN_ERR_RA_SVN_CONNECTION_CLOSED remains, that I have not
been able to track down. It only manifests under authz_tests.py 13 (authz
issue #2712), so not so bad.
* subversion/include/svn_ra_svn.h
(svn_ra_svn_handle_commands2): Add rev'd interface.
* subversion/libsvn_ra_svn/editorp.c
(svn_ra_svn_drive_editor2): While discarding edit commands after
sending the other side an error, don't consider it an error if the
other side drops the connection.
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn_handle_commands2): Rev from svn_ra_svn_handle_commands,
adding error_on_disconnect argument, and suppress
SVN_ERR_RA_SVN_CONNECTION_CLOSED errors unless it is TRUE.
* subversion/svnserve/serve.c
(accept_report): Use svn_ra_svn_handle_commands2, with
error_on_disconnect TRUE.
(serve): Use svn_ra_svn_handle_commands2, with error_on_disconnect FALSE;
dropping the connection is proper when the client is done.
* subversion/svnserve/main.c
(main): Don't ignore SVN_ERR_RA_SVN_CONNECTION_CLOSED errors here. We
have no idea here whether it was a real error or not! The ones that
are not real errors are now suppressed in the right places.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30826 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
couldn't see these before, but with the upcoming change to log errors,
they fill the log with noise.
One more bogus SVN_ERR_RA_SVN_CONNECTION_CLOSED remains, that I have not
been able to track down. It only manifests under authz_tests.py 13 (authz
issue #2712), so not so bad.
* subversion/include/svn_ra_svn.h
(svn_ra_svn_handle_commands2): Add rev'd interface.
* subversion/libsvn_ra_svn/editorp.c
(svn_ra_svn_drive_editor2): While discarding edit commands after
sending the other side an error, don't consider it an error if the
other side drops the connection.
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn_handle_commands2): Rev from svn_ra_svn_handle_commands,
adding error_on_disconnect argument, and suppress
SVN_ERR_RA_SVN_CONNECTION_CLOSED errors unless it is TRUE.
* subversion/svnserve/serve.c
(accept_report): Use svn_ra_svn_handle_commands2, with
error_on_disconnect TRUE.
(serve): Use svn_ra_svn_handle_commands2, with error_on_disconnect FALSE;
dropping the connection is proper when the client is done.
* subversion/svnserve/main.c
(main): Don't ignore SVN_ERR_RA_SVN_CONNECTION_CLOSED errors here. We
have no idea here whether it was a real error or not! The ones that
are not real errors are now suppressed in the right places.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30826 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Merge the svnserve-logging branch, in its entirety, to trunk, using the
following command:
svn merge http://svn.collab.net/repos/svn/trunk@30530 \
http://svn.collab.net/repos/svn/branches/svnserve-logging@30700
(svn merge --reintegrate does not handle renames on the branch)
See the branch for the details, but here is a summary:
- Add very simple --log-file functionality to svnserve, with no support
for log rotation beyond simply killing the listener, rotating, and
restarting.
- Move the logic for constructing the operational log line from all the
places in mod_dav_svn where an operation is logged to the new svn_log__
functions in libsvn_subr.
- Use svn_log__ functions to log operations in svnserve.
- Copy escape_errorlog_item from Apache 2.2.4 to new log-escape.c file,
for escaping whatever random crap may be in logged error messages
(e.g. newlines).
- Rename tools/server-side/svn_dav_log_parse.py and
test_svn_dav_log_parse.py to tools/server-side/svn_server_log_parse.py
and test_svn_server_log_parse.py and add support for svnserve format.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30825 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
following command:
svn merge http://svn.collab.net/repos/svn/trunk@30530 \
http://svn.collab.net/repos/svn/branches/svnserve-logging@30700
(svn merge --reintegrate does not handle renames on the branch)
See the branch for the details, but here is a summary:
- Add very simple --log-file functionality to svnserve, with no support
for log rotation beyond simply killing the listener, rotating, and
restarting.
- Move the logic for constructing the operational log line from all the
places in mod_dav_svn where an operation is logged to the new svn_log__
functions in libsvn_subr.
- Use svn_log__ functions to log operations in svnserve.
- Copy escape_errorlog_item from Apache 2.2.4 to new log-escape.c file,
for escaping whatever random crap may be in logged error messages
(e.g. newlines).
- Rename tools/server-side/svn_dav_log_parse.py and
test_svn_dav_log_parse.py to tools/server-side/svn_server_log_parse.py
and test_svn_server_log_parse.py and add support for svnserve format.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30825 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix pool usage in mergeinfo elision code; the current code was leading
to assertion failures in reintegrate, among other things.
Specifically, it was assuming in two places that paths passed to
callbacks would live longer than they actually do.
* subversion/libsvn_client/mergeinfo.c
(elide_mergeinfo_catalog_open_directory): Copy path into directory
pool.
(struct elide_mergeinfo_catalog_cb_baton): Add result_pool member.
(elide_mergeinfo_catalog_cb): Copy elidable path into result_pool.
(svn_client__elide_mergeinfo_catalog): Initialize result_pool
member.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30820 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
to assertion failures in reintegrate, among other things.
Specifically, it was assuming in two places that paths passed to
callbacks would live longer than they actually do.
* subversion/libsvn_client/mergeinfo.c
(elide_mergeinfo_catalog_open_directory): Copy path into directory
pool.
(struct elide_mergeinfo_catalog_cb_baton): Add result_pool member.
(elide_mergeinfo_catalog_cb): Copy elidable path into result_pool.
(svn_client__elide_mergeinfo_catalog): Initialize result_pool
member.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30820 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* www/release-process.html
Move the "tagging" section into the part with making the tarball,
not uploading the tarball (so that it happens even for rcs that
don't get approved).
git-svn-id: http://svn.collab.net/repos/svn/trunk@30815 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Move the "tagging" section into the part with making the tarball,
not uploading the tarball (so that it happens even for rcs that
don't get approved).
git-svn-id: http://svn.collab.net/repos/svn/trunk@30815 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* COMMITTERS (danielsh): Add Daniel Shahaf to full committers section;
he can run, but he can't hide.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30814 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
he can run, but he can't hide.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30814 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Minor tweak to XFail merge test for issue #3067.
* subversion/tests/cmdline/merge_tests.py
(dont_merge_revs_into_subtree_that_predate_it): Don't expect merge
notification headers for no-op ranges that are merged during discrete
editor drives.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30812 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/tests/cmdline/merge_tests.py
(dont_merge_revs_into_subtree_that_predate_it): Don't expect merge
notification headers for no-op ranges that are merged during discrete
editor drives.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30812 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* www/svn_1.5_releasenotes.html
(externals):
Fix the resulting absolute URLs for the scheme-relative and
hostname-relative examples using the svn+ssh base URL.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30805 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(externals):
Fix the resulting absolute URLs for the scheme-relative and
hostname-relative examples using the svn+ssh base URL.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30805 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_subr/validate.c
(svn_mime_type_validate): Check for illegal characters is now in
compliance with RFC 1521.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30795 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(svn_mime_type_validate): Check for illegal characters is now in
compliance with RFC 1521.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30795 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* contrib/server-side/mod_dontdothat/README: Fix a typo.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30787 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
git-svn-id: http://svn.collab.net/repos/svn/trunk@30787 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* tools/client-side/bash_completion
(_svnadmin): Update.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30785 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(_svnadmin): Update.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30785 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix a typo.
* subversion/tests/cmdline/svndumpfilter_tests.py
(): s/looses/loses/
git-svn-id: http://svn.collab.net/repos/svn/trunk@30779 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/tests/cmdline/svndumpfilter_tests.py
(): s/looses/loses/
git-svn-id: http://svn.collab.net/repos/svn/trunk@30779 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix issue 3181.
svndumpfilter drops mergeinfo when it is *not* run with --renumber-revs.
* subversion/svndumpfilter/main.c
(adjust_mergeinfo): Always populate 'final_mergeinfo'.
* subversion/tests/cmdline/svndumpfilter_tests.py
(test_list): Remove XFail marker from 'svndumpfilter_loses_mergeinfo'.
Found by: MSshu
git-svn-id: http://svn.collab.net/repos/svn/trunk@30777 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
svndumpfilter drops mergeinfo when it is *not* run with --renumber-revs.
* subversion/svndumpfilter/main.c
(adjust_mergeinfo): Always populate 'final_mergeinfo'.
* subversion/tests/cmdline/svndumpfilter_tests.py
(test_list): Remove XFail marker from 'svndumpfilter_loses_mergeinfo'.
Found by: MSshu
git-svn-id: http://svn.collab.net/repos/svn/trunk@30777 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Testcase to show issue 3181.
svndumpfilter drops mergeinfo when it is *not* run with --renumber-revs.
* subversion/tests/cmdline/svndumpfilter_tests.py
(svndumpfilter_loses_mergeinfo): New function.
(test_list): Add 'svndumpfilter_loses_mergeinfo' as XFail test.
Found by: MSshu
git-svn-id: http://svn.collab.net/repos/svn/trunk@30776 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
svndumpfilter drops mergeinfo when it is *not* run with --renumber-revs.
* subversion/tests/cmdline/svndumpfilter_tests.py
(svndumpfilter_loses_mergeinfo): New function.
(test_list): Add 'svndumpfilter_loses_mergeinfo' as XFail test.
Found by: MSshu
git-svn-id: http://svn.collab.net/repos/svn/trunk@30776 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* notes/wc-ng-design: Comment upon some more.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30774 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
git-svn-id: http://svn.collab.net/repos/svn/trunk@30774 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* notes/wc-ng-design: Comment upon.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30773 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
git-svn-id: http://svn.collab.net/repos/svn/trunk@30773 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Don't use an error message with SVN_ERR_RA_SVN_CONNECTION_CLOSED when the
error message adds nothing.
* subversion/libsvn_ra_svn/streams.c
(file_read_cb, sock_read_cb): Use NULL for error message.
* subversion/libsvn_ra_svn/marshal.c
(readbuf_input): Use NULL for error message.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30772 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
error message adds nothing.
* subversion/libsvn_ra_svn/streams.c
(file_read_cb, sock_read_cb): Use NULL for error message.
* subversion/libsvn_ra_svn/marshal.c
(readbuf_input): Use NULL for error message.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30772 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* tools/dist/getsigs.pl:
Check signatures keys in the same .asc file, not just the first one.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30770 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Check signatures keys in the same .asc file, not just the first one.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30770 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix some typos in comments.
* subversion/libsvn_client/copy.c
(): Fix typos in comments.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30767 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_client/copy.c
(): Fix typos in comments.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30767 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Remove tabs. Eeew. Ick.
* tools/dist/getsigs.pl:
Reformat without tabs.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30766 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* tools/dist/getsigs.pl:
Reformat without tabs.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30766 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/svnserve/serve.c
(serve): Remove comments about v1 compat that have been stale since r24119.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30765 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(serve): Remove comments about v1 compat that have been stale since r24119.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30765 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* www/links.html (high-level-tools): Add VoilaSVN.
Patch by: Jean-Claude Antonio <jcantonio@alineo.com>
(Tweaked by me to be more concise and to say that it's not open source.)
git-svn-id: http://svn.collab.net/repos/svn/trunk@30764 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Patch by: Jean-Claude Antonio <jcantonio@alineo.com>
(Tweaked by me to be more concise and to say that it's not open source.)
git-svn-id: http://svn.collab.net/repos/svn/trunk@30764 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix issue 3172.
'svn log -g' seems to encounter error on server'.
'log -g' fails the moment it encounters a bogus mergeinfo which claims a
merge from a non-existentpath@REV1-REV2.
* subversion/libsvn_repos/log.c
(do_merged_logs): When the merge-source does not exist at the merged-range,
ignore it.
* subversion/tests/cmdline/log_tests.py
(test_list): Remove XFail marker from
'merge_sensitive_log_target_with_bogus_mergeinfo'.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30762 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
'svn log -g' seems to encounter error on server'.
'log -g' fails the moment it encounters a bogus mergeinfo which claims a
merge from a non-existentpath@REV1-REV2.
* subversion/libsvn_repos/log.c
(do_merged_logs): When the merge-source does not exist at the merged-range,
ignore it.
* subversion/tests/cmdline/log_tests.py
(test_list): Remove XFail marker from
'merge_sensitive_log_target_with_bogus_mergeinfo'.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30762 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Testcase to show issue 3172.
'svn log -g' seems to encounter error on server'.
'log -g' fails the moment it encounters a bogus mergeinfo which claims a
merge from a non-existentpath@REV1-REV2.
* subversion/tests/cmdline/log_tests.py
(): import svntest.main.SVN_PROP_MERGEINFO.
(merge_sensitive_log_target_with_bogus_mergeinfo): New function.
(test_list): Add 'merge_sensitive_log_target_with_bogus_mergeinfo' as XFail
test.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30761 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
'svn log -g' seems to encounter error on server'.
'log -g' fails the moment it encounters a bogus mergeinfo which claims a
merge from a non-existentpath@REV1-REV2.
* subversion/tests/cmdline/log_tests.py
(): import svntest.main.SVN_PROP_MERGEINFO.
(merge_sensitive_log_target_with_bogus_mergeinfo): New function.
(test_list): Add 'merge_sensitive_log_target_with_bogus_mergeinfo' as XFail
test.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30761 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix a couple of bugs in username/password caching.
Patch by: Daniel Shahaf <d.s@daniel.shahaf.co.il>
(Only stylistic tweaks by me.)
Suggested by: stsp
* subversion/libsvn_subr/simple_providers.c
(simple_save_creds_helper):
Cache the username even if we're not allowed to cache the password.
Also, respect SVN_AUTH_PARAM_NO_AUTH_CACHE. We hadn't been before,
but because the caller also happened to check it, there was no
user-visible problem, just a masked violation of the provider API.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30760 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Patch by: Daniel Shahaf <d.s@daniel.shahaf.co.il>
(Only stylistic tweaks by me.)
Suggested by: stsp
* subversion/libsvn_subr/simple_providers.c
(simple_save_creds_helper):
Cache the username even if we're not allowed to cache the password.
Also, respect SVN_AUTH_PARAM_NO_AUTH_CACHE. We hadn't been before,
but because the caller also happened to check it, there was no
user-visible problem, just a masked violation of the provider API.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30760 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/include/svn_config.h
(svn_config_get_server_setting): Document behaviour of this function
when server_group argument is NULL. At least svn_ra_open3 and
svn_ra_neon__open rely on this behaviour.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30757 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(svn_config_get_server_setting): Document behaviour of this function
when server_group argument is NULL. At least svn_ra_open3 and
svn_ra_neon__open rely on this behaviour.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30757 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Allow 'svn merge' to merge diffs which add 'svn:eol-style' properties
to files that used to have inconsistent newlines.
Specifically, if the diff being applied adds an 'svn:eol-style'
property to a file, then the left file gets converted to the new EOL
style before running diff3. If that left file (ie, an old repository
file) had inconsistent newlines, then svn errored out with a useless
"svn: File '/tmp/tmp' has inconsistent newlines", and there was
basically no recourse. So let it repair newlines.
* subversion/libsvn_wc/merge.c
(maybe_update_target_eols): Repair newlines when translating 'left'
file in a merge.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30756 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
to files that used to have inconsistent newlines.
Specifically, if the diff being applied adds an 'svn:eol-style'
property to a file, then the left file gets converted to the new EOL
style before running diff3. If that left file (ie, an old repository
file) had inconsistent newlines, then svn errored out with a useless
"svn: File '/tmp/tmp' has inconsistent newlines", and there was
basically no recourse. So let it repair newlines.
* subversion/libsvn_wc/merge.c
(maybe_update_target_eols): Repair newlines when translating 'left'
file in a merge.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30756 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Follow-up to r30753, fix broken Win32 build.
* build.conf
(libsvn_subr): Add 'private\svn_opt_private.h' to the msvc-export list.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30754 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* build.conf
(libsvn_subr): Add 'private\svn_opt_private.h' to the msvc-export list.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30754 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Implement repository root relative url support for the svn command-line
client. This allows the user to use '^/' in front of any target to
mean the repository root url. The repository root url is determined by
checking the other arguments' root urls (if they exist) and using that common
url. If none is found the root url of the current directory is used. If no
common repository root url can be found, an error is generated.
Patch by: Troy Curtis Jr <troycurtisjr@gmail.com>
(minor tweaks by me)
* subversion/include/private/svn_opt_private.h
New file to hold inter-library svn_opt functions.
(svn_opt__arg_canonicalize_url): New function prototype.
(svn_opt__arg_canonicalize_path): New function prototype.
* subversion/include/svn_opt.h
(svn_opt_args_to_target_array3): Change doc string to reflect deprecated
status.
* subversion/libsvn_subr/opt.c
(svn_opt__arg_canonicalize_url): New function to canonicalize user input
urls.
(svn_opt__arg_canonicalize_path): New function to canonicalize user input
paths.
(svn_opt_args_to_target_array3): Replace the inline canonicalization code
with calls to the new svn_opt__arg_canonicalize_* functions.
* subversion/include/svn_client.h
(svn_client_args_to_target_array): New function prototype.
* subversion/libsvn_client/cmdline.c
New file for client library commandline processing functionality.
(arg_is_repos_relative_url,
resolve_repos_relative_url,
check_root_url_of_target): New functions to support
svn_client_args_to_target_array.
(svn_client_args_to_target_array): New client function to parse user
arguments into a target array. Replaces use of
svn_opt_args_to_target_array3(). Remove the replicated knowledge of
admin directory names, and, as a side effect, don't skip path names
of "_svn" on systems that don't use that name for the admin dir.
* subversion/tests/libsvn_client/client-test.c
(test_args_to_target_array): New test function.
(test_funcs): Run new test function.
* subversion/tests/cmdline/special_tests.py
(warn_on_reserved_name): Modify test to work right with the new
svn_client_args_to_target_array().
* subversion/tests/cmdline/basic_tests.py
(basic_relative_url_multi_repo,
basic_relative_url_using_other_targets,
basic_relative_url_using_current_dir): New test functions.
(test_list): Run new test functions.
* subversion/svn/cl.h
(svn_cl__args_to_target_array_print_reserved): Add client context parameter.
* subversion/svn/util.c
(svn_cl__args_to_target_array_print_reserved): Replace call to
svn_opt_args_to_target_array3() with svn_client_args_to_target_array().
* subversion/svn/update-cmd.c
(svn_cl__update): Replace svn_opt_args_to_target_array3() with
svn_cl__args_to_target_array_print_reserved() for consistency with the other
command line functions.
* subversion/svn/diff-cmd.c
(svn_cl__diff): Create a client context variable and use it in the
svn_cl__args_to_target_array_print_reserved() function along with
everywhere else it is needed.
* subversion/svn/add-cmd.c,
subversion/svn/blame-cmd.c,
subversion/svn/cat-cmd.c,
subversion/svn/changelist-cmd.c,
subversion/svn/checkout-cmd.c,
subversion/svn/cleanup-cmd.c,
subversion/svn/commit-cmd.c,
subversion/svn/copy-cmd.c,
subversion/svn/delete-cmd.c,
subversion/svn/export-cmd.c,
subversion/svn/import-cmd.c,
subversion/svn/info-cmd.c,
subversion/svn/list-cmd.c,
subversion/svn/lock-cmd.c,
subversion/svn/log-cmd.c,
subversion/svn/merge-cmd.c,
subversion/svn/mergeinfo-cmd.c,
subversion/svn/mkdir-cmd.c,
subversion/svn/move-cmd.c,
subversion/svn/propdel-cmd.c,
subversion/svn/propedit-cmd.c,
subversion/svn/propget-cmd.c,
subversion/svn/proplist-cmd.c,
subversion/svn/propset-cmd.c,
subversion/svn/resolve-cmd.c,
subversion/svn/resolved-cmd.c,
subversion/svn/revert-cmd.c,
subversion/svn/status-cmd.c,
subversion/svn/switch-cmd.c,
subversion/svn/unlock-cmd.c
Add client context variable to all the calls to
svn_cl__args_to_target_array_print_reserved().
git-svn-id: http://svn.collab.net/repos/svn/trunk@30753 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
client. This allows the user to use '^/' in front of any target to
mean the repository root url. The repository root url is determined by
checking the other arguments' root urls (if they exist) and using that common
url. If none is found the root url of the current directory is used. If no
common repository root url can be found, an error is generated.
Patch by: Troy Curtis Jr <troycurtisjr@gmail.com>
(minor tweaks by me)
* subversion/include/private/svn_opt_private.h
New file to hold inter-library svn_opt functions.
(svn_opt__arg_canonicalize_url): New function prototype.
(svn_opt__arg_canonicalize_path): New function prototype.
* subversion/include/svn_opt.h
(svn_opt_args_to_target_array3): Change doc string to reflect deprecated
status.
* subversion/libsvn_subr/opt.c
(svn_opt__arg_canonicalize_url): New function to canonicalize user input
urls.
(svn_opt__arg_canonicalize_path): New function to canonicalize user input
paths.
(svn_opt_args_to_target_array3): Replace the inline canonicalization code
with calls to the new svn_opt__arg_canonicalize_* functions.
* subversion/include/svn_client.h
(svn_client_args_to_target_array): New function prototype.
* subversion/libsvn_client/cmdline.c
New file for client library commandline processing functionality.
(arg_is_repos_relative_url,
resolve_repos_relative_url,
check_root_url_of_target): New functions to support
svn_client_args_to_target_array.
(svn_client_args_to_target_array): New client function to parse user
arguments into a target array. Replaces use of
svn_opt_args_to_target_array3(). Remove the replicated knowledge of
admin directory names, and, as a side effect, don't skip path names
of "_svn" on systems that don't use that name for the admin dir.
* subversion/tests/libsvn_client/client-test.c
(test_args_to_target_array): New test function.
(test_funcs): Run new test function.
* subversion/tests/cmdline/special_tests.py
(warn_on_reserved_name): Modify test to work right with the new
svn_client_args_to_target_array().
* subversion/tests/cmdline/basic_tests.py
(basic_relative_url_multi_repo,
basic_relative_url_using_other_targets,
basic_relative_url_using_current_dir): New test functions.
(test_list): Run new test functions.
* subversion/svn/cl.h
(svn_cl__args_to_target_array_print_reserved): Add client context parameter.
* subversion/svn/util.c
(svn_cl__args_to_target_array_print_reserved): Replace call to
svn_opt_args_to_target_array3() with svn_client_args_to_target_array().
* subversion/svn/update-cmd.c
(svn_cl__update): Replace svn_opt_args_to_target_array3() with
svn_cl__args_to_target_array_print_reserved() for consistency with the other
command line functions.
* subversion/svn/diff-cmd.c
(svn_cl__diff): Create a client context variable and use it in the
svn_cl__args_to_target_array_print_reserved() function along with
everywhere else it is needed.
* subversion/svn/add-cmd.c,
subversion/svn/blame-cmd.c,
subversion/svn/cat-cmd.c,
subversion/svn/changelist-cmd.c,
subversion/svn/checkout-cmd.c,
subversion/svn/cleanup-cmd.c,
subversion/svn/commit-cmd.c,
subversion/svn/copy-cmd.c,
subversion/svn/delete-cmd.c,
subversion/svn/export-cmd.c,
subversion/svn/import-cmd.c,
subversion/svn/info-cmd.c,
subversion/svn/list-cmd.c,
subversion/svn/lock-cmd.c,
subversion/svn/log-cmd.c,
subversion/svn/merge-cmd.c,
subversion/svn/mergeinfo-cmd.c,
subversion/svn/mkdir-cmd.c,
subversion/svn/move-cmd.c,
subversion/svn/propdel-cmd.c,
subversion/svn/propedit-cmd.c,
subversion/svn/propget-cmd.c,
subversion/svn/proplist-cmd.c,
subversion/svn/propset-cmd.c,
subversion/svn/resolve-cmd.c,
subversion/svn/resolved-cmd.c,
subversion/svn/revert-cmd.c,
subversion/svn/status-cmd.c,
subversion/svn/switch-cmd.c,
subversion/svn/unlock-cmd.c
Add client context variable to all the calls to
svn_cl__args_to_target_array_print_reserved().
git-svn-id: http://svn.collab.net/repos/svn/trunk@30753 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_client/prop_commands.c
(remote_propget): Don't bother to set anything in the return hash if
no property was found for a given path. This follows up to r30743.
Suggested by: glasser
(See thread below for details.)
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=137614
From: Karl Fogel <kfogel@red-bean.com>
To: "David Glasser" <glasser@davidglasser.net>
Cc: dev@subversion.tigris.org
Subject: Re: svn commit: r30743 - trunk/subversion/libsvn_client
Date: Tue, 22 Apr 2008 10:14:33 -0400
Message-ID: <877ieq6kom.fsf@red-bean.com>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30751 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(remote_propget): Don't bother to set anything in the return hash if
no property was found for a given path. This follows up to r30743.
Suggested by: glasser
(See thread below for details.)
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=137614
From: Karl Fogel <kfogel@red-bean.com>
To: "David Glasser" <glasser@davidglasser.net>
Cc: dev@subversion.tigris.org
Subject: Re: svn commit: r30743 - trunk/subversion/libsvn_client
Date: Tue, 22 Apr 2008 10:14:33 -0400
Message-ID: <877ieq6kom.fsf@red-bean.com>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30751 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Follow-up to r30749.
* subversion/tests/cmdline/merge_tests.py
(dont_merge_revs_into_subtree_that_predate_it): Oops, this test is still
XFail.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30750 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/tests/cmdline/merge_tests.py
(dont_merge_revs_into_subtree_that_predate_it): Oops, this test is still
XFail.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30750 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Tweak test for issue #3174 so it more closely aligns with the actual issue.
* subversion/tests/cmdline/merge_tests.py
(merge_chokes_on_renamed_subtrees): Tweak the test so it properly tests
issue #3174, as it was written it was actually testing issue #3076.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30749 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/tests/cmdline/merge_tests.py
(merge_chokes_on_renamed_subtrees): Tweak the test so it properly tests
issue #3174, as it was written it was actually testing issue #3076.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30749 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Don't try to drive the merge editor when there is nothing to be merged.
*subversion/libsvn_client/merge.c
(do_directory_merge): If the merge target *and* all it's children with
mergeinfo have no remaining ranges to merge, then, uh, don't merge! I came
across this while working of a fix for issue #3067 and currently that is
the only place where it appears to be a problem, but clearly the code is
wrong.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30748 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
*subversion/libsvn_client/merge.c
(do_directory_merge): If the merge target *and* all it's children with
mergeinfo have no remaining ranges to merge, then, uh, don't merge! I came
across this while working of a fix for issue #3067 and currently that is
the only place where it appears to be a problem, but clearly the code is
wrong.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30748 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Follow-up to r30764, remove some cruft from merge_tests.py.
* subversion/tests/cmdline/merge_tests.py
(merge_fails_if_subtree_is_deleted_on_src): Remove some development and
debug debris that accidentally found its way in to r30764.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30747 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/tests/cmdline/merge_tests.py
(merge_fails_if_subtree_is_deleted_on_src): Remove some development and
debug debris that accidentally found its way in to r30764.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30747 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix a merge range notification bug.
* subversion/libsvn_client/merge.c
(find_nearest_ancestor): Don't consider a subtree path it's own nearest
ancestor.
(merge_fails_if_subtree_is_deleted_on_src): Correct the expected merge
range. Due to the bug in find_nearest_ancestor() when we merged -r1:5
from 'A' into 'A_COPY' we were getting a "--- Merging r5 into
'A_COPY/D/gamma'" header followed the deletion of A_COPY/D/gamma! This
should be "--- Merging r3 through r5 into 'A_copy'" (A_copy was
copied from A@2).
git-svn-id: http://svn.collab.net/repos/svn/trunk@30746 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_client/merge.c
(find_nearest_ancestor): Don't consider a subtree path it's own nearest
ancestor.
(merge_fails_if_subtree_is_deleted_on_src): Correct the expected merge
range. Due to the bug in find_nearest_ancestor() when we merged -r1:5
from 'A' into 'A_COPY' we were getting a "--- Merging r5 into
'A_COPY/D/gamma'" header followed the deletion of A_COPY/D/gamma! This
should be "--- Merging r3 through r5 into 'A_copy'" (A_copy was
copied from A@2).
git-svn-id: http://svn.collab.net/repos/svn/trunk@30746 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix bug when creating string representations of ranges X:Y where X > Y.
Note: We don't actually create string representations of reversed ranges so
this hasn't been a problem so far. I only discovered it when using some
printf's and svn_rangelist_to_string's while debugging.
* subversion/libsvn_subr/mergeinfo.c
(range_to_string): Handle reversed svn_merge_range_t (START > END). If
(START - 1) = END then create a string representation of START preceded
by "-". Otherwise create a string representation of START, followed by
a "-", followed by a string representation of END + 1.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30745 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Note: We don't actually create string representations of reversed ranges so
this hasn't been a problem so far. I only discovered it when using some
printf's and svn_rangelist_to_string's while debugging.
* subversion/libsvn_subr/mergeinfo.c
(range_to_string): Handle reversed svn_merge_range_t (START > END). If
(START - 1) = END then create a string representation of START preceded
by "-". Otherwise create a string representation of START, followed by
a "-", followed by a string representation of END + 1.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30745 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix a memory leak in remove recursive propget. See thread starting here:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=137529
From: "Peter Wemm" <peter@wemm.org>
To: dev@subversion.tigris.org
Subject: svn propget -R on the root of a large repository == boom!
Date: Mon, 21 Apr 2008 02:12:54 -0700
Message-ID: <e7db6d980804210212h49b2a5a2g5b99093d2ec437a7@mail.gmail.com>
* subversion/libsvn_client/prop_commands.c
(remote_propget): Take perm_pool and work_pool arguments, instead of
just one pool, and use them to manage memory more efficiently.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30743 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=137529
From: "Peter Wemm" <peter@wemm.org>
To: dev@subversion.tigris.org
Subject: svn propget -R on the root of a large repository == boom!
Date: Mon, 21 Apr 2008 02:12:54 -0700
Message-ID: <e7db6d980804210212h49b2a5a2g5b99093d2ec437a7@mail.gmail.com>
* subversion/libsvn_client/prop_commands.c
(remote_propget): Take perm_pool and work_pool arguments, instead of
just one pool, and use them to manage memory more efficiently.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30743 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix bug whereby 'svn status --depth=files' still showed some directories.
See thread starting here for more:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=137341
From: "Bert Huijben" <B.Huijben@competence.biz>
To: <dev@subversion.tigris.org>
Subject: 1.5: svn status --depth=files shows directories
Date: Thu, 17 Apr 2008 10:54:32 +0200
Message-ID:
<D1FD39A2CD7F8A4294ED23547B76DA016890C0@s-ijs-exc-005.tcg.root.intra>
* subversion/libsvn_wc/status.c
(get_dir_status): Check depth before sending unversioned or external
directory. Also, fix a wrong-pool buglet. Add comments about how
external and unversioned got lumped together, and how this may not
have been intentional. Lose some unnecessary comments.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30741 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
See thread starting here for more:
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=137341
From: "Bert Huijben" <B.Huijben@competence.biz>
To: <dev@subversion.tigris.org>
Subject: 1.5: svn status --depth=files shows directories
Date: Thu, 17 Apr 2008 10:54:32 +0200
Message-ID:
<D1FD39A2CD7F8A4294ED23547B76DA016890C0@s-ijs-exc-005.tcg.root.intra>
* subversion/libsvn_wc/status.c
(get_dir_status): Check depth before sending unversioned or external
directory. Also, fix a wrong-pool buglet. Add comments about how
external and unversioned got lumped together, and how this may not
have been intentional. Lose some unnecessary comments.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30741 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add test case to verify that folding a subtree will not destroy to content of
unversioned & modified items.
Patch by: Guo Rui <timmyguo@mail.ustc.edu.cn>
(Only minor tweaks by me.)
* subversion/tests/cmdline/depth_tests.py
(fold_tree_with_unversioned_modified_items): New test.
(test_lists): Run it XFail
git-svn-id: http://svn.collab.net/repos/svn/trunk@30738 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
unversioned & modified items.
Patch by: Guo Rui <timmyguo@mail.ustc.edu.cn>
(Only minor tweaks by me.)
* subversion/tests/cmdline/depth_tests.py
(fold_tree_with_unversioned_modified_items): New test.
(test_lists): Run it XFail
git-svn-id: http://svn.collab.net/repos/svn/trunk@30738 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix typo.
* subversion/libsvn_fs_fs/structure
(Node-revision IDs): 'comment' -> 'commit'.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30736 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_fs_fs/structure
(Node-revision IDs): 'comment' -> 'commit'.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30736 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Minor doc string fix for svn_client__merge_path_t.
* subversion/libsvn_client/mergeinfo.h
(svn_client__merge_path_t): Note that we always describe the target
of a merge regardless of whether it has explicit mergeinfo.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30735 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_client/mergeinfo.h
(svn_client__merge_path_t): Note that we always describe the target
of a merge regardless of whether it has explicit mergeinfo.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30735 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix compiler warning of incompatible pointer type, following up to r30684.
* subversion/libsvn_client/ra.c
(svn_client__open_ra_session_internal): Declare svn_wc_entry_t as constant.
Approved by: kfogel
git-svn-id: http://svn.collab.net/repos/svn/trunk@30726 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_client/ra.c
(svn_client__open_ra_session_internal): Declare svn_wc_entry_t as constant.
Approved by: kfogel
git-svn-id: http://svn.collab.net/repos/svn/trunk@30726 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Simplified chinese translation update.
* subversion/po/zh_CN.po: Update to r30722.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30724 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/po/zh_CN.po: Update to r30722.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30724 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Minor unbenchmarked optimization to svnserve: use a hash for commands
instead of looping over a list of 28 commands every time.
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn_handle_commands): Put command list into a hash. Adjust
some pool usage to match.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30722 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
instead of looping over a list of 28 commands every time.
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn_handle_commands): Put command list into a hash. Adjust
some pool usage to match.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30722 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Polish translation update.
* subversion/po/pl.po: Polish translation update.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30719 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/po/pl.po: Polish translation update.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30719 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/include/svn_ctype.h
(svn_ctype_casecmp): Document return value.
* subversion/include/svn_string.h
(svn_cstring_casecmp): Document return value.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30715 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(svn_ctype_casecmp): Document return value.
* subversion/include/svn_string.h
(svn_cstring_casecmp): Document return value.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30715 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revert r30574 which is unnecessary.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30697 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
git-svn-id: http://svn.collab.net/repos/svn/trunk@30697 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* contrib/server-side/add-needs-lock.py:
Add the svn:keywords property and use them.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30696 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add the svn:keywords property and use them.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30696 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Merge the diff-callbacks3 branch (issue #3134) onto trunk.
The significant log message is that of r29985. In summary:
Extend the diff-callbacks struct to handle the opening and closing of
a directory explicitly, with dir_opened() and dir_closed() calls.
Patch by: Stephen Butler
Review by: me
git-svn-id: http://svn.collab.net/repos/svn/trunk@30694 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
The significant log message is that of r29985. In summary:
Extend the diff-callbacks struct to handle the opening and closing of
a directory explicitly, with dir_opened() and dir_closed() calls.
Patch by: Stephen Butler
Review by: me
git-svn-id: http://svn.collab.net/repos/svn/trunk@30694 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* contrib/server-side/add-needs-lock.py: New file.
Patch by: Kevin Radke <kmradke@gmail.com>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30693 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Patch by: Kevin Radke <kmradke@gmail.com>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30693 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Check repository UUID when creating an RA session. This fixes an
issue where "svn update" would silently overwrite the UUID of a
working copy if the repository UUID had changed. Several tests in
svnadmin_tests which silently took advantage of this are fixed too.
This patch was filed as issue #3177.
Patch by: Daniel Shahaf <d.s@daniel.shahaf.co.il>
(Tweaked by me to use the new API everywhere, fix up comments, etc.)
* subversion/include/svn_ra.h, subversion/libsvn_ra/ra_loader.c
(svn_ra_open3): New API, deprecates svn_ra_open2. Adjust comments.
* subversion/libsvn_client/ra.c
(svn_client__open_ra_session_internal): When having a working copy,
pass its uuid to svn_ra_open3().
* subversion/include/svn_error_codes.h
(SVN_ERR_RA_UUID_MISMATCH): New error.
* subversion/tests/libsvn_ra_local/ra-local-test.c
(make_and_open_local_repos): Call svn_ra_open3, but pass NULL for uuid.
* subversion/svnsync/main.c
(do_initialize, initialize_cmd, synchronize_cmd, copy_revprops_cmd):
Call svn_ra_open3.
(open_source_session): Call svn_ra_open3, pass the expected uuid to it,
and eliminate the code that compared uuids by hand.
* subversion/include/svn_client.h
(svn_client_open_ra_session): Adjust comment.
* subversion/libsvn_client/client.h
(svn_client__default_walker_error_handler): Adjust comment.
* subversion/libsvn_client/copy.c
(repos_to_repos_copy): Adjust comment.
* subversion/tests/cmdline/update_tests.py
(update_uuid_changed): New test.
(test_list): Run it.
* subversion/tests/cmdline/switch_tests.py
(switch_change_repos_root): Change expected error message.
* subversion/tests/cmdline/svnadmin_tests.py
(extra_headers, extra_blockcontent, empty_date):
Load dumpfile with '--ignore-uuid' in order to not change the repository
uuid, since a working copy already has been checked out from it.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30684 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
issue where "svn update" would silently overwrite the UUID of a
working copy if the repository UUID had changed. Several tests in
svnadmin_tests which silently took advantage of this are fixed too.
This patch was filed as issue #3177.
Patch by: Daniel Shahaf <d.s@daniel.shahaf.co.il>
(Tweaked by me to use the new API everywhere, fix up comments, etc.)
* subversion/include/svn_ra.h, subversion/libsvn_ra/ra_loader.c
(svn_ra_open3): New API, deprecates svn_ra_open2. Adjust comments.
* subversion/libsvn_client/ra.c
(svn_client__open_ra_session_internal): When having a working copy,
pass its uuid to svn_ra_open3().
* subversion/include/svn_error_codes.h
(SVN_ERR_RA_UUID_MISMATCH): New error.
* subversion/tests/libsvn_ra_local/ra-local-test.c
(make_and_open_local_repos): Call svn_ra_open3, but pass NULL for uuid.
* subversion/svnsync/main.c
(do_initialize, initialize_cmd, synchronize_cmd, copy_revprops_cmd):
Call svn_ra_open3.
(open_source_session): Call svn_ra_open3, pass the expected uuid to it,
and eliminate the code that compared uuids by hand.
* subversion/include/svn_client.h
(svn_client_open_ra_session): Adjust comment.
* subversion/libsvn_client/client.h
(svn_client__default_walker_error_handler): Adjust comment.
* subversion/libsvn_client/copy.c
(repos_to_repos_copy): Adjust comment.
* subversion/tests/cmdline/update_tests.py
(update_uuid_changed): New test.
(test_list): Run it.
* subversion/tests/cmdline/switch_tests.py
(switch_change_repos_root): Change expected error message.
* subversion/tests/cmdline/svnadmin_tests.py
(extra_headers, extra_blockcontent, empty_date):
Load dumpfile with '--ignore-uuid' in order to not change the repository
uuid, since a working copy already has been checked out from it.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30684 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Followup to r30633: Map svn_wc_notify_foreign_merge_begin into the JavaHL
bindings.
[ in subversion/bindings/javahl/ ]
* native/EnumMapper.cpp
(mapNotifyAction): Add a mapping for svn_wc_notify_foreign_merge_begin.
* src/org/tigris/subversion/javahl/NotifyAction.java
(foreign_merge_begin): New.
(actionNames): Add description of foreign_merge_begin.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30678 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
bindings.
[ in subversion/bindings/javahl/ ]
* native/EnumMapper.cpp
(mapNotifyAction): Add a mapping for svn_wc_notify_foreign_merge_begin.
* src/org/tigris/subversion/javahl/NotifyAction.java
(foreign_merge_begin): New.
(actionNames): Add description of foreign_merge_begin.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30678 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_client/merge.c
(mergeinfo_behavior): Refactor to avoid code duplication; no
functional change.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30675 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(mergeinfo_behavior): Refactor to avoid code duplication; no
functional change.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30675 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add test case to checkout a subtree with depth immediates and verify the same.
* subversion/tests/cmdline/depth_tests.py
(pull_in_tree_with_depth_option): New, pull in directory A with
--depth=immediates and see whether the depth of A is set to immediates
(test_list): Add pull_in_tree_with_depth_option
Patch by: Guo Rui <timmyguo@mail.ustc.edu.cn>
(Tweaked by me)
git-svn-id: http://svn.collab.net/repos/svn/trunk@30673 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/tests/cmdline/depth_tests.py
(pull_in_tree_with_depth_option): New, pull in directory A with
--depth=immediates and see whether the depth of A is set to immediates
(test_list): Add pull_in_tree_with_depth_option
Patch by: Guo Rui <timmyguo@mail.ustc.edu.cn>
(Tweaked by me)
git-svn-id: http://svn.collab.net/repos/svn/trunk@30673 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/tests/cmdline/depth_tests.py
(depth_fold_expand_clean_trees): Fix a silly bug caused by copy/paste.
The last expected_status assignment should be expected_disk.
Patch by: Guo Rui <timmyguo@mail.ustc.edu.cn>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30672 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(depth_fold_expand_clean_trees): Fix a silly bug caused by copy/paste.
The last expected_status assignment should be expected_disk.
Patch by: Guo Rui <timmyguo@mail.ustc.edu.cn>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30672 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Follow-up to r30644, fix single file merge bug that can segfault and/or lead
to corrupt mergeinfo.
Note: This should fix the merge_tests.py 17 and 22 failures on the debian
[fsfs] x [svn] buildbot.
* subversion/libsvn_client/merge.c
(do_file_merge): Reorder code a bit to ensure that --record-only merges
actually calculate mergeinfo_path. This is passed to
update_wc_mergeinfo() at the end of the function when we finally record
mergeinfo. Previously we passed an uninitialized value.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30668 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
to corrupt mergeinfo.
Note: This should fix the merge_tests.py 17 and 22 failures on the debian
[fsfs] x [svn] buildbot.
* subversion/libsvn_client/merge.c
(do_file_merge): Reorder code a bit to ensure that --record-only merges
actually calculate mergeinfo_path. This is passed to
update_wc_mergeinfo() at the end of the function when we finally record
mergeinfo. Previously we passed an uninitialized value.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30668 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
In ra_neon, cache starting props when first seen, to reduce round trips.
Patch by: Daniel Shahaf <d.s@daniel.shahaf.co.il>
(Tweaked by me.)
* subversion/libsvn_ra_neon/ra_neon.h
(svn_ra_neon__session_t): New member 'vcc'.
(svn_ra_neon__get_starting_props,
svn_ra_neon__search_for_starting_props): Document the caching
behavior, because it's visible and we now depend on it.
* subversion/libsvn_ra_neon/props.c
(svn_ra_neon__get_starting_props): Cache VCC and UUID in the session.
(svn_ra_neon__get_vcc): Look in the cache first.
(svn_ra_neon__get_baseline_props):
Call __get_vcc() to get the VCC.
Change local variable 'vcc' to 'const char *' from 'svn_string_t *'.
(svn_ra_neon__get_baseline_info):
Call __get_starting_props() instead of calling
svn_ra_neon__get_props_resource() directly.
* subversion/libsvn_ra_neon/session.c
(svn_ra_neon__open): Initialize cached fields to NULL.
(svn_ra_neon__do_get_uuid): Rely on __get_starting_props() to cache
the UUID.
* subversion/libsvn_ra_neon/commit.c (apply_revprops):
Call __get_vcc() to get the VCC, to take advantage of the cache.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30666 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Patch by: Daniel Shahaf <d.s@daniel.shahaf.co.il>
(Tweaked by me.)
* subversion/libsvn_ra_neon/ra_neon.h
(svn_ra_neon__session_t): New member 'vcc'.
(svn_ra_neon__get_starting_props,
svn_ra_neon__search_for_starting_props): Document the caching
behavior, because it's visible and we now depend on it.
* subversion/libsvn_ra_neon/props.c
(svn_ra_neon__get_starting_props): Cache VCC and UUID in the session.
(svn_ra_neon__get_vcc): Look in the cache first.
(svn_ra_neon__get_baseline_props):
Call __get_vcc() to get the VCC.
Change local variable 'vcc' to 'const char *' from 'svn_string_t *'.
(svn_ra_neon__get_baseline_info):
Call __get_starting_props() instead of calling
svn_ra_neon__get_props_resource() directly.
* subversion/libsvn_ra_neon/session.c
(svn_ra_neon__open): Initialize cached fields to NULL.
(svn_ra_neon__do_get_uuid): Rely on __get_starting_props() to cache
the UUID.
* subversion/libsvn_ra_neon/commit.c (apply_revprops):
Call __get_vcc() to get the VCC, to take advantage of the cache.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30666 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add tests for issue #2843, the as-yet-unimplemented depth fold-up behavior.
Patch by: Guo Rui <timmyguo@mail.ustc.edu.cn>
(I made minor tweaks to doc strings, comments, and formatting.)
* subversion/tests/cmdline/depth_tests.py
(depth_folding_clean_trees_1, depth_folding_clean_trees_2,
depth_fold_expand_clean_trees): New tests.
(test_list): Run them XFail.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30664 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Patch by: Guo Rui <timmyguo@mail.ustc.edu.cn>
(I made minor tweaks to doc strings, comments, and formatting.)
* subversion/tests/cmdline/depth_tests.py
(depth_folding_clean_trees_1, depth_folding_clean_trees_2,
depth_fold_expand_clean_trees): New tests.
(test_list): Run them XFail.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30664 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_repos/log.c
Code formatting and comment tweaks, mostly, with the exception of ...
(do_merged_logs): Use MAX() instead of an explicit ternery operator.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30663 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Code formatting and comment tweaks, mostly, with the exception of ...
(do_merged_logs): Use MAX() instead of an explicit ternery operator.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30663 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
r30661 removed the only use of the vdelta algorithm from Subversion,
so we clean up the now-dead code.
I did leave the misnamed vdelta-test alone.
* subversion/libsvn_delta/vdelta.c
Remove.
* subversion/libsvn_delta/delta.h
(svn_txdelta__vdelta): Remove.
* subversion/libsvn_delta/compose_delta.c
(build_range_list): Tweak comment that referred to VD_KEY_SIZE.
* subversion/libsvn_delta/text_delta.c
(struct txdelta_baton): Tweak comment on buf member.
(compute_window, svn_txdelta__insert_op): Tweak comment.
* subversion/libsvn_delta/xdelta.c
(svn_txdelta__xdelta): Tweak comment.
* subversion/libsvn_fs_fs/fs_fs.c
(get_contents): Tweak comment.
* subversion/mod_dav_svn/reports/update.c
(upd_open_file): Tweak comment.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30662 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
so we clean up the now-dead code.
I did leave the misnamed vdelta-test alone.
* subversion/libsvn_delta/vdelta.c
Remove.
* subversion/libsvn_delta/delta.h
(svn_txdelta__vdelta): Remove.
* subversion/libsvn_delta/compose_delta.c
(build_range_list): Tweak comment that referred to VD_KEY_SIZE.
* subversion/libsvn_delta/text_delta.c
(struct txdelta_baton): Tweak comment on buf member.
(compute_window, svn_txdelta__insert_op): Tweak comment.
* subversion/libsvn_delta/xdelta.c
(svn_txdelta__xdelta): Tweak comment.
* subversion/libsvn_fs_fs/fs_fs.c
(get_contents): Tweak comment.
* subversion/mod_dav_svn/reports/update.c
(upd_open_file): Tweak comment.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30662 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Don't waste CPU time creating deltas against the empty stream; just
use a single insert operation.
The only reason to represent deltas against the empty stream as
anything other than a single insert operation would be to "compress"
it; but since most of the time we're gzipping the delta stream anyway,
this is usually a waste of time.
This does mean that more bandwidth will be used when talking to
pre-1.4 clients, and more disk space will be used when storing data in
pre-1.4.x FSFS repositories. However, by the time 1.6.0 is released,
pre-1.4.x clients will be very old, and there is an "svnadmin upgrade"
command to upgrade old repositories.
* subversion/libsvn_delta/text_delta.c
(compute_window): Replace call to svn_txdelta__vdelta with a single
call to svn_txdelta__insert_op.
Patch by: Niels Werensteijn <n.werensteijn@student.utwente.nl>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30661 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
use a single insert operation.
The only reason to represent deltas against the empty stream as
anything other than a single insert operation would be to "compress"
it; but since most of the time we're gzipping the delta stream anyway,
this is usually a waste of time.
This does mean that more bandwidth will be used when talking to
pre-1.4 clients, and more disk space will be used when storing data in
pre-1.4.x FSFS repositories. However, by the time 1.6.0 is released,
pre-1.4.x clients will be very old, and there is an "svnadmin upgrade"
command to upgrade old repositories.
* subversion/libsvn_delta/text_delta.c
(compute_window): Replace call to svn_txdelta__vdelta with a single
call to svn_txdelta__insert_op.
Patch by: Niels Werensteijn <n.werensteijn@student.utwente.nl>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30661 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/tests/cmdline/README
Add a note about compatibility testing.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30660 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add a note about compatibility testing.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30660 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_subr/cmdline.c
(svn_cmdline_setup_auth_baton): Don't reuse a variable that
represents the store-passwords option to also represent the
store-auth-creds option. This made it look at first glance
as if the store-passwords option was equivalent to the
--no-auth-cache command line option, which isn't true.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30656 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(svn_cmdline_setup_auth_baton): Don't reuse a variable that
represents the store-passwords option to also represent the
store-auth-creds option. This made it look at first glance
as if the store-passwords option was equivalent to the
--no-auth-cache command line option, which isn't true.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30656 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Follow up to r30643.
* tools/client-side/bash_completion
(): fix one --accept value for 'svn resolve' command, and more
comments.
Patch by: stylesen
me
git-svn-id: http://svn.collab.net/repos/svn/trunk@30653 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* tools/client-side/bash_completion
(): fix one --accept value for 'svn resolve' command, and more
comments.
Patch by: stylesen
me
git-svn-id: http://svn.collab.net/repos/svn/trunk@30653 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Make --record-only merges record and elide mergeinfo on subtrees.
Previously, --record-only merge only set mergeinfo on the merge
target, ignored subtrees with explicit mergeinfo, and did not attempt
any elision. Basically, a "smart propedit" on the the merge target.
After this change, it's still a smart propedit, but it also notices
subtrees with explicit mergeinfo and sets mergeinfo on them as if we
had done a "real" merge, and then it attempts to elide those subtrees'
mergeinfo if possible (again like a "real" merge).
* subversion/libsvn_client/merge.c
(populate_remaining_ranges): Expect that this code may now be invoked
during --record-only merges and in that case follow the same code path
we do when not honoring mergeinfo, i.e. the requested range *is* the
remaining range, no filtering needed.
(record_mergeinfo_for_record_only_merge): Delete, a few minor tweaks to
do_file_merge(), do_directory_merge(), and their helpers is adequate to
replace this while also implementing the new --record-only functionality.
(do_file_merge, do_directory_merge): Expect that this code may now be
invoked during --record-only merges; if it is, *skip* the actual
merging, but *do* record the merge in mergeinfo.
(do_merge): Remove call to record_mergeinfo_for_record_only_merge().
git-svn-id: http://svn.collab.net/repos/svn/trunk@30644 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Previously, --record-only merge only set mergeinfo on the merge
target, ignored subtrees with explicit mergeinfo, and did not attempt
any elision. Basically, a "smart propedit" on the the merge target.
After this change, it's still a smart propedit, but it also notices
subtrees with explicit mergeinfo and sets mergeinfo on them as if we
had done a "real" merge, and then it attempts to elide those subtrees'
mergeinfo if possible (again like a "real" merge).
* subversion/libsvn_client/merge.c
(populate_remaining_ranges): Expect that this code may now be invoked
during --record-only merges and in that case follow the same code path
we do when not honoring mergeinfo, i.e. the requested range *is* the
remaining range, no filtering needed.
(record_mergeinfo_for_record_only_merge): Delete, a few minor tweaks to
do_file_merge(), do_directory_merge(), and their helpers is adequate to
replace this while also implementing the new --record-only functionality.
(do_file_merge, do_directory_merge): Expect that this code may now be
invoked during --record-only merges; if it is, *skip* the actual
merging, but *do* record the merge in mergeinfo.
(do_merge): Remove call to record_mergeinfo_for_record_only_merge().
git-svn-id: http://svn.collab.net/repos/svn/trunk@30644 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Update bash completion script.
* tools/client-side/bash_completion
(): Update with 1.5 command additions/deletions.
Patch by: stylesen
Tweaked by: me
git-svn-id: http://svn.collab.net/repos/svn/trunk@30643 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* tools/client-side/bash_completion
(): Update with 1.5 command additions/deletions.
Patch by: stylesen
Tweaked by: me
git-svn-id: http://svn.collab.net/repos/svn/trunk@30643 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* CHANGES: Add a line about merging from foreign repositories.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30634 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
git-svn-id: http://svn.collab.net/repos/svn/trunk@30634 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Make command-line notifications about merges from foreign repositories
state as much.
(In anticipation of porting this to 1.5.x before 1.5.0 releases, I've
marked the new notification action as new in 1.5. If we don't port
this, we'll need to tweak that to indicate newness as of 1.6.)
* subversion/include/svn_wc.h
(svn_wc_notify_action_t): Add svn_wc_notify_foreign_merge_begin.
* subversion/svn/notify.c
(notify): Handle svn_wc_notify_foreign_merge_begin.
* subversion/libsvn_client/merge.c
(notification_receiver, do_file_merge): When merging from a foreign
repository, use svn_wc_notify_foreign_merge_begin instead of
svn_wc_notify_merge_begin.
* subversion/tests/cmdline/svntest/main.py
(merge_notify_line): Add 'foreign' parameter, and use it to tweak
the expected begin merge notification lines.
* subversion/tests/cmdline/update_tests.py
(mergeinfo_update_elision): Update call to merge_notify_line().
* subversion/tests/cmdline/merge_tests.py
(expected_merge_output): Add 'foreign' parameter, passed to
updated calls to svntest.main.merge_notify_line().
(foreign_repos_does_not_update_mergeinfo): Was
diff_repos_does_not_update_mergeinfo. Fix description to refer to
foreign repository. Update calls to expected_merge_output().
(test_list): Track rename of test function.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30633 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
state as much.
(In anticipation of porting this to 1.5.x before 1.5.0 releases, I've
marked the new notification action as new in 1.5. If we don't port
this, we'll need to tweak that to indicate newness as of 1.6.)
* subversion/include/svn_wc.h
(svn_wc_notify_action_t): Add svn_wc_notify_foreign_merge_begin.
* subversion/svn/notify.c
(notify): Handle svn_wc_notify_foreign_merge_begin.
* subversion/libsvn_client/merge.c
(notification_receiver, do_file_merge): When merging from a foreign
repository, use svn_wc_notify_foreign_merge_begin instead of
svn_wc_notify_merge_begin.
* subversion/tests/cmdline/svntest/main.py
(merge_notify_line): Add 'foreign' parameter, and use it to tweak
the expected begin merge notification lines.
* subversion/tests/cmdline/update_tests.py
(mergeinfo_update_elision): Update call to merge_notify_line().
* subversion/tests/cmdline/merge_tests.py
(expected_merge_output): Add 'foreign' parameter, passed to
updated calls to svntest.main.merge_notify_line().
(foreign_repos_does_not_update_mergeinfo): Was
diff_repos_does_not_update_mergeinfo. Fix description to refer to
foreign repository. Update calls to expected_merge_output().
(test_list): Track rename of test function.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30633 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
New merge test for issue #3174 'Merge algorithm chokes on subtrees needing
special attention that have been renamed'
* subversion/tests/cmdline/merge_tests.py
(merge_chokes_on_renamed_subtrees): New.
(test_list): Add merge_chokes_on_renamed_subtrees, mark as XFail.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30632 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
special attention that have been renamed'
* subversion/tests/cmdline/merge_tests.py
(merge_chokes_on_renamed_subtrees): New.
(test_list): Add merge_chokes_on_renamed_subtrees, mark as XFail.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30632 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* www/svn_1.5_releasenotes.html:
Followup to r30600: Fix a mismatched closing div tag.
Found by: Daniel Shahaf <d.s@daniel.shahaf.co.il>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30631 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Followup to r30600: Fix a mismatched closing div tag.
Found by: Daniel Shahaf <d.s@daniel.shahaf.co.il>
git-svn-id: http://svn.collab.net/repos/svn/trunk@30631 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_wc/README: Document another reason why the 'copied'
field in the entries file may be set. Insight based on discussion
with Erik Huelsmann on IRC.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30630 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
field in the entries file may be set. Insight based on discussion
with Erik Huelsmann on IRC.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30630 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Allow opt-out of replay rejections.
* mod_dontdothat/mod_dontdothat.c:
(dontdothat_config_rec): Add no_replay flag to config entry.
(create_dontdothat_dir_config): Initialize to 1.
(start_element): respect no_replay in config when rejecting replay requests.
* mod_dontdothat/README:
Document the DontDoThatDisallowReplay directive.
Submitted by: clkao
Reviewed/tweaked by: jerenkrantz
git-svn-id: http://svn.collab.net/repos/svn/trunk@30629 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* mod_dontdothat/mod_dontdothat.c:
(dontdothat_config_rec): Add no_replay flag to config entry.
(create_dontdothat_dir_config): Initialize to 1.
(start_element): respect no_replay in config when rejecting replay requests.
* mod_dontdothat/README:
Document the DontDoThatDisallowReplay directive.
Submitted by: clkao
Reviewed/tweaked by: jerenkrantz
git-svn-id: http://svn.collab.net/repos/svn/trunk@30629 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_client/merge.c
(drive_merge_report_editor): Fix some formatting and avoid
unnecessary indentation. (Ultimately, no logical changes.)
git-svn-id: http://svn.collab.net/repos/svn/trunk@30628 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(drive_merge_report_editor): Fix some formatting and avoid
unnecessary indentation. (Ultimately, no logical changes.)
git-svn-id: http://svn.collab.net/repos/svn/trunk@30628 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Since r30210, the reporter aborts its editor on error, so svnserve
shouldn't try to do so as well.
* subversion/svnserve/serve.c
(accept_report): No double abortions.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30618 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
shouldn't try to do so as well.
* subversion/svnserve/serve.c
(accept_report): No double abortions.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30618 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* tools/dist/roll.sh:
When checking for changes to CHANGES, use 'diff --summarize', and ignore
property differences.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30612 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
When checking for changes to CHANGES, use 'diff --summarize', and ignore
property differences.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30612 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add a merge test for part of issue #3067.
See http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc5
* subversion/tests/cmdline/merge_tests.py
(dont_merge_revs_into_subtree_that_predate_it): New test.
(test_list): Add dont_merge_revs_into_subtree_that_predate_it, mark as
XFail.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30607 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
See http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc5
* subversion/tests/cmdline/merge_tests.py
(dont_merge_revs_into_subtree_that_predate_it): New test.
(test_list): Add dont_merge_revs_into_subtree_that_predate_it, mark as
XFail.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30607 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
French translation update for r30605.
* subversion/po/fr.po: po-update + 11 fuzzy and 4 new.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30606 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/po/fr.po: po-update + 11 fuzzy and 4 new.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30606 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* www/svn_1.5_releasenotes.html
Followup to r30109: Fix mismatched ending-div tags. There is still one
more lurking in here somewhere.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30600 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Followup to r30109: Fix mismatched ending-div tags. There is still one
more lurking in here somewhere.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30600 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* www/faq.html:
Fix validation errors.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30599 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix validation errors.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30599 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
JavaHL: Add missing mapping for Replaced action.
[ in subversion/bindings/javahl/ ]
* src/org/tigris/subversion/javahl/NotifyAction.java
(update_replaced, actionNames): Added value for replaced action.
* native/EnumMapper.cpp
(mapNotifyAction): Added mapping for replaced action.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30597 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
[ in subversion/bindings/javahl/ ]
* src/org/tigris/subversion/javahl/NotifyAction.java
(update_replaced, actionNames): Added value for replaced action.
* native/EnumMapper.cpp
(mapNotifyAction): Added mapping for replaced action.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30597 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
JavaHL: Follow up to r30544: remove changelist_failed text
string from actionNames array.
[ in subversion/bindings/javahl/ ]
* src/org/tigris/subversion/javahl/NotifyAction.java
(actionNames): Remove changelist_failed text string.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30591 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
string from actionNames array.
[ in subversion/bindings/javahl/ ]
* src/org/tigris/subversion/javahl/NotifyAction.java
(actionNames): Remove changelist_failed text string.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30591 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add New Feature Compatibility Table.
* www/svn_1.5_releasenotes.html
Added New Feature Compatibility Table to Compatibility Concerns section.
Patch by: Kyle McKay <mackyle@tigris.org>
Tweaked by: me
git-svn-id: http://svn.collab.net/repos/svn/trunk@30588 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* www/svn_1.5_releasenotes.html
Added New Feature Compatibility Table to Compatibility Concerns section.
Patch by: Kyle McKay <mackyle@tigris.org>
Tweaked by: me
git-svn-id: http://svn.collab.net/repos/svn/trunk@30588 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix the svn_repos_node_location_segments() API as exposed through the
Python bindings.
* subversion/bindings/swig/svn_repos.i
Employ a typemap for the svn_location_segment_receiver_t callback type.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30583 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Python bindings.
* subversion/bindings/swig/svn_repos.i
Employ a typemap for the svn_location_segment_receiver_t callback type.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30583 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Simplified chinese translation update.
* COMMITTERS: Update my email address.
* subversion/po/zh_CN.po: Update to r30574.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30577 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* COMMITTERS: Update my email address.
* subversion/po/zh_CN.po: Update to r30574.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30577 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* build/ac-macros/neon.m4
(SVN_NEON_CONFIG): Set NEON_LIBS to `$neon_config --libs 2>/dev/null` if
`$neon_config --la-file 2>/dev/null` prints nothing.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30574 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(SVN_NEON_CONFIG): Set NEON_LIBS to `$neon_config --libs 2>/dev/null` if
`$neon_config --la-file 2>/dev/null` prints nothing.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30574 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add missing 'remove-prop' element(s) in update-report with send-all=false.
The update report code assumes that when a file or dir is added, it can't get
any properties removed at the same time, but this situation can happen if the
file/dir was copied from another file/dir.
This fixes update test 41 over ra_serf.
* subversion/mod_dav_svn/reports/update.c
(struct item_baton_t): Add new member copyfrom.
(add_helper): Set the copyfrom flag if this file/dir is a copy of another.
(close_helper): Send remove-prop element(s) when the file/dir was copied.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30573 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
The update report code assumes that when a file or dir is added, it can't get
any properties removed at the same time, but this situation can happen if the
file/dir was copied from another file/dir.
This fixes update test 41 over ra_serf.
* subversion/mod_dav_svn/reports/update.c
(struct item_baton_t): Add new member copyfrom.
(add_helper): Set the copyfrom flag if this file/dir is a copy of another.
(close_helper): Send remove-prop element(s) when the file/dir was copied.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30573 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Fix SubversionExceptions.args to be consistent with 1.4 when an error number
but no message is specified.
* subversion/bindings/swig/python/tests/core.py
(test_SubversionException): Add test for creating exception with only apr_err.
* subversion/bindings/swig/python/svn/core.py
(SubversionException.__init__): Fix value of self.args when only apr_err is
present.
Review by: epg
git-svn-id: http://svn.collab.net/repos/svn/trunk@30569 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
but no message is specified.
* subversion/bindings/swig/python/tests/core.py
(test_SubversionException): Add test for creating exception with only apr_err.
* subversion/bindings/swig/python/svn/core.py
(SubversionException.__init__): Fix value of self.args when only apr_err is
present.
Review by: epg
git-svn-id: http://svn.collab.net/repos/svn/trunk@30569 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Follow up to r30544. Fix segfault due to doubly clearing the error.
* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
(svn_swig_rb_notify_func2): Don't svn_clear_error as the invoker of the
callback now handles this.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30567 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
(svn_swig_rb_notify_func2): Don't svn_clear_error as the invoker of the
callback now handles this.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30567 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Add support for setting auth parameters with svn_auth_ssl_server_cert_info_t
values and add test for svn.auth.get_ssl_server_trust_prompt_provider.
* subversion/bindings/swig/core.i
(svn_auth_set_parameter): Support svn_auth_ssl_server_cert_info_t values.
* subversion/bindings/swig/python/tests/auth.py
(test_set_parameter): Add test for svn_auth_ssl_server_cert_info_t values.
(test_credentials_get_ssl_server_trust): Add test for
svn.auth.get_ssl_server_trust_prompt_provider.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30566 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
values and add test for svn.auth.get_ssl_server_trust_prompt_provider.
* subversion/bindings/swig/core.i
(svn_auth_set_parameter): Support svn_auth_ssl_server_cert_info_t values.
* subversion/bindings/swig/python/tests/auth.py
(test_set_parameter): Add test for svn_auth_ssl_server_cert_info_t values.
(test_credentials_get_ssl_server_trust): Add test for
svn.auth.get_ssl_server_trust_prompt_provider.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30566 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Allow setting apr_uint32_t pointer auth parameter values from Python rather
than direct longs since that's what all current integer auth parameters use.
* subversion/bindings/swig/core.i
(svn_auth_set_parameter): Accept Python integers as apr_uint32_t pointers.
* subversion/bindings/swig/python/tests/auth.py
(test_set_parameter): Add test setting parameter with integer value.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30565 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
than direct longs since that's what all current integer auth parameters use.
* subversion/bindings/swig/core.i
(svn_auth_set_parameter): Accept Python integers as apr_uint32_t pointers.
* subversion/bindings/swig/python/tests/auth.py
(test_set_parameter): Add test setting parameter with integer value.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30565 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Allow None as value for auth parameters set from Python.
* subversion/bindings/swig/python/core.i:
Remove double comment opening.
(svn_auth_set_parameter): Allow None as value.
* subversion/bindings/swig/python/tests/auth.py
(test_set_parameter): Check None is accepted as input value.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30564 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/bindings/swig/python/core.i:
Remove double comment opening.
(svn_auth_set_parameter): Allow None as value.
* subversion/bindings/swig/python/tests/auth.py
(test_set_parameter): Check None is accepted as input value.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30564 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* tools/dist/construct-rolling-environment.sh: Update to Autoconf 2.62.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30563 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
git-svn-id: http://svn.collab.net/repos/svn/trunk@30563 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Updated comment on apr-util bug after discussion on the apr-dev list.
* subversion/libsvn_ra_serf/serf.c
(svn_ra_serf__open): update comment. Seems that the code in apr_uri_parse
is behaving as expected, but the function description in the comments is
wrong.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30561 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/libsvn_ra_serf/serf.c
(svn_ra_serf__open): update comment. Seems that the code in apr_uri_parse
is behaving as expected, but the function description in the comments is
wrong.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30561 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Polish translation update.
* subversion/po/pl.po: Polish translation update.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30559 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* subversion/po/pl.po: Polish translation update.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30559 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
One more follow-up to r30548.
* configure.ac
Don't require non-yes argument for --with-junit.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30552 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* configure.ac
Don't require non-yes argument for --with-junit.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30552 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Follow-up to r30548, doing this correctly now.
* Makefile.in
(javahl): Depend on @JAVAHL_TESTS_TARGET@ not javahl-tests .
* configure.ac
Reinstate JAVAHL_TESTS_TARGET but fix bug where this defined it when
configured with --without-junit or --with-junit=no .
git-svn-id: http://svn.collab.net/repos/svn/trunk@30551 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
* Makefile.in
(javahl): Depend on @JAVAHL_TESTS_TARGET@ not javahl-tests .
* configure.ac
Reinstate JAVAHL_TESTS_TARGET but fix bug where this defined it when
configured with --without-junit or --with-junit=no .
git-svn-id: http://svn.collab.net/repos/svn/trunk@30551 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a