Referend issues which has not been noted: Refer issue #3089 r29358 Refer issue #3102 r29403 Add a test for issue #3094 (problems around merge source - marked as finished and resolved for r29198, r29214, r29216. r29239 (added) Refer issue #3110 r29580 ============================================================================= - Add an entry for support of neon 0.28 ------------------------------------------------------------------------ r29379 | joe | 2008-02-15 07:29:10 -0500 (Fri, 15 Feb 2008) | 7 lines Add support for neon 0.28: * configure.ac: Add neon 0.28 to list of supported versions. * build/ac-macros/neon.m4 (SVN_NEON_CONFIG, SVN_LIB_NEON): Define SVN_NEON_0_28 for neon 0.28; extend supported version lists by one. ============================================================================= ============================================================================= - Missing entries: ============================================================================= ------------------------------------------------------------------------ - r28955 | cmpilato | 2008-01-18 16:58:54 -0500 (Fri, 18 Jan 2008) | 5 lines Fix a bug in the depth support for 'svn revert': depth-files was trying to crawl into unlocked directories. * subversion/libsvn_wc/adm_ops.c (revert_internal): Don't recurse into subdirectories when at depth files. ------------------------------------------------------------------------ - r29215 | cmpilato | 2008-02-07 02:14:23 -0500 (Thu, 07 Feb 2008) | 5 lines Fix an RA session lifetime issue. * subversion/libsvn_client/log.c (svn_client__get_copy_source): Use a subpool to manage the session lifetime. ------------------------------------------------------------------------ - r28987 | markphip | 2008-01-22 11:12:21 -0500 (Tue, 22 Jan 2008) | 21 lines Followup to r28979: Add mergeReintegrate method to JavaHL. [ in subversion/bindings/javahl/ ] * native/SVNClient.h, native/SVNClient.cpp (mergeReintegrate): Add method and call svn_client_merge_reintegrate. * native/org_tigris_subversion_javahl_SVNClient.cpp (Java_org_tigris_subversion_javahl_SVNClient_mergeReintegrate): Added mergeReintegrate method. * src/org/tigris/subversion/javahl/SVNClientInterface.java, src/org/tigris/subversion/javahl/SVNClient.java, src/org/tigris/subversion/javahl/SVNClientSynchronized.java (mergeReintegrate): Added method. * tests/org/tigris/subversion/javahl/BasicTests.java (testMergeReintegrate): Added test of failure and success scenarios (appendText): tweaked to allow update of file in branch Reviewed by: hwright ------------------------------------------------------------------------ - r29013 | lgo | 2008-01-24 15:56:46 -0500 (Thu, 24 Jan 2008) | 13 lines In svnsync, set the svn:log property on commit if it's available. This saves one revprop change request. * subversion/svnsync/main.c (filter_exclude_date_author_log_sync): Renamed to ... (filter_exclude_date_author_sync): ... this, don't filter out svn:log. (filter_include_date_author_log_sync): Renamed to ... (filter_include_date_author_sync)... this, don't include svn:log. (replay_rev_started): If the svn:log property is set on source, copy it in the commit to the target. (replay_rev_finished): No need to copy the svn:log property, if it's there it was already set during commit. ------------------------------------------------------------------------ - r29243 | epg | 2008-02-08 16:40:59 -0500 (Fri, 08 Feb 2008) | 3 lines * notes/sasl.txt Add a new section documenting GSSAPI configuration. ------------------------------------------------------------------------ - r29252 | kfogel | 2008-02-09 13:49:57 -0500 (Sat, 09 Feb 2008) | 12 lines Make FSFS recovery able to handle the scenarios we meant it to handle, following up to r29175. * subversion/libsvn_fs_fs/fs_fs.c (recover_body): Recover from any obsolete db/current file, not just a missing or r0 db/current file. * subversion/tests/cmdline/svnadmin_tests.py (recover_fsfs): Rewrite to test more scenarios. (fsfs_recover_handle_missing_revs_or_revprops_file): Rewrite for readability and to test somewhat more realistically. ------------------------------------------------------------------------ - r29254 | hwright | 2008-02-09 20:32:31 -0500 (Sat, 09 Feb 2008) | 7 lines Remove the use of a deprecated API. * subversion/libsvn_client/log.c (copyfrom_info_receiver): Update to implement svn_log_entry_receiver_t. (svn_client__get_copy_source): Use svn_client_log4() instead of svn_client_log3(). ------------------------------------------------------------------------ - r29261 | joeswatosh | 2008-02-10 11:37:05 -0500 (Sun, 10 Feb 2008) | 6 lines Follow on to r29208 "Delete svn_client_propget3() and rename svn_client_propget4() to svn_client_propget3()." Updating the Ruby bindings. * subversion/bindings/swig/ruby/svn/client.rb (Svn::Client::Context#propget): Use propget3 instead of propget4. ------------------------------------------------------------------------ - r29271 | pburba | 2008-02-11 15:30:24 -0500 (Mon, 11 Feb 2008) | 4 lines Disallow -r/-c with --reintegrate. * subversion/svn/main.c (main): Return an error is -r/-c is specified with --reintegrate. ------------------------------------------------------------------------ - r29277 | glasser | 2008-02-11 16:17:39 -0500 (Mon, 11 Feb 2008) | 9 lines Followup to r27098: fix potential segfault by using pools correctly. * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__rev_get_root): Keep a string out of a pool that might be cleared. Found by: epg Dan Christian ------------------------------------------------------------------------ - r29412 | glasser | 2008-02-18 14:41:18 -0500 (Mon, 18 Feb 2008) | 52 lines Change some of the SVN-ACTION DAV logging names to match the svnserve command set. Justification: - 1.5 already contains backwards-incompatible changes to the logging format; this (if it gets backported) is a reasonable time to make other bikesheddy changes. - The svnserve command set is a good vocabulary for svn operational actions; there's no reason to have a second vocabulary that is mostly but not entirely the same. - When svnserve grows logging, it would make sense to use its command set as the vocabulary; making these format changes would allow the two servers to share the same log format. The specific changes made: list-dir => get-dir revprop-change => change-rev-prop revprop-list => rev-proplist blame => get-file-revs remote-status => status diff-or-merge => diff (I would also like to get rid of prop-list, and in exchange add props?/text? fields to get-dir and a new get-file.) (It may also be worth logging get-locations and get-location-segments, especially given that the latter has complicated performance characteristics.) * subversion/mod_dav_svn/deadprops.c (save_value): revprop-change => change-rev-prop (db_first-name): revprop-list => rev-proplist * subversion/mod_dav_svn/reports/file-revs.c (dav_svn__file_revs_report): blame => get-file-revs * subversion/mod_dav_svn/reports/update.c (dav_svn__update_report): diff-or-merge => diff * subversion/mod_dav_svn/repos.c (do_walk): list-dir => get-dir * tools/server-side/svn_dav_log_parse.py Update docstring; adjust everywhere. * tools/server-side/test_svn_dav_log_parse.py Adjust everywhere. ------------------------------------------------------------------------ - r29414 | glasser | 2008-02-18 15:08:38 -0500 (Mon, 18 Feb 2008) | 30 lines Change property listing action in the SVN-ACTION DAV logging names to match the svnserve command set. Specifically, remove the prop-list command; add "props" and "text" flags to the get-dir action; and create a get-file action like the get-dir one. mod_dav_svn never logs a "get-file P rR text" action, but that's OK. (See also r29412.) * subversion/mod_dav_svn/deadprops.c (db_first_name): Change "prop-list" SVN-ACTION to "get-dir props" or "get-file props". * subversion/mod_dav_svn/repos.c (do_walk): Add "text" to get-dir SVN-ACTION. * tools/server-side/svn_dav_log_parse.py Update docstring. (_parse_get_dir): Adjust. (_parse_get_file): New. (_parse_prop_list): Remove. * tools/server-side/test_svn_dav_log_parse.py (TestCase.get_dir_or_file): Extract from test_get_dir. (TestCase.test_get_dir): Now a wrapper around get_dir_or_file. (TestCase.test_get_file): New. (TestCase.test_prop_list): Remove. (Test.handle_get_dir): Adjust. (Test.handle_get_file): New. (Test.handle_prop_list): Remove. ------------------------------------------------------------------------ - r29418 | glasser | 2008-02-18 18:05:59 -0500 (Mon, 18 Feb 2008) | 14 lines Fix a potential hang in svnserve/ra_svn. The specific case that triggered this was running svnsync replaying from a 1.4.x svnserve, and doing a SIGINT. Generally, the "failure" in the pipelined editor written from the client to the server happened "too late" for the server to abort the edit. Found by: lgo * subversion/libsvn_ra_svn/editorp.c (svn_ra_svn_drive_editor2): If we sent an error to the other side, consider a "success" from the other side to be the end of the commands to discard, as well as an "abort-edit". ------------------------------------------------------------------------ - r29421 | joe | 2008-02-19 04:24:17 -0500 (Tue, 19 Feb 2008) | 18 lines Enable PKCS#11 (smartcard) support with neon 0.28: * subversion/libsvn_ra_neon/session.c [SVN_NEON_0_28]: Include ne_pkcs11.h (cleanup_p11provider, client_ssl_pkcs11_pin_entry): New functions. (get_server_settings): Add and handle the pk11_provider parameter. (svn_ra_neon__open): Fetch the PKCS#11 provider from the config file; if specified, initialize and set up the provider and PIN callback for both sessions, along with the cleanup. * subversion/libsvn_ra_neon/ra_neon.h: Add p11pin_iterstate field to svn_ra_neon__session_t structure. * subversion/include/svn_config.h: Add ssl-pkcs11-provider option. * subversion/libsvn_subr/config_file.c (svn_config_ensure): Document new ssl-pkcs11-provider config option. ------------------------------------------------------------------------ - r29440 | pburba | 2008-02-20 09:58:39 -0500 (Wed, 20 Feb 2008) | 14 lines Fix for reopened issue #2973, revert of a changeset rX on a target with merge history from same target does not work. A reverse merge to a path from that path's own history may no-op in some common mixed-rev WC situations, e.g. you make a change in rN then immediately reverse merge rN. If rN *didn't* affect the merge target, then the target's working revision is still < N and the merge will no-op. An update is needed for the reverse merge to work, so give a warning suggesting this. * subversion/libsvn_client/merge.c (calculate_remaining_ranges): Give a warning to the user that an update might be required to accomplish what they want. Suggested by: cmpilato ------------------------------------------------------------------------ - r29486 | glasser | 2008-02-21 16:38:48 -0500 (Thu, 21 Feb 2008) | 5 lines Allow "-R" to be passed to "svn changelist", which supports --depth. * subversion/svn/main.c (svn_cl__cmd_table): Add 'R' to "changelist" entry. ------------------------------------------------------------------------ - r29492 | epg | 2008-02-21 17:59:42 -0500 (Thu, 21 Feb 2008) | 22 lines Support --with-revprop in svnmucc. * contrib/client-side/svnmucc/svnmucc.c (commit_callback): Upgrade to svn_commit_callback2_t interface. (execute): Take revprops hash instead of log message argument and pass along to svn_ra_get_commit_editor3, not svn_ra_get_commit_editor. (usage): Document --with-revprop option. (main): Parse --with-revprop option, integrate with log message options, and pass along to execute. * subversion/libsvn_subr/opt.c (svn_opt_parse_revprop): Move parse_revprop from subversion/svn/main.c here; rename revprop_pair to revprop_spec, as it's not a pair of revprops. * subversion/include/svn_opt.h (svn_opt_parse_revprop): Declare. * subversion/svn/main.c (parse_revprop): Remove. (main): Use svn_opt_parse_revprop instead of parse_revprop. ------------------------------------------------------------------------ - r29544 | cmpilato | 2008-02-22 15:52:02 -0500 (Fri, 22 Feb 2008) | 11 lines Poor man's long-option aliasing, introducing --cl as an alias for --changelist. * subversion/svn/main.c (svn_cl__options): Add --cl as a long-opt alias, and note this alias in --changelist's description. * subversion/libsvn_subr/opt.c (print_command_info, print_command_info2): Don't print options with NULL descriptions. ------------------------------------------------------------------------ - r29201 | kou | 2008-02-06 08:11:07 -0500 (Wed, 06 Feb 2008) | 8 lines The Ruby bindings work with SWIG 1.3.33. * subversion/bindings/swig/include/svn_types.swg (%typemap(freearg) apr_pool_t *pool): - Use freearg instead of argout to support SWIG 1.3.33. - Use vresult directly instead of $result because we've already used vresult in svn_global.swg. ------------------------------------------------------------------------ - r29427 | cmpilato | 2008-02-19 08:25:37 -0500 (Tue, 19 Feb 2008) | 2 lines Request that full-committer acceptance by existing partial committers still contact the svnadmin@ account now that we are using authz on the server.