[[[[ tkoski ]]]] ------------------------------------------------------------------------ r31077 | pburba | 2008-05-07 22:36:56 +0200 (Wed, 07 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31059, 31060, 31061, 31075, fix for issue #3157. ------------------------------------------------------------------------ r31081 | cmpilato | 2008-05-08 07:23:02 +0200 (Thu, 08 May 2008) | 18 lines Changed paths: M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py Miscellanous visual improvements to svnmerge-migrate-history.py (which are helping me to make actual logic improvements as well). Add --dry-run support, and refactor the progress output mechanism. Also, silence the warnings about the deprecate 'sre' module. * contrib/client-side/svnmerge/svnmerge-migrate-history.py (): Import warnings, and shush sre DeprecationWarnings. (Migrator.__init__): New, created from the instance variable initializations that were there, plus the initialization of the self.dry_run variable. (Migrator.log): New. (Migrator.convert_path_history): Use self.log() instead of checking the verbose flag before every print statement. Also, don't do repository-changing stuff if self.dry_run is set. (usage_and_exit): Note new --dry-run option. (main): Parse new --dry-run option. Drop support for the unused --from-paths option. ------------------------------------------------------------------------ r31082 | cmpilato | 2008-05-08 08:46:17 +0200 (Thu, 08 May 2008) | 23 lines Changed paths: M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-test.sh Teach svnmerge-migrate-history.py to remove natural history from the mergeinfo it stores in the repository. (This can be disabled using a new --naive-mode switch.) * contrib/client-side/svnmerge/svnmerge-migrate-history.py (usage_and_exit): Note new --naive-mode option, and reformat for readability. (Migrator.__init__): Initialization self.naive_mode. (Migrator.run): Squirrel away the repository object in self.repos. (Migrator.convert_path_history): Rework this to operate primarily on mergeinfo, not mergeinfo string representations. Do so using the new svnmerge_prop_to_mergeinfo() and mergeinfo_merge() functions. Also, when not in naive_mode, use get_natural_history() to fetch the target path's natural history, and remove that from the explicit mergeinfo. (Migrator.add_to_mergeinfo): Removed. (Migrator.svnmerge_prop_to_mergeinfo, Migrator.mergeinfo_merge, Migrator.get_natural_history): New functions. (main): Parse new --naive-mode option. * contrib/client-side/svnmerge/svnmerge-migrate-test.sh Fix a hard-code $HOME path, and run the migration using --naive-mode. ------------------------------------------------------------------------ r31085 | arfrever | 2008-05-08 13:25:27 +0200 (Thu, 08 May 2008) | 11 lines Changed paths: M /branches/kwallet/subversion/libsvn_subr/simple_providers.c M /branches/kwallet/subversion/libsvn_subr_kwallet/kwallet.cpp On the 'kwallet' branch: * subversion/libsvn_subr/simple_providers.c (SVN_AUTH__KWALLET_PASSWORD_TYPE): Define. (svn_auth__simple_save_creds_helper): Add SVN_AUTH__KWALLET_PASSWORD_TYPE to the list of encrypted password types. * subversion/libsvn_subr_kwallet/kwallet.cpp (kwallet_password_get, kwallet_password_set): s/\0//. (kwallet_password_set): Return TRUE when password was successfully stored. ------------------------------------------------------------------------ r31086 | kameshj | 2008-05-08 13:54:31 +0200 (Thu, 08 May 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Fix the XFail test expectations for issue #3067 test as per fix to issue #3157 (r31075). * subversion/tests/cmdline/merge_tests.py (dont_merge_revs_into_subtree_that_predate_it): Fix the expectations about /H_COPY and H_COPY/nu. ------------------------------------------------------------------------ r31088 | kameshj | 2008-05-08 16:24:28 +0200 (Thu, 08 May 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Fix the comment for issue #3067 test as per fix to issue #3157 (r31075). * subversion/tests/cmdline/merge_tests.py (dont_merge_revs_into_subtree_that_predate_it): Remove the comment that stated H_COPY/nu's mergeinfo elides to H_COPY. ------------------------------------------------------------------------ r31090 | kameshj | 2008-05-08 17:36:20 +0200 (Thu, 08 May 2008) | 11 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Extend issue #3067 test to cover the following case. 'When subtree with differing mergeinfo has been deleted at revision2(in case of forward merge of revision1:revision2), system should somehow identify the correct line of history' or atleast should be smart enough to understand the situation. * subversion/tests/cmdline/merge_tests.py (dont_merge_revs_into_subtree_that_predate_it): Extend the test as explained above. ------------------------------------------------------------------------ r31100 | kfogel | 2008-05-08 21:39:31 +0200 (Thu, 08 May 2008) | 6 lines Changed paths: M /trunk/subversion/include/svn_subst.h * subversion/include/svn_subst.h (svn_subst_translate_stream3): Fix doc string to say SVN_KEYWORD_MAX_LEN instead of obsolete SVN_IO_MAX_KEYWORD_LEN. Follows up to r765. Patch by: Larry Shatzer, Jr. ------------------------------------------------------------------------ r31101 | kfogel | 2008-05-08 22:26:46 +0200 (Thu, 08 May 2008) | 30 lines Changed paths: M /trunk/subversion/include/svn_wc.h M /trunk/subversion/libsvn_client/add.c M /trunk/subversion/libsvn_client/copy.c M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/libsvn_wc/adm_ops.c M /trunk/subversion/libsvn_wc/copy.c M /trunk/subversion/tests/cmdline/depth_tests.py Introduce svn_wc_add3(), which takes a depth parameter. This makes 'svn add --depth' work the same way as commit, update, etc. Patch by: Guo Rui * subversion/include/svn_wc.h, subversion/libsvn_wc/adm_ops.c (svn_wc_add3): New function. (svn_wc_add2): Deprecate. * subversion/libsvn_wc/copy.c (copy_added_file_administratively, copy_added_dir_administratively, copy_dir_administratively): Call svn_wc_add3 now. * subversion/libsvn_client/merge.c (merge_dir_added): Call svn_wc_add3 now. * subversion/libsvn_client/copy.c (repos_to_wc_copy_single): Call svn_wc_add3 now. * subversion/libsvn_client/add.c (add_file, add_dir_recursive, add_parent_dirs): Call svn_wc_add3 now. (add): Same, and always call add_dir_recursive for directories. Add braces to conditional chain, for readability. (svn_cl__make_local_parents): Call svn_client_add4 with svn_depth_infinity. * subversion/tests/cmdline/depth_tests.py (add_tree_with_depth): New name for add_tree_with_depth_files. Verify the depth, and test --force and --parents. (test_list): Adjust accordingly. ------------------------------------------------------------------------ r31103 | kfogel | 2008-05-08 22:39:09 +0200 (Thu, 08 May 2008) | 5 lines Changed paths: M /trunk/subversion/include/svn_wc.h * subversion/include/svn_wc.h (svn_wc_add3): New in 1.6, not 1.5. (This follows up to r31101.) Found by: hwright ------------------------------------------------------------------------ r31106 | hwright | 2008-05-09 01:43:19 +0200 (Fri, 09 May 2008) | 38 lines Changed paths: M /branches/fs-rep-sharing/subversion/include/svn_checksum.h M /branches/fs-rep-sharing/subversion/include/svn_io.h M /branches/fs-rep-sharing/subversion/libsvn_fs/fs-loader.c M /branches/fs-rep-sharing/subversion/libsvn_fs_base/reps-strings.c M /branches/fs-rep-sharing/subversion/libsvn_subr/checksum.c M /branches/fs-rep-sharing/subversion/libsvn_subr/stream.c M /branches/fs-rep-sharing/subversion/tests/libsvn_fs/fs-test.c On the fs-rep-sharing branch: Update a couple more APIs to use our usual output semantics. Followup to r31092. * subversion/libsvn_fs_base/reps-strings.c (rep_read_baton, txn_body_read_rep, rep_write_get_baton, rep_write_close_contents): Update use of checksum ctx APIs. * subversion/include/svn_io.h (svn_stream_checksummed2): Use double pointers to return the resultant checksums and also allow the caller to indicate the type of checksum required. * subversion/include/svn_checksum.h (svn_checksum_ctx_create): Accept the checksum kind as an argument. (svn_checksum_final): Take a pool and a pointer to return the resultant checksum through. * subversion/libsvn_fs/fs-loader.c (svn_fs_file_checksum): When forced, don't create an interim checksum, just pass the double pointer to the checksumming stream. * subversion/libsvn_subr/stream.c (checksum_stream_baton): Store double pointers as output values. (close_handler_checksum, svn_stream_checksummed2): Use the new checksum ctx APIs. (svn_stream_checksummed): Update wrapper. * subversion/libsvn_subr/checksum.c (svn_checksum_ctx_t): Only store the kind of checksum requested. (svn_checksum_ctx_create): Store the type of desired checksum, not the checksum itself. (svn_checksum_update): Update to use the new baton value. (svn_checksum_final): Use a double pointer to output the final checksum. * subversion/tests/libsvn_fs/fs-test.c (get_file_checksum): Update call to svn_stream_checksummed2(). ------------------------------------------------------------------------ r31107 | jerenkrantz | 2008-05-09 05:55:23 +0200 (Fri, 09 May 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/serf.c ra_serf: Fix API bug when fetched_rev is non-NULL and revision is invalid. Found by: epg * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__get_dir): When we don't have a peg-rev, figure out what the latest revision is so we do the baseline-collection search on the right URL. ------------------------------------------------------------------------ r31121 | stsp | 2008-05-11 11:44:08 +0200 (Sun, 11 May 2008) | 37 lines Changed paths: M /trunk/configure.ac M /trunk/subversion/libsvn_subr/path.c M /trunk/subversion/tests/libsvn_subr/path-test.c Remove assertions and other debugging code ifdef'd with NDEBUG if debugging is not enabled at compile time. So far, this code was always compiled in, even in releases. In path handling functions, assert that paths supplied are canonical when debugging is enabled. This isn't new, some functions already did so before this change, but now it is consistent, and together with the above change, doing this now actually makes sense. * subversion/libsvn_subr/path.c (is_canonical): Document, extend a little, and rewrite partly for obviousness. This function has been around for much longer than svn_path_is_canonical, and tries to provide the same functionality, but does not quite match up. Confine its use to functions that don't have a pool around. (svn_path_join, svn_path_join_many, svn_path_add_component, svn_path_remove_component, svn_path_dirname, svn_path_basename, svn_path_is_empty, svn_path_compare_paths, svn_path_is_child, svn_path_decompose, svn_path_is_single_path_component, svn_path_split_if_file): When debugging is enabled, assert that paths supplied are canonical, using svn_path_is_canonical if possible, otherwise using is_canonical. The API requires all paths supplied to be canonical. Some of these functions have already done the same assertion with is_canonical before, but for a few the assertion was commented out because the call to strlen involved was considered expensive ...eh? This is debugging code, it's not supposed to perform well, it's a safety net. * subversion/tests/libsvn_subr/path-test.c (test_is_single_path_component): Don't use a non-canonical path in test set, the API being tested here does not support this. This was only working because the assertion in the function being tested was commented out. * configure.ac: Compile with -DNDEBUG if debugging is off. ------------------------------------------------------------------------ r31128 | kfogel | 2008-05-12 04:42:24 +0200 (Mon, 12 May 2008) | 15 lines Changed paths: M /trunk/www/tools_contrib.html * www/tools_contrib.html (getsigs.pl): Update URL. (svn-obliterate.py, check-case-insensitive.py): Remove mention of these obsolete scripts. [Actually, I left some bits of check-case-insensitive.py and had to follow up with r31129.] Found by: Trevor Johns http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=77607 From: Trevor Johns To: users@subversion.tigris.org Subject: Broken Links In www/tools_contrib.html Date: Sun, 11 May 2008 19:24:05 -0700 Message-Id: ------------------------------------------------------------------------ r31130 | kfogel | 2008-05-12 08:15:48 +0200 (Mon, 12 May 2008) | 5 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r31126, and fix its description (copy-&-pasto in r31127). Found by: Peter Samuelson (That is, he noticed the description problem -- he didn't "find" my vote!) ------------------------------------------------------------------------ r31138 | danielsh | 2008-05-12 19:03:44 +0200 (Mon, 12 May 2008) | 22 lines Changed paths: M /trunk/subversion/include/svn_repos.h M /trunk/subversion/libsvn_repos/fs-wrap.c M /trunk/subversion/tests/cmdline/prop_tests.py Validate svn:date property values in libsvn_repos. Suggested by: sussman Review by: kfogel * subversion/include/svn_repos.h (svn_repos_fs_change_rev_prop3): Document that the property name and value are validated. (It was validating the name before this change as well.) * subversion/libsvn_repos/fs-wrap.c (svn_time.h): Include. (validate_prop): Add optional 'value' and 'pool' parameters. Extend to validate the value for svn:* properties (currently only 'svn:date'). (svn_repos_fs_change_node_prop, svn_repos_fs_change_txn_props, svn_repos_fs_change_rev_prop3): Pass pool and property value to validate_prop(). * subversion/tests/cmdline/prop_tests.py (invalid_propvalues): New test. (test_list): Run new test. ------------------------------------------------------------------------ r31151 | pburba | 2008-05-13 18:23:47 +0200 (Tue, 13 May 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Follow-up to r31057, the fix for issue #3157, fix a bug when filtering natural history for subtrees. * subversion/libsvn_client/merge.c (do_directory_merge): When filtering mergeinfo from a subtree's natural history use the repository relative merge source path for the subtree, *not* the merge target's; the latter won't filter anything. * subversion/tests/cmdline/merge_tests.py (dont_explicitly_record_implicit_mergeinfo): Expand this test so it covers this bug. Also do our standard "merge kludge" thing. ------------------------------------------------------------------------ r31153 | cmpilato | 2008-05-13 19:23:37 +0200 (Tue, 13 May 2008) | 19 lines Changed paths: M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-test.sh Use the natural history of the claimed merge sources as a filter to avoid storing bogus migrated mergeinfo. (Read: "Too bad svnmerge.py is rename- and history-ignorant.") * contrib/client-side/svnmerge/svnmerge-migrate-history.py (mergeinfo2str): New convenience shortcut. (Migrator.flatten_prop): New helper function. (Migrator.convert_path_history): Use flatten_prop() for more readable output. Now, when not in "naive mode", use the natural history of the merge sources to ensure only valid stuff gets into the final to-be-stored mergeinfo. (Migrator.get_natural_history): Now accepts a lower-bounds revision. Callers updated. * contrib/client-side/svnmerge/svnmerge-migrate-test.sh Basically, rewrite this whole thing to not use bogus mergeinfo, and to allow for two passes -- one in naive-mode, one not. ------------------------------------------------------------------------ r31157 | danielsh | 2008-05-13 21:17:55 +0200 (Tue, 13 May 2008) | 4 lines Changed paths: M /trunk/subversion/tests/cmdline/prop_tests.py Followup to r31138. * subversion/tests/cmdline/prop_tests.py (test_list): Mark invalid_propvalues as XFail over DAV. ------------------------------------------------------------------------ r31159 | kfogel | 2008-05-13 21:53:12 +0200 (Tue, 13 May 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_wc/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Fix "file not found" error when a merge target is a broken symbolic link. Patch by: David O'Shea * subversion/libsvn_wc/merge.c (svn_wc__merge_internal): Diff against detranslated file if the target is "special". * subversion/tests/cmdlink/merge_tests.py (merge_broken_link): New test function. (test_list): Call the new test function. ------------------------------------------------------------------------ r31161 | julianfoad | 2008-05-14 13:26:08 +0200 (Wed, 14 May 2008) | 12 lines Changed paths: M /branches/tree-conflicts/subversion/tests/libsvn_wc/tree-conflict-data-test.c M /branches/tree-conflicts/subversion/tests/libsvn_wc/tree-conflict-human-readable-test.c Fix some tree-conflict tests that were failing just because of a mis-match of expectations with the current implementation. * subversion/tests/libsvn_wc/tree-conflict-data-test.c (test_write_invalid_tree_conflicts): To specify an invalid action or reason, use a silly number instead of a symbolic constant that the implementation might now or in future handle as a valid argument. * subversion/tests/libsvn_wc/tree-conflict-human-readable-test.c (test_get_one_human_readable_tree_conflict_description, write_test_expected_output): Update the expected output text to match the current implementation. ------------------------------------------------------------------------ r31162 | cmpilato | 2008-05-14 16:20:05 +0200 (Wed, 14 May 2008) | 11 lines Changed paths: M /trunk/subversion/libsvn_subr/path.c M /trunk/subversion/tests/libsvn_subr/path-test.c Fix a bug which caused filenames with a single character before the extension to not split correctly. * subversion/libsvn_subr/path.c (svn_path_splitext): Fix an off-by-one error. * subversion/tests/libsvn_subr/path-test.c (test_splitext): Update test to cover the bug fixed here. Found by: MsShu ------------------------------------------------------------------------ r31169 | julianfoad | 2008-05-14 19:38:08 +0200 (Wed, 14 May 2008) | 12 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/tree_conflict_tests.py Tweak the tree conflicts test harness for a bit more self-consistency. Suggested by: Stephen Butler * subversion/tests/cmdline/tree_conflict_tests.py (modify): Rename action 'fT' to 'ft' because it's not a Subversion action which the capital 'T' implied it was. Make actions 'fA' and 'dA' do just the "svn add" without first creating the file/dir, since creation can already be done with 'fa' and 'da'. This enables us to write tests that add an existing file or directory. Elsewhere: Adjust usage accordingly. There is no overall functional change. ------------------------------------------------------------------------ r31171 | arfrever | 2008-05-14 20:38:27 +0200 (Wed, 14 May 2008) | 15 lines Changed paths: M /branches/kwallet/build.conf M /branches/kwallet/subversion/include/svn_auth_kwallet.h A /branches/kwallet/subversion/libsvn_auth_kwallet (from /branches/kwallet/subversion/libsvn_subr_kwallet:31170) M /branches/kwallet/subversion/libsvn_subr/cmdline.c D /branches/kwallet/subversion/libsvn_subr_kwallet On the 'kwallet' branch: Rename the 'libsvn_subr_kwallet' library to 'libsvn_auth_kwallet'. * build.conf (libsvn_subr_kwallet): Rename from this ... (libsvn_auth_kwallet): ... to this. * subversion/include/svn_auth_kwallet.h (svn_auth_get_kwallet_simple_provider): Update doc string. * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): Update. Suggested by: glasser ------------------------------------------------------------------------ r31172 | arfrever | 2008-05-14 21:04:59 +0200 (Wed, 14 May 2008) | 8 lines Changed paths: M /branches/kwallet/subversion/include/svn_auth_kwallet.h M /branches/kwallet/subversion/libsvn_auth_kwallet M /branches/kwallet/subversion/libsvn_auth_kwallet/kwallet.cpp On the 'kwallet' branch: Add missing properties. * subversion/libsvn_auth_kwallet: Set svn:ignore. * subversion/include/svn_auth_kwallet.h: * subversion/libsvn_auth_kwallet/kwallet.cpp: Set svn:eol-style. ------------------------------------------------------------------------ r31176 | arfrever | 2008-05-14 21:52:44 +0200 (Wed, 14 May 2008) | 7 lines Changed paths: M /branches/kwallet/subversion/libsvn_auth_kwallet/kwallet.cpp On the 'kwallet' branch: Don't use KWallet when the '--non-interactive' option is used. * subversion/libsvn_auth_kwallet/kwallet.cpp (kwallet_password_get): (kwallet_password_set): Return false when non_interactive is true. ------------------------------------------------------------------------ r31179 | kfogel | 2008-05-14 23:25:39 +0200 (Wed, 14 May 2008) | 19 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py * subversion/tests/cmdline/merge_tests.py (test_list): Skip merge_broken_link on non-Posix platforms. Suggested by: lgo pburba danielsh See discussion culminating in this message: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=138584 Date: Wed, 14 May 2008 23:34:12 +0300 (Jerusalem Daylight Time) From: Daniel Shahaf To: Paul Burba cc: Lieven Govaerts , dev@subversion.tigris.org, kfogel@tigris.org Message-ID: Subject: Re: svn commit: r31159 - in trunk/subversion: libsvn_wc \ tests/cmdline ------------------------------------------------------------------------ r31183 | hwright | 2008-05-15 05:56:17 +0200 (Thu, 15 May 2008) | 10 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/svn_client.h M /branches/1.5.x/subversion/libsvn_client/add.c Merge r31131 from trunk: * r31131 Restore compatibility of svn_client_add3()'s non-recursive behavior. Notes: This fixes an API incompatibility. But in practice it's a minor problem, and could probably wait until 1.5.1 if necessary. Votes: +1: kfogel, epg, cmpilato ------------------------------------------------------------------------ r31184 | hwright | 2008-05-15 05:57:18 +0200 (Thu, 15 May 2008) | 7 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/build.conf M /branches/1.5.x/subversion/bindings/swig Merge r31056 from trunk: * r31056 Enable svn.diff in swig-py on Windows. Votes: +1: epg, arfrever, cmpilato ------------------------------------------------------------------------ r31185 | hwright | 2008-05-15 05:59:12 +0200 (Thu, 15 May 2008) | 8 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_client/mergeinfo.c M /branches/1.5.x/subversion/libsvn_client/mergeinfo.h M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py Merge r30949, r30962 from trunk: * r30949, r30962 Fix issue #3188. Mergeinfo on switched targets/subtrees should elide to repos. Votes: +1: pburba, markphip, cmpilato ------------------------------------------------------------------------ r31186 | hwright | 2008-05-15 06:00:53 +0200 (Thu, 15 May 2008) | 14 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py Merge r30746, r30747 from trunk: * r30746, r30747 Fix a minor merge range notification header bug. Notes: r30747 is just cleanup of some cruft that snuck in with r30746, thus adhering to my "every commit should need a follow-up" ethos. r30746 contains, like, one tiny *real* change, then a whole bunch of bogus indentation changes that were supposed to be part of r30748. Probably best to not fix that indentation during backport, in case we later backport r30748. Votes: +1: pburba, markphip, cmpilato ------------------------------------------------------------------------ r31196 | kfogel | 2008-05-15 16:44:15 +0200 (Thu, 15 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_client/commit_util.c Fix issue #3198: don't commit an add of a missing item. * subversion/libsvn_client/commit_util.c (harvest_committables): Check for existence before adding. ------------------------------------------------------------------------ r31202 | kfogel | 2008-05-15 18:01:54 +0200 (Thu, 15 May 2008) | 5 lines Changed paths: M /trunk/CHANGES * CHANGES (1.5.0): Add line about --with-revprop (issue #1976). Patch by: Bert Huijben (I tweaked the wording a bit.) ------------------------------------------------------------------------ r31203 | kfogel | 2008-05-15 18:07:41 +0200 (Thu, 15 May 2008) | 13 lines Changed paths: M /trunk/build.conf * build.conf (repos-test): Remove the magic word 'update' from the description to allow running the test as non-administrator on Windows Vista. Vista checks the file description for specific keywords, such as "update", to determine if a file might be a installer and in that case prompts the user for administrative privileges. The recommended way to fix this behavior is adding a xml manifest to the executable but that would require extensive changes to the build scripts. This change is just to stop Vista from being stupid. Patch by: Bert Huijben ------------------------------------------------------------------------ r31205 | arfrever | 2008-05-15 18:20:45 +0200 (Thu, 15 May 2008) | 17 lines Changed paths: M /branches/kwallet/subversion/include/private/svn_auth_private.h M /branches/kwallet/subversion/libsvn_auth_kwallet/kwallet.cpp M /branches/kwallet/subversion/libsvn_subr/cmdline.c M /branches/kwallet/subversion/libsvn_subr/simple_providers.c On the 'kwallet' branch: Fix indentation and avoid code duplication. * subversion/libsvn_subr/simple_providers.c: * subversion/libsvn_auth_kwallet/kwallet.cpp: Move definitions of SVN_AUTH__SIMPLE_PASSWORD_TYPE, SVN_AUTH__WINCRYPT_PASSWORD_TYPE, SVN_AUTH__KEYCHAIN_PASSWORD_TYPE and SVN_AUTH__KWALLET_PASSWORD_TYPE from here ... * subversion/include/private/svn_auth_private.h: ... to here. * subversion/libsvn_auth_kwallet/kwallet.cpp (kwallet_password_get, kwallet_password_set): * subversion/libsvn_subr/cmdline.c (get_auth_simple_provider): Fix indentation. Found by: sussman ------------------------------------------------------------------------ r31206 | cmpilato | 2008-05-15 18:36:05 +0200 (Thu, 15 May 2008) | 9 lines Changed paths: M /trunk/notes/commit-access-templates/contrib-committer.tmpl M /trunk/notes/commit-access-templates/full-committer.tmpl M /trunk/notes/commit-access-templates/partial-committer.tmpl Minor commit access process tweaks. * notes/commit-access-templates/partial-committer.tmpl, * notes/commit-access-templates/contrib-committer.tmpl, * notes/commit-access-templates/full-committer.tmpl Stop suggesting that folks send in their own htpasswd-crypted passwords. Almost no one does, and those that do usually send passwords of the wrong type. ------------------------------------------------------------------------ r31210 | cmpilato | 2008-05-15 18:50:27 +0200 (Thu, 15 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote fer sum stuff n' fix sum other stuff. ------------------------------------------------------------------------ r31211 | kfogel | 2008-05-15 19:45:45 +0200 (Thu, 15 May 2008) | 25 lines Changed paths: M /trunk/subversion/include/svn_wc.h M /trunk/subversion/libsvn_client/client.h M /trunk/subversion/libsvn_client/commit_util.c M /trunk/subversion/libsvn_wc/util.c M /trunk/subversion/svn/notify.c Move the creation of final display paths to the CLI notification handler, to make sure notifications always receive a valid path in the path field. Patch by: Bert Huijben * subversion/include/svn_wc.h (svn_wc_notify_t): New field path_prefix. * subversion/libsvn_wc/util.c (svn_wc_create_notify, svn_wc_dup_notify): Handle new path_prefix field. * subversion/libsvn_client/client.h (svn_client__do_commit): Document the new handling of notify_path_prefix. * subversion/libsvn_client/commit_util.c (svn_client__do_commit, do_item_commit) Remove local handling of notify_path_prefix. Instead pass path_prefix to the notification handler. * subversion/svn/notify.c (notify): Use the new path_prefix to split the first part of the path if it matches the specified prefix. Don't bother testing for urls as the path is documented to be a local path. ------------------------------------------------------------------------ r31212 | kfogel | 2008-05-15 20:24:10 +0200 (Thu, 15 May 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_client/commit.c * subversion/libsvn_client/commit.c (svn_client_commit4): Calculate a new-style notify prefix to pass to svn_client__do_commit (no functional change). Patch by: Bert Huijben ------------------------------------------------------------------------ r31213 | blair | 2008-05-15 20:24:14 +0200 (Thu, 15 May 2008) | 4 lines Changed paths: M /trunk/contrib/hook-scripts/svn-keyword-check.pl * contrib/hook-scripts/svn-keyword-check.pl: Set the svn:eol-style property to native. Set and use the svn:keywords property. ------------------------------------------------------------------------ r31214 | kfogel | 2008-05-15 20:30:23 +0200 (Thu, 15 May 2008) | 4 lines Changed paths: M /trunk/www/links.html * www/links.html (misc-utils): Add JIRA2SVN entry. Patch by: James Mountifield ------------------------------------------------------------------------ r31216 | cmpilato | 2008-05-15 21:40:26 +0200 (Thu, 15 May 2008) | 16 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/svn_repos.h M /branches/1.5.x/subversion/libsvn_repos/fs-wrap.c M /branches/1.5.x/subversion/tests/cmdline/prop_tests.py Merge this change group from trunk: * r31138, r31141, r31157, r31209 Validate svn:date property values in libsvn_repos. Notes: r31141 is a docstring change. r31157 marks the regression test XFail over DAV. r31209 is a teeny typo (read: obvious) fix Votes: +1: danielsh, kfogel, cmpilato Also: * STATUS Remove the group. ------------------------------------------------------------------------ r31218 | cmpilato | 2008-05-15 21:58:42 +0200 (Thu, 15 May 2008) | 16 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/libsvn_wc/merge.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py Merge from trunk this change group: * (r31159, r31179) or r31193 from 1.5.x-r31159-r31179 branch. Fix "file not found" error when a merge target is a broken symbolic link. Notes: r31179 just makes sure the new test is skipped on Windows. r31193 from 1.5.x-r31159-r31179 branch has r31159 and r31179 merged to it with a conflict resolution. Votes: +1: kfogel(r31159, r31179), kameshj, cmpilato (r31159, r31179) Also: * STATUS Remove the group. ------------------------------------------------------------------------ r31220 | kfogel | 2008-05-15 22:58:37 +0200 (Thu, 15 May 2008) | 4 lines Changed paths: A /branches/issue-3000/README.branch On the issue-3000 branch: * README.branch: New file, describing The Plan. ------------------------------------------------------------------------ r31221 | kfogel | 2008-05-16 00:00:55 +0200 (Fri, 16 May 2008) | 4 lines Changed paths: M /trunk/CHANGES * CHANGES: Follow up to r31202 by removing a line it made obsolete. Found by: epg ------------------------------------------------------------------------ r31222 | kfogel | 2008-05-16 00:19:16 +0200 (Fri, 16 May 2008) | 3 lines Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (Merge Tracking / Further reading): Link to Ben's blog post. ------------------------------------------------------------------------ r31223 | epg | 2008-05-16 00:29:41 +0200 (Fri, 16 May 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_ra/ra_loader.c Fix segmentation fault introduced in r25535, when svn_ra_open3 is passed a bogus URL such as 'bogusURL'. * subversion/libsvn_ra/ra_loader.c (svn_ra_open3): Raise SVN_ERR_RA_ILLEGAL_URL if repos_URI.hostname is NULL rather than passing that NULL to svn_config_find_group(). ------------------------------------------------------------------------ r31224 | kameshj | 2008-05-16 09:22:07 +0200 (Fri, 16 May 2008) | 1 line Changed paths: D /branches/1.5.x-r31159-r31179 Delete this branch as it is committed directly via r31218 ------------------------------------------------------------------------ r31225 | julianfoad | 2008-05-16 11:14:13 +0200 (Fri, 16 May 2008) | 7 lines Changed paths: A /branches/tree-conflicts/subversion/tests/cmdline/tree_conflict_tests.txt (from /trunk/notes/tree-conflicts/testing.txt:31224) Copy the tree conflicts test harness description file from trunk to this branch, and update it for the changes made in r31169 and for more accurate description of the action codes. * subversion/tests/cmdline/tree_conflict_tests.txt Copy from /trunk/notes/tree-conflicts/testing.txt, and update as above. ------------------------------------------------------------------------ r31226 | julianfoad | 2008-05-16 11:22:54 +0200 (Fri, 16 May 2008) | 11 lines Changed paths: D /trunk/notes/tree-conflicts/testing.txt Finish moving a document from trunk to tree-conflicts branch. Remove the tree conflicts test harness description from here, having copied it in r31225 to sit beside the test harness file that it describes (i.e. to /branches/tree-conflicts/subversion/test/cmdline/tree_conflicts_tests.txt). (I preferred not to use a single multi-branch commit to perform this move.) * notes/tree-conflicts/testing.txt Delete the file. ------------------------------------------------------------------------ r31227 | stylesen | 2008-05-16 12:29:27 +0200 (Fri, 16 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_client/ra.c Code indentation fix only. * subversion/libsvn_client/ra.c (svn_client_uuid_from_path): fix indentation. ------------------------------------------------------------------------ r31228 | danielsh | 2008-05-16 14:02:07 +0200 (Fri, 16 May 2008) | 11 lines Changed paths: M /trunk/subversion/svn/blame-cmd.c M /trunk/subversion/svn/cl.h M /trunk/subversion/svn/log-cmd.c M /trunk/subversion/svn/util.c Fix issue #2721: don't croak on invalid dates. This fixes 'log' and 'blame', but not 'info', because it does the date validation deep in svn_repos. * subversion/svn/cl.h, subversion/svn/util.c (svn_cl__time_cstring_to_human_cstring): New wrapper. * subversion/svn/util.c (svn_time.h): Include. * subversion/svn/blame-cmd.c (print_line_info), subversion/svn/log-cmd.c (log_entry_receiver): Call svn_cl__time_cstring_to_human_cstring(). ------------------------------------------------------------------------ r31231 | lgo | 2008-05-16 18:18:12 +0200 (Fri, 16 May 2008) | 1 line Changed paths: M /trunk/subversion/libsvn_ra_serf/blame.c * subversion/libsvn_ra_serf/blame.c: Fix indentation. ------------------------------------------------------------------------ r31232 | lgo | 2008-05-16 18:44:59 +0200 (Fri, 16 May 2008) | 13 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/blame.c M /trunk/subversion/libsvn_ra_serf/property.c M /trunk/subversion/libsvn_ra_serf/ra_serf.h ra_serf: Remove unneeded function private to ra_serf, as its code is almost a duplicate of another function. * subversion/libsvn_ra_serf/ra_serf.h (svn_ra_serf__search_for_base_props): Remove declaration. * subversion/libsvn_ra_serf/property.c (svn_ra_serf__search_for_base_props): Remove definition. * subversion/libsvn_ra_serf/blame.c (svn_ra_serf__get_file_revs): Reimplement using svn_ra_serf__discover_root instead of the now removed svn_ra_serf__search_for_base_props. ------------------------------------------------------------------------ r31233 | arfrever | 2008-05-16 19:09:13 +0200 (Fri, 16 May 2008) | 7 lines Changed paths: M /branches/kwallet/subversion/libsvn_subr/cmdline.c On the 'kwallet' branch: * subversion/libsvn_subr/cmdline.c (get_auth_simple_provider): Fix doc string and properly handle errors. Found by: danielsh ------------------------------------------------------------------------ r31234 | lgo | 2008-05-16 19:25:22 +0200 (Fri, 16 May 2008) | 16 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/property.c M /trunk/subversion/libsvn_ra_serf/serf.c M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: svn_ra_serf__stat should set *dirent to NULL when the path is not found in the repository. Found by: epg * subversion/libsvn_ra_serf/property.c (svn_ra_serf__wait_for_props): Convert status code 404 to error SVN_ERR_RA_DAV_PATH_NOT_FOUND. * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__stat): If the path is not found, set dirent to NULL and don't raise error. (svn_ra_serf__check_path): If path doesn't exist we now get an error, so handle it. * subversion/libsvn_ra_serf/util.c (svn_ra_serf__discover_root): Idem. ------------------------------------------------------------------------ r31235 | arfrever | 2008-05-16 19:43:38 +0200 (Fri, 16 May 2008) | 5 lines Changed paths: M /branches/kwallet/configure.ac On the 'kwallet' branch: * configure.ac (KWallet): Check for support for internationalization. ------------------------------------------------------------------------ r31236 | arfrever | 2008-05-16 20:46:57 +0200 (Fri, 16 May 2008) | 6 lines Changed paths: M /branches/kwallet/subversion/libsvn_auth_kwallet/kwallet.cpp On the 'kwallet' branch: * subversion/libsvn_auth_kwallet/kwallet.cpp (kwallet_password_get, kwallet_password_set): Disconnect Subversion after using KWallet. ------------------------------------------------------------------------ r31237 | arfrever | 2008-05-16 20:57:05 +0200 (Fri, 16 May 2008) | 7 lines Changed paths: M /branches/kwallet/subversion/libsvn_auth_kwallet/kwallet.cpp On the 'kwallet' branch: Follow-up to r31236: * subversion/libsvn_auth_kwallet/kwallet.cpp (kwallet_password_get, kwallet_password_set): Theoretically improve support for UTF-8. ------------------------------------------------------------------------ r31238 | arfrever | 2008-05-16 21:04:15 +0200 (Fri, 16 May 2008) | 3 lines Changed paths: M /branches/kwallet M /branches/kwallet/CHANGES M /branches/kwallet/COMMITTERS M /branches/kwallet/build.conf A /branches/kwallet/contrib/hook-scripts/svn-keyword-check.pl (from /trunk/contrib/hook-scripts/svn-keyword-check.pl:31237) M /branches/kwallet/notes/commit-access-templates/contrib-committer.tmpl M /branches/kwallet/notes/commit-access-templates/full-committer.tmpl M /branches/kwallet/notes/commit-access-templates/partial-committer.tmpl D /branches/kwallet/notes/tree-conflicts/testing.txt M /branches/kwallet/subversion/include/svn_wc.h M /branches/kwallet/subversion/libsvn_client/client.h M /branches/kwallet/subversion/libsvn_client/commit.c M /branches/kwallet/subversion/libsvn_client/commit_util.c M /branches/kwallet/subversion/libsvn_client/ra.c M /branches/kwallet/subversion/libsvn_ra/ra_loader.c M /branches/kwallet/subversion/libsvn_ra_serf/blame.c M /branches/kwallet/subversion/libsvn_ra_serf/property.c M /branches/kwallet/subversion/libsvn_ra_serf/ra_serf.h M /branches/kwallet/subversion/libsvn_ra_serf/serf.c M /branches/kwallet/subversion/libsvn_ra_serf/util.c M /branches/kwallet/subversion/libsvn_repos/fs-wrap.c M /branches/kwallet/subversion/libsvn_subr/time.c M /branches/kwallet/subversion/libsvn_wc/util.c M /branches/kwallet/subversion/svn/blame-cmd.c M /branches/kwallet/subversion/svn/cl.h M /branches/kwallet/subversion/svn/log-cmd.c M /branches/kwallet/subversion/svn/notify.c M /branches/kwallet/subversion/svn/util.c M /branches/kwallet/www/hacking.html M /branches/kwallet/www/links.html M /branches/kwallet/www/svn_1.5_releasenotes.html On the 'kwallet' branch: Merge r31194:31237 from trunk. ------------------------------------------------------------------------ r31239 | arfrever | 2008-05-16 21:26:18 +0200 (Fri, 16 May 2008) | 5 lines Changed paths: A /branches/kwallet/subversion/include/svn_auth_dso.h (from /branches/kwallet/subversion/include/svn_auth_kwallet.h:31238) D /branches/kwallet/subversion/include/svn_auth_kwallet.h M /branches/kwallet/subversion/libsvn_auth_kwallet/kwallet.cpp On the 'kwallet' branch: Rename 'svn_auth_kwallet.h' to 'svn_auth_dso.h'. * subversion/libsvn_auth_kwallet/kwallet.cpp: Include "svn_auth_dso.h". ------------------------------------------------------------------------ r31240 | glasser | 2008-05-16 21:50:09 +0200 (Fri, 16 May 2008) | 3 lines Changed paths: M /trunk/CHANGES * CHANGES Don't claim that 'svn propset' supports URLs. ------------------------------------------------------------------------ r31241 | arfrever | 2008-05-16 22:25:00 +0200 (Fri, 16 May 2008) | 2 lines Changed paths: M /trunk M /trunk/Makefile.in M /trunk/build/generator/gen_base.py M /trunk/build.conf M /trunk/configure.ac A /trunk/subversion/include/private/svn_auth_private.h (from /branches/kwallet/subversion/include/private/svn_auth_private.h:31240) M /trunk/subversion/include/svn_auth.h A /trunk/subversion/include/svn_auth_dso.h (from /branches/kwallet/subversion/include/svn_auth_dso.h:31240) A /trunk/subversion/libsvn_auth_kwallet (from /branches/kwallet/subversion/libsvn_auth_kwallet:31240) R /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp (from /branches/kwallet/subversion/libsvn_auth_kwallet/kwallet.cpp:31240) M /trunk/subversion/libsvn_subr/cmdline.c M /trunk/subversion/libsvn_subr/simple_providers.c M /trunk/tools/server-side/svn_server_log_parse.py M /trunk/tools/server-side/test_svn_server_log_parse.py Merge the 'kwallet' branch to trunk. ------------------------------------------------------------------------ r31242 | glasser | 2008-05-16 22:26:43 +0200 (Fri, 16 May 2008) | 1 line Changed paths: M /branches/in-memory-cache M /branches/in-memory-cache/CHANGES M /branches/in-memory-cache/COMMITTERS M /branches/in-memory-cache/Makefile.in M /branches/in-memory-cache/build/ac-macros/apache.m4 M /branches/in-memory-cache/build/generator/gen_base.py M /branches/in-memory-cache/build/generator/gen_make.py M /branches/in-memory-cache/build.conf M /branches/in-memory-cache/configure.ac M /branches/in-memory-cache/contrib/client-side/svnmerge/svnmerge-migrate-history.py M /branches/in-memory-cache/contrib/client-side/svnmerge/svnmerge-migrate-test.sh A /branches/in-memory-cache/contrib/hook-scripts/svn-keyword-check.pl (from /trunk/contrib/hook-scripts/svn-keyword-check.pl:31240) M /branches/in-memory-cache/notes/commit-access-templates/contrib-committer.tmpl M /branches/in-memory-cache/notes/commit-access-templates/full-committer.tmpl M /branches/in-memory-cache/notes/commit-access-templates/partial-committer.tmpl M /branches/in-memory-cache/subversion/bindings/swig/perl/native/t/3client.t M /branches/in-memory-cache/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c M /branches/in-memory-cache/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h M /branches/in-memory-cache/subversion/bindings/swig/python/svn/wc.py M /branches/in-memory-cache/subversion/bindings/swig/python/tests/wc.py M /branches/in-memory-cache/subversion/bindings/swig/ruby/svn/core.rb M /branches/in-memory-cache/subversion/bindings/swig/svn_wc.i M /branches/in-memory-cache/subversion/include/private/svn_log.h M /branches/in-memory-cache/subversion/include/svn_auth.h M /branches/in-memory-cache/subversion/include/svn_client.h M /branches/in-memory-cache/subversion/include/svn_cmdline.h M /branches/in-memory-cache/subversion/include/svn_config.h M /branches/in-memory-cache/subversion/include/svn_error_codes.h M /branches/in-memory-cache/subversion/include/svn_io.h M /branches/in-memory-cache/subversion/include/svn_mergeinfo.h M /branches/in-memory-cache/subversion/include/svn_ra.h M /branches/in-memory-cache/subversion/include/svn_repos.h M /branches/in-memory-cache/subversion/include/svn_subst.h M /branches/in-memory-cache/subversion/include/svn_wc.h M /branches/in-memory-cache/subversion/libsvn_client/add.c M /branches/in-memory-cache/subversion/libsvn_client/client.h M /branches/in-memory-cache/subversion/libsvn_client/cmdline.c M /branches/in-memory-cache/subversion/libsvn_client/commit.c M /branches/in-memory-cache/subversion/libsvn_client/commit_util.c M /branches/in-memory-cache/subversion/libsvn_client/copy.c M /branches/in-memory-cache/subversion/libsvn_client/merge.c M /branches/in-memory-cache/subversion/libsvn_client/mergeinfo.c M /branches/in-memory-cache/subversion/libsvn_client/mergeinfo.h M /branches/in-memory-cache/subversion/libsvn_client/ra.c M /branches/in-memory-cache/subversion/libsvn_diff/diff_file.c M /branches/in-memory-cache/subversion/libsvn_diff/diff_memory.c M /branches/in-memory-cache/subversion/libsvn_fs_base/fs.c M /branches/in-memory-cache/subversion/libsvn_ra/compat.c M /branches/in-memory-cache/subversion/libsvn_ra/ra_loader.c M /branches/in-memory-cache/subversion/libsvn_ra_neon/util.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/blame.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/log.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/merge.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/property.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/ra_serf.h M /branches/in-memory-cache/subversion/libsvn_ra_serf/replay.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/serf.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/util.c M /branches/in-memory-cache/subversion/libsvn_repos/fs-wrap.c M /branches/in-memory-cache/subversion/libsvn_repos/log.c M /branches/in-memory-cache/subversion/libsvn_subr/auth.c M /branches/in-memory-cache/subversion/libsvn_subr/cmdline.c M /branches/in-memory-cache/subversion/libsvn_subr/config.c M /branches/in-memory-cache/subversion/libsvn_subr/config_auth.c M /branches/in-memory-cache/subversion/libsvn_subr/config_file.c M /branches/in-memory-cache/subversion/libsvn_subr/io.c M /branches/in-memory-cache/subversion/libsvn_subr/path.c M /branches/in-memory-cache/subversion/libsvn_subr/prompt.c M /branches/in-memory-cache/subversion/libsvn_subr/simple_providers.c M /branches/in-memory-cache/subversion/libsvn_subr/time.c M /branches/in-memory-cache/subversion/libsvn_subr/win32_crashrpt.c M /branches/in-memory-cache/subversion/libsvn_wc/adm_ops.c M /branches/in-memory-cache/subversion/libsvn_wc/copy.c M /branches/in-memory-cache/subversion/libsvn_wc/diff.c M /branches/in-memory-cache/subversion/libsvn_wc/merge.c M /branches/in-memory-cache/subversion/libsvn_wc/util.c D /branches/in-memory-cache/subversion/mod_dav_svn/static M /branches/in-memory-cache/subversion/po/de.po M /branches/in-memory-cache/subversion/po/pl.po M /branches/in-memory-cache/subversion/po/zh_CN.po M /branches/in-memory-cache/subversion/svn/blame-cmd.c M /branches/in-memory-cache/subversion/svn/cl.h M /branches/in-memory-cache/subversion/svn/conflict-callbacks.c M /branches/in-memory-cache/subversion/svn/log-cmd.c M /branches/in-memory-cache/subversion/svn/main.c M /branches/in-memory-cache/subversion/svn/notify.c M /branches/in-memory-cache/subversion/svn/util.c M /branches/in-memory-cache/subversion/svnserve/serve.c M /branches/in-memory-cache/subversion/tests/cmdline/basic_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/depth_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/log_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/merge_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/prop_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/svntest/main.py M /branches/in-memory-cache/subversion/tests/cmdline/trans_tests.py M /branches/in-memory-cache/subversion/tests/libsvn_diff/diff-diff3-test.c M /branches/in-memory-cache/subversion/tests/libsvn_subr/path-test.c M /branches/in-memory-cache/tools/client-side/showchange.pl M /branches/in-memory-cache/tools/dist/write-announcement.py M /branches/in-memory-cache/tools/server-side/svn_server_log_parse.py M /branches/in-memory-cache/tools/server-side/test_svn_server_log_parse.py M /branches/in-memory-cache/www/hacking.html M /branches/in-memory-cache/www/links.html M /branches/in-memory-cache/www/svn_1.5_releasenotes.html M /branches/in-memory-cache/www/tools_contrib.html Merge from trunk to in-memory-cache branch. ------------------------------------------------------------------------ r31243 | cmpilato | 2008-05-16 22:26:46 +0200 (Fri, 16 May 2008) | 94 lines Changed paths: M /trunk/subversion/include/svn_client.h M /trunk/subversion/libsvn_client/add.c M /trunk/subversion/libsvn_client/client.h M /trunk/subversion/libsvn_client/commit.c M /trunk/subversion/libsvn_client/commit_util.c M /trunk/subversion/libsvn_client/copy.c M /trunk/subversion/libsvn_client/delete.c M /trunk/subversion/libsvn_client/prop_commands.c M /trunk/subversion/svn/commit-cmd.c M /trunk/subversion/svn/copy-cmd.c M /trunk/subversion/svn/delete-cmd.c M /trunk/subversion/svn/import-cmd.c M /trunk/subversion/svn/mkdir-cmd.c M /trunk/subversion/svn/move-cmd.c M /trunk/subversion/svn/propdel-cmd.c M /trunk/subversion/svn/propedit-cmd.c M /trunk/subversion/svn/propset-cmd.c Per issue #3200, move the revprop_table (used for setting customer revision properties at commit-time) from the svn_client_ctx_t baton (which may be long-lived in certain clients) to the various committing APIs. NOTE: Because this is intended for backport to 1.5.0, I am *not* revving the svn_client APIs again. * subversion/libsvn_client/client.h, * subversion/libsvn_client/commit_util.c (svn_client__ensure_revprop_table): Was svn_client__get_revprop_table(); Now accepts a revprop_table hash as initial input. * subversion/include/svn_client.h (svn_client_ctx_t): Remove 'revprop_table' member. (svn_client_mkdir3, svn_client_delete3, svn_client_import3, svn_client_commit4, svn_client_copy4, svn_client_move5, svn_client_propset3): Add 'revprop_table' parameter. (svn_client_mkdir2, svn_client_delete2, svn_client_import2, svn_client_commit3, svn_client_copy3, svn_client_move4, svn_client_propset2): Update doctring. * subversion/libsvn_client/add.c (mkdir_urls): Add 'revprop_table' parameter, and use svn_client__ensure_revprop_table() instead of svn_client__get_revprop_table(). (svn_client_mkdir3): Add 'revprop_table' parameter, and update call to mkdir_urls(). (svn_client_mkdir2): Update call to svn_client_mkdir3(). * subversion/libsvn_client/commit.c (get_ra_editor): Add 'revprop_table' parameter, and use svn_client__ensure_revprop_table() instead of svn_client__get_revprop_table(). (svn_client_import3, svn_client_commit4): Add 'revprop_table' parameter, and update calls to get_ra_editor(). (svn_client_import2): Update call to svn_client_import3(). (svn_client_commit3): Update call to svn_client_commit4(). * subversion/libsvn_client/copy.c (repos_to_repos_copy, wc_to_repos_copy): Add 'revprop_table' parameter, and use svn_client__ensure_revprop_table() instead of svn_client__get_revprop_table(). (setup_copy): Add 'revprop_table' parameter, and update calls to repos_to_repos_copy() and wc_to_repos_copy(). (svn_client_copy4, svn_client_move5): Add 'revprop_table' parameter, and update calls to setup_copy(). (svn_client_move): Update call to setup_copy(). (svn_client_copy3): Update call to svn_client_copy4(). (svn_client_move4): Update call to svn_client_move5(). * subversion/libsvn_client/delete.c (delete_urls): Add 'revprop_table' parameter, and use svn_client__ensure_revprop_table() instead of svn_client__get_revprop_table(). (svn_client_delete3): Add 'revprop_table' parameter, and update call to delete_urls(). (svn_client_delete2): Update call to svn_client_delete3(). * subversion/libsvn_client/prop_commands.c (propset_on_url): Add 'revprop_table' parameter, and use svn_client__ensure_revprop_table() instead of svn_client__get_revprop_table(). (svn_client_propset3): Add 'revprop_table' parameter, and update call to propset_on_url(). (svn_client_propset2): Update call to svn_client_propset3(). * subversion/svn/commit-cmd.c (svn_cl__commit): Pass opt_state->revprop_table to svn_client_commit4(). * subversion/svn/copy-cmd.c (svn_cl__copy): Pass opt_state->revprop_table to svn_client_copy4(). * subversion/svn/delete-cmd.c (svn_cl__delete): Pass opt_state->revprop_table to svn_client_delete3(). * subversion/svn/import-cmd.c (svn_cl__import): Pass opt_state->revprop_table to svn_client_import3(). * subversion/svn/mkdir-cmd.c (svn_cl__mkdir): Pass opt_state->revprop_table to svn_client_mkdir3(). * subversion/svn/move-cmd.c (svn_cl__move): Pass opt_state->revprop_table to svn_client_move5(). * subversion/svn/propedit-cmd.c (svn_cl__propedit): Pass opt_state->revprop_table to svn_client_propset3(). * subversion/svn/propdel-cmd.c (svn_cl__propdel): Update call to svn_client_propset3(). * subversion/svn/propset-cmd.c (svn_cl__propset): Update call to svn_client_propset3(). ------------------------------------------------------------------------ r31244 | arfrever | 2008-05-16 22:34:47 +0200 (Fri, 16 May 2008) | 2 lines Changed paths: D /branches/kwallet Delete the 'kwallet' branch which was merged to trunk in r31241. ------------------------------------------------------------------------ r31245 | arfrever | 2008-05-16 22:41:27 +0200 (Fri, 16 May 2008) | 3 lines Changed paths: M /trunk/build.conf * build.conf: Move definitions of libsvn_auth_kwallet and libsvn_fs_util to restore alphabetic order. No functional change. ------------------------------------------------------------------------ r31246 | cmpilato | 2008-05-16 23:19:34 +0200 (Fri, 16 May 2008) | 23 lines Changed paths: M /trunk/subversion/bindings/swig/python/tests/client.py M /trunk/subversion/bindings/swig/ruby/svn/client.rb M /trunk/subversion/bindings/swig/ruby/test/test_client.rb M /trunk/subversion/bindings/swig/svn_client.i For issue #3200, make sure that the Python and Ruby bindings can handle the recent API changes. For Python, we actually support the new API parameter. For Ruby, I merely tolerate the API change. (Actually making use of the new API bit will have to come as a followup.) I have no idea what the state of the Perl bindings is. * subversion/bindings/swig/svn_client.i Apply MAY_BE_NULL and PROPHASH to 'apr_hash_t *revprop_table'. * subversion/bindings/swig/python/tests/client.py (SubversionClientTestCase.test_mkdir_url_with_revprops): New test. * subversion/bindings/swig/ruby/svn/client.rb (Context.commit, Context.delete, Context.propset, Context.copy, Context.move): Pass nil for the revprop_table argument to the various client functions employed. * subversion/bindings/swig/ruby/test/test_client.rb (test_context_revprop_table): Remove. We don't have have 'revprop_table' item in the context any more. ------------------------------------------------------------------------ r31247 | glasser | 2008-05-17 01:15:06 +0200 (Sat, 17 May 2008) | 48 lines Changed paths: M /branches/in-memory-cache/subversion/include/svn_cache.h M /branches/in-memory-cache/subversion/include/svn_io.h M /branches/in-memory-cache/subversion/libsvn_fs_fs/caching.c M /branches/in-memory-cache/subversion/libsvn_fs_fs/fs.h M /branches/in-memory-cache/subversion/libsvn_fs_fs/fs_fs.c M /branches/in-memory-cache/subversion/libsvn_subr/cache-memcache.c M /branches/in-memory-cache/subversion/libsvn_subr/stream.c On the in-memory-cache branch: Fulltext caching! Note: I didn't actually test this with memcached yet; will do so on Monday. Also, there should probably be a check for maximum size of cached texts. * subversion/libsvn_fs_fs/fs.h (fs_fs_data_t): Add fulltext_cache field. * subversion/libsvn_fs_fs/caching.c (svn_fs_fs__initialize_caches): Set up fulltext cache. * subversion/libsvn_fs_fs/fs_fs.c (struct rep_read_baton): Add fulltext_cache_key and current_fulltext fields. (rep_read_get_baton): Add fulltext_cache_key argument; initialize current_fulltext. (rep_read_contents): Append bytes to current_fulltext. If done, store in cache. (read_representation): Check cache first. Pass fulltext key to rep_read_get_baton. * subversion/include/svn_cache.h (svn_cache_create_memcache): * subversion/libsvn_subr/cache-memcache.c (memcache_set): The default serialization function now assumes values are stringbufs, not strings. * subversion/include/svn_io.h (svn_stream_from_string): New. * subversion/libsvn_subr/stream.c (stringbuf_stream_baton, read_handler_stringbuf, write_handler_stringbuf): Rename from string_stream_baton, read_handler_string, and write_handler_string. (string_stream_baton, read_handler_string, svn_stream_from_string): New. Patch by: dberlin Dan Christian me (concept by dberlin and Dan Christian) ------------------------------------------------------------------------ r31248 | kfogel | 2008-05-17 02:15:05 +0200 (Sat, 17 May 2008) | 18 lines Changed paths: M /trunk/subversion/include/svn_client.h M /trunk/subversion/libsvn_client/prop_commands.c M /trunk/subversion/svn/propdel-cmd.c M /trunk/subversion/svn/propedit-cmd.c M /trunk/subversion/svn/propset-cmd.c Narrow the race-condition window in 'svn propedit --revprop'. [There was a followup in r31263 to fix some of the logic below.] * subversion/include/svn_client.h, subversion/libsvn_client/prop_commands.c (svn_client_revprop_set2): New function. (svn_client_revprop_set): Deprecate. * subversion/svn/propedit-cmd.c (svn_cl__propedit): Call svn_client_revprop_set2, passing the original propval from before the edit session. * subversion/svn/propdel-cmd.c (svn_cl__propdel): Call svn_client_revprop_set2, passing NULL. * subversion/svn/propset-cmd.c (svn_cl__propset): Call svn_client_revprop_set2, passing NULL. ------------------------------------------------------------------------ r31249 | cmpilato | 2008-05-17 05:26:13 +0200 (Sat, 17 May 2008) | 30 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/svn/client.rb M /trunk/subversion/bindings/swig/ruby/test/test_client.rb M /trunk/subversion/bindings/swig/svn_client.i For issue #3200, make sure that the Python and Ruby bindings can handle the recent API changes. NOTE: I skipped adding this support for mkdir(), because the current interface appears to my Ruby-ignorant eyes to eat all the input parameters as paths, and I'm not sure how to compatibly go about adding new parameters. (Maybe you don't, maybe you rev the function -- I simply don't know.) * subversion/bindings/swig/svn_client.i Remove 'revprop_table' from HASH_CSTRING_MAYBENULL, as this was clobbering for Ruby the PROPHASH typemap for revprop_table. * subversion/bindings/swig/ruby/svn/client.rb (Context.commit): Now accept 'revprop_table' parameter, passed to Client.commit4(). (Context.delete): Now accept 'revprop_table' parameter, passed to Client.delete3(). (Context.import): Rename 'recurse' to 'depth_or_recurse', add 'revprop_table' parameter, and now use Client.import3() (Context.propset): Now accept 'revprop_table' parameter, passed to Client.propset3(). (Context.copy): Now accept 'revprop_table' parameter, passed to Client.copy4(). (Context.move): Now accept 'revprop_table' parameter, passed to Client.move5(). * subversion/bindings/swig/ruby/test/test_client.rb (test_import_custom_revprops): New test. ------------------------------------------------------------------------ r31250 | cmpilato | 2008-05-17 05:31:21 +0200 (Sat, 17 May 2008) | 9 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp For issue #3200, get the JavaHL bindings building again, but still without support for the custom-props-at-commit-time functionality. * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::remove, SVNClient::commit, SVNClient::copy, SVNClient::move, SVNClient::mkdir, SVNClient::doImport, SVNClient::propertySet): Pass NULL for revprop_table parameter of svn_client APIs that accept such. ------------------------------------------------------------------------ r31251 | cmpilato | 2008-05-17 05:38:22 +0200 (Sat, 17 May 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_client/client.h M /trunk/subversion/libsvn_client/commit_util.c For issue #3200, rename some variables for clarity. * subversion/libsvn_client/client.h, * subversion/libsvn_client/commit_util.c (svn_client__ensure_revprop_table): Rename 'revprop_table_p' and 'revprop_table' to 'revprop_table_out' and 'revprop_table_in', respectively. Suggested by: epg ------------------------------------------------------------------------ r31252 | cmpilato | 2008-05-17 05:43:05 +0200 (Sat, 17 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Almost propose r31243 and friends for backport to 1.5.0. ------------------------------------------------------------------------ r31253 | cmpilato | 2008-05-17 05:43:53 +0200 (Sat, 17 May 2008) | 1 line Changed paths: A /branches/1.5.x-r31243 (from /branches/1.5.x:31252) Create a backport branch for the issue 3200 fixes. ------------------------------------------------------------------------ r31254 | cmpilato | 2008-05-17 05:46:42 +0200 (Sat, 17 May 2008) | 1 line Changed paths: D /branches/1.5.x-r31243 Remove unnecessary branch. ------------------------------------------------------------------------ r31255 | cmpilato | 2008-05-17 05:47:27 +0200 (Sat, 17 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Remove note about backport branch for r31243 group. So far, these changes merge cleanly. ------------------------------------------------------------------------ r31256 | kou | 2008-05-17 08:00:44 +0200 (Sat, 17 May 2008) | 24 lines Changed paths: M /trunk/subversion/bindings/swig/core.i M /trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c M /trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h M /trunk/subversion/bindings/swig/ruby/svn/core.rb Export apr_allocator_max_free_set() to the Ruby world. * subversion/bindings/swig/core.i (%init): Define Svn::Core::SVN_ALLOCATOR_MAX_FREE_UNLIMITED. (apr_pool_wrapper_t::set_default_max_free_size): Add. (apr_pool_wrapper_t::apr_pool_wrapper_t): Use svn_swig_rb_pool() as default parent pool. (apr_pool_wrapper_t::set_max_free_size): Add. * subversion/bindings/swig/ruby/svn/core.rb (Svn::Core::Pool::RECOMMENDED_MAX_FREE_SIZE, Svn::Core::Pool::MAX_FREE_UNLIMITED): Define. * subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c, subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h (svn_swig_rb_pool, svn_swig_rb_allocator): Add. * subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c (check_apr_status): Add. (svn_swig_rb_initialize): - Use check_apr_status(). - Initialize swig_rb_pool and swig_rb_allocator. - Set default allocator's max free size to SVN_ALLOCATOR_RECOMMENDED_MAX_FREE. ------------------------------------------------------------------------ r31257 | kfogel | 2008-05-17 08:40:10 +0200 (Sat, 17 May 2008) | 2 lines Changed paths: M /trunk/www/links.html * www/links.html (hosting): Formatting fix. ------------------------------------------------------------------------ r31258 | kfogel | 2008-05-17 08:43:20 +0200 (Sat, 17 May 2008) | 5 lines Changed paths: M /trunk/www/links.html * www/links.html (hosting): Add SSHControl.com. Patch by: Rudi Cilibrasi (Tweaked by me.) ------------------------------------------------------------------------ r31259 | arfrever | 2008-05-17 12:51:45 +0200 (Sat, 17 May 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_subr/cmdline.c * subversion/libsvn_subr/cmdline.c (get_auth_simple_provider): Be defined only when SVN_HAVE_KWALLET or SVN_HAVE_GNOME_KEYRING is defined. Suggested by: epg ------------------------------------------------------------------------ r31260 | arfrever | 2008-05-17 13:27:03 +0200 (Sat, 17 May 2008) | 6 lines Changed paths: M /trunk/configure.ac * configure.ac (APR_HAS_DSO): New. (KWallet): Check for APR_HAS_DSO. Suggested by: stsp ------------------------------------------------------------------------ r31261 | arfrever | 2008-05-17 15:05:06 +0200 (Sat, 17 May 2008) | 4 lines Changed paths: M /trunk/configure.ac Follow-up to r31260: * configure.ac: Check for APR_HAS_DSO earlier. ------------------------------------------------------------------------ r31262 | arfrever | 2008-05-17 15:57:18 +0200 (Sat, 17 May 2008) | 3 lines Changed paths: M /trunk/Makefile.in * Makefile.in (fast-distclean): Delete 'config.nice'. ------------------------------------------------------------------------ r31263 | kfogel | 2008-05-17 16:26:21 +0200 (Sat, 17 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_client/prop_commands.c * subversion/libsvn_client/prop_commands.c (svn_client_revprop_set2): When checking original prop value, account for all cases and give the right error messages, following up to r31248. ------------------------------------------------------------------------ r31264 | arfrever | 2008-05-17 16:54:08 +0200 (Sat, 17 May 2008) | 9 lines Changed paths: M /branches/gnome-keyring M /branches/gnome-keyring/CHANGES M /branches/gnome-keyring/COMMITTERS M /branches/gnome-keyring/Makefile.in M /branches/gnome-keyring/build/ac-macros/apache.m4 M /branches/gnome-keyring/build/generator/gen_base.py M /branches/gnome-keyring/build/generator/gen_make.py M /branches/gnome-keyring/build.conf M /branches/gnome-keyring/configure.ac M /branches/gnome-keyring/contrib/client-side/svnmerge/svnmerge-migrate-history.py M /branches/gnome-keyring/contrib/client-side/svnmerge/svnmerge-migrate-test.sh A /branches/gnome-keyring/contrib/hook-scripts/svn-keyword-check.pl (from /trunk/contrib/hook-scripts/svn-keyword-check.pl:31263) A /branches/gnome-keyring/contrib/server-side/add-needs-lock.py (from /trunk/contrib/server-side/add-needs-lock.py:31263) M /branches/gnome-keyring/contrib/server-side/mod_dontdothat/README M /branches/gnome-keyring/contrib/server-side/mod_dontdothat/mod_dontdothat.c A /branches/gnome-keyring/contrib/server-side/svnstsw (from /trunk/contrib/server-side/svnstsw:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/AUTHORS (from /trunk/contrib/server-side/svnstsw/AUTHORS:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/COPYING (from /trunk/contrib/server-side/svnstsw/COPYING:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/INSTALL (from /trunk/contrib/server-side/svnstsw/INSTALL:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/Makefile.am (from /trunk/contrib/server-side/svnstsw/Makefile.am:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/NEWS (from /trunk/contrib/server-side/svnstsw/NEWS:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/README (from /trunk/contrib/server-side/svnstsw/README:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/autogen.sh (from /trunk/contrib/server-side/svnstsw/autogen.sh:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/conf (from /trunk/contrib/server-side/svnstsw/conf:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/conf/find_apr.m4 (from /trunk/contrib/server-side/svnstsw/conf/find_apr.m4:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/conf/stsw_func_snprintf_broken.m4 (from /trunk/contrib/server-side/svnstsw/conf/stsw_func_snprintf_broken.m4:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/conf/stsw_lib_apr.m4 (from /trunk/contrib/server-side/svnstsw/conf/stsw_lib_apr.m4:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/conf/stsw_prog_doxygen.m4 (from /trunk/contrib/server-side/svnstsw/conf/stsw_prog_doxygen.m4:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/configure.ac (from /trunk/contrib/server-side/svnstsw/configure.ac:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc (from /trunk/contrib/server-side/svnstsw/doc:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc/Doxyfile-html.in (from /trunk/contrib/server-side/svnstsw/doc/Doxyfile-html.in:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc/Makefile.am (from /trunk/contrib/server-side/svnstsw/doc/Makefile.am:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc/man (from /trunk/contrib/server-side/svnstsw/doc/man:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc/man/libsvnstsw.3.in (from /trunk/contrib/server-side/svnstsw/doc/man/libsvnstsw.3.in:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc/man/svnstsw.8.in (from /trunk/contrib/server-side/svnstsw/doc/man/svnstsw.8.in:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc/man/svnstsw_exec_svnserve.3.in (from /trunk/contrib/server-side/svnstsw/doc/man/svnstsw_exec_svnserve.3.in:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc/man/svnstsw_fso_is_changeable.3.in (from /trunk/contrib/server-side/svnstsw/doc/man/svnstsw_fso_is_changeable.3.in:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/doc/man/svnstsw_get_tunnel_user_name.3.in (from /trunk/contrib/server-side/svnstsw/doc/man/svnstsw_get_tunnel_user_name.3.in:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/include (from /trunk/contrib/server-side/svnstsw/include:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/include/Makefile.am (from /trunk/contrib/server-side/svnstsw/include/Makefile.am:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/include/svnstsw (from /trunk/contrib/server-side/svnstsw/include/svnstsw:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/include/svnstsw/exec_svnserve.h (from /trunk/contrib/server-side/svnstsw/include/svnstsw/exec_svnserve.h:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/include/svnstsw/fso_is_changeable.h (from /trunk/contrib/server-side/svnstsw/include/svnstsw/fso_is_changeable.h:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/include/svnstsw/get_tunnel_user_name.h (from /trunk/contrib/server-side/svnstsw/include/svnstsw/get_tunnel_user_name.h:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/include/svnstsw/svnstsw.h (from /trunk/contrib/server-side/svnstsw/include/svnstsw/svnstsw.h:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/src (from /trunk/contrib/server-side/svnstsw/src:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/src/Makefile.am (from /trunk/contrib/server-side/svnstsw/src/Makefile.am:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/src/exec_svnserve.c (from /trunk/contrib/server-side/svnstsw/src/exec_svnserve.c:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/src/fso_is_changeable.c (from /trunk/contrib/server-side/svnstsw/src/fso_is_changeable.c:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/src/get_tunnel_user_name.c (from /trunk/contrib/server-side/svnstsw/src/get_tunnel_user_name.c:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/src/main.c (from /trunk/contrib/server-side/svnstsw/src/main.c:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/src/svnstsw_compat.c (from /trunk/contrib/server-side/svnstsw/src/svnstsw_compat.c:31263) R /branches/gnome-keyring/contrib/server-side/svnstsw/src/svnstsw_compat.h (from /trunk/contrib/server-side/svnstsw/src/svnstsw_compat.h:31263) A /branches/gnome-keyring/notes/cli-repo-root-relative-support.txt (from /trunk/notes/cli-repo-root-relative-support.txt:31263) M /branches/gnome-keyring/notes/commit-access-templates/contrib-committer.tmpl M /branches/gnome-keyring/notes/commit-access-templates/full-committer.tmpl M /branches/gnome-keyring/notes/commit-access-templates/partial-committer.tmpl M /branches/gnome-keyring/notes/wc-ng-design M /branches/gnome-keyring/subversion/bindings/javahl/native/EnumMapper.cpp M /branches/gnome-keyring/subversion/bindings/javahl/native/SVNClient.cpp M /branches/gnome-keyring/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java M /branches/gnome-keyring/subversion/bindings/swig/core.i M /branches/gnome-keyring/subversion/bindings/swig/perl/native/t/3client.t M /branches/gnome-keyring/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c M /branches/gnome-keyring/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h M /branches/gnome-keyring/subversion/bindings/swig/python/svn/core.py M /branches/gnome-keyring/subversion/bindings/swig/python/svn/wc.py M /branches/gnome-keyring/subversion/bindings/swig/python/tests/auth.py M /branches/gnome-keyring/subversion/bindings/swig/python/tests/client.py M /branches/gnome-keyring/subversion/bindings/swig/python/tests/core.py M /branches/gnome-keyring/subversion/bindings/swig/python/tests/wc.py M /branches/gnome-keyring/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c M /branches/gnome-keyring/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h M /branches/gnome-keyring/subversion/bindings/swig/ruby/svn/client.rb M /branches/gnome-keyring/subversion/bindings/swig/ruby/svn/core.rb M /branches/gnome-keyring/subversion/bindings/swig/ruby/test/test_client.rb M /branches/gnome-keyring/subversion/bindings/swig/svn_client.i M /branches/gnome-keyring/subversion/bindings/swig/svn_repos.i M /branches/gnome-keyring/subversion/bindings/swig/svn_wc.i A /branches/gnome-keyring/subversion/include/private/svn_auth_private.h (from /trunk/subversion/include/private/svn_auth_private.h:31263) A /branches/gnome-keyring/subversion/include/private/svn_log.h (from /trunk/subversion/include/private/svn_log.h:31263) A /branches/gnome-keyring/subversion/include/private/svn_opt_private.h (from /trunk/subversion/include/private/svn_opt_private.h:31263) M /branches/gnome-keyring/subversion/include/svn_auth.h A /branches/gnome-keyring/subversion/include/svn_auth_dso.h (from /trunk/subversion/include/svn_auth_dso.h:31263) M /branches/gnome-keyring/subversion/include/svn_client.h M /branches/gnome-keyring/subversion/include/svn_cmdline.h M /branches/gnome-keyring/subversion/include/svn_config.h M /branches/gnome-keyring/subversion/include/svn_ctype.h M /branches/gnome-keyring/subversion/include/svn_diff.h M /branches/gnome-keyring/subversion/include/svn_error.h M /branches/gnome-keyring/subversion/include/svn_error_codes.h M /branches/gnome-keyring/subversion/include/svn_io.h M /branches/gnome-keyring/subversion/include/svn_mergeinfo.h M /branches/gnome-keyring/subversion/include/svn_opt.h M /branches/gnome-keyring/subversion/include/svn_ra.h M /branches/gnome-keyring/subversion/include/svn_ra_svn.h M /branches/gnome-keyring/subversion/include/svn_repos.h M /branches/gnome-keyring/subversion/include/svn_string.h M /branches/gnome-keyring/subversion/include/svn_subst.h M /branches/gnome-keyring/subversion/include/svn_wc.h A /branches/gnome-keyring/subversion/libsvn_auth_kwallet (from /trunk/subversion/libsvn_auth_kwallet:31263) R /branches/gnome-keyring/subversion/libsvn_auth_kwallet/kwallet.cpp (from /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp:31263) M /branches/gnome-keyring/subversion/libsvn_client/add.c M /branches/gnome-keyring/subversion/libsvn_client/client.h A /branches/gnome-keyring/subversion/libsvn_client/cmdline.c (from /trunk/subversion/libsvn_client/cmdline.c:31263) M /branches/gnome-keyring/subversion/libsvn_client/commit.c M /branches/gnome-keyring/subversion/libsvn_client/commit_util.c M /branches/gnome-keyring/subversion/libsvn_client/copy.c M /branches/gnome-keyring/subversion/libsvn_client/delete.c M /branches/gnome-keyring/subversion/libsvn_client/diff.c M /branches/gnome-keyring/subversion/libsvn_client/merge.c M /branches/gnome-keyring/subversion/libsvn_client/mergeinfo.c M /branches/gnome-keyring/subversion/libsvn_client/mergeinfo.h M /branches/gnome-keyring/subversion/libsvn_client/prop_commands.c M /branches/gnome-keyring/subversion/libsvn_client/ra.c M /branches/gnome-keyring/subversion/libsvn_client/repos_diff.c M /branches/gnome-keyring/subversion/libsvn_delta/compose_delta.c M /branches/gnome-keyring/subversion/libsvn_delta/delta.h M /branches/gnome-keyring/subversion/libsvn_delta/text_delta.c D /branches/gnome-keyring/subversion/libsvn_delta/vdelta.c M /branches/gnome-keyring/subversion/libsvn_delta/xdelta.c M /branches/gnome-keyring/subversion/libsvn_diff/diff_file.c M /branches/gnome-keyring/subversion/libsvn_diff/diff_memory.c M /branches/gnome-keyring/subversion/libsvn_fs_base/fs.c M /branches/gnome-keyring/subversion/libsvn_fs_fs/fs_fs.c M /branches/gnome-keyring/subversion/libsvn_fs_fs/structure M /branches/gnome-keyring/subversion/libsvn_ra/compat.c M /branches/gnome-keyring/subversion/libsvn_ra/ra_loader.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/commit.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/log.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/props.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/ra_neon.h M /branches/gnome-keyring/subversion/libsvn_ra_neon/session.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/util.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/blame.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/log.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/merge.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/property.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/ra_serf.h M /branches/gnome-keyring/subversion/libsvn_ra_serf/replay.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/serf.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/util.c M /branches/gnome-keyring/subversion/libsvn_ra_svn/client.c M /branches/gnome-keyring/subversion/libsvn_ra_svn/cyrus_auth.c M /branches/gnome-keyring/subversion/libsvn_ra_svn/editorp.c M /branches/gnome-keyring/subversion/libsvn_ra_svn/marshal.c M /branches/gnome-keyring/subversion/libsvn_ra_svn/protocol M /branches/gnome-keyring/subversion/libsvn_ra_svn/ra_svn.h M /branches/gnome-keyring/subversion/libsvn_ra_svn/streams.c M /branches/gnome-keyring/subversion/libsvn_repos/fs-wrap.c M /branches/gnome-keyring/subversion/libsvn_repos/log.c M /branches/gnome-keyring/subversion/libsvn_subr/auth.c M /branches/gnome-keyring/subversion/libsvn_subr/cmdline.c M /branches/gnome-keyring/subversion/libsvn_subr/config.c M /branches/gnome-keyring/subversion/libsvn_subr/config_auth.c M /branches/gnome-keyring/subversion/libsvn_subr/config_file.c M /branches/gnome-keyring/subversion/libsvn_subr/error.c M /branches/gnome-keyring/subversion/libsvn_subr/io.c A /branches/gnome-keyring/subversion/libsvn_subr/log.c (from /trunk/subversion/libsvn_subr/log.c:31263) M /branches/gnome-keyring/subversion/libsvn_subr/mergeinfo.c M /branches/gnome-keyring/subversion/libsvn_subr/opt.c M /branches/gnome-keyring/subversion/libsvn_subr/path.c M /branches/gnome-keyring/subversion/libsvn_subr/prompt.c M /branches/gnome-keyring/subversion/libsvn_subr/simple_providers.c M /branches/gnome-keyring/subversion/libsvn_subr/time.c M /branches/gnome-keyring/subversion/libsvn_subr/validate.c M /branches/gnome-keyring/subversion/libsvn_subr/win32_crashrpt.c M /branches/gnome-keyring/subversion/libsvn_wc/README M /branches/gnome-keyring/subversion/libsvn_wc/adm_ops.c M /branches/gnome-keyring/subversion/libsvn_wc/copy.c M /branches/gnome-keyring/subversion/libsvn_wc/diff.c M /branches/gnome-keyring/subversion/libsvn_wc/merge.c M /branches/gnome-keyring/subversion/libsvn_wc/status.c M /branches/gnome-keyring/subversion/libsvn_wc/util.c M /branches/gnome-keyring/subversion/mod_dav_svn/deadprops.c M /branches/gnome-keyring/subversion/mod_dav_svn/lock.c M /branches/gnome-keyring/subversion/mod_dav_svn/reports/file-revs.c M /branches/gnome-keyring/subversion/mod_dav_svn/reports/log.c M /branches/gnome-keyring/subversion/mod_dav_svn/reports/mergeinfo.c M /branches/gnome-keyring/subversion/mod_dav_svn/reports/replay.c M /branches/gnome-keyring/subversion/mod_dav_svn/reports/update.c M /branches/gnome-keyring/subversion/mod_dav_svn/repos.c D /branches/gnome-keyring/subversion/mod_dav_svn/static M /branches/gnome-keyring/subversion/mod_dav_svn/version.c M /branches/gnome-keyring/subversion/po/de.po M /branches/gnome-keyring/subversion/po/fr.po M /branches/gnome-keyring/subversion/po/pl.po M /branches/gnome-keyring/subversion/po/zh_CN.po M /branches/gnome-keyring/subversion/svn/add-cmd.c M /branches/gnome-keyring/subversion/svn/blame-cmd.c M /branches/gnome-keyring/subversion/svn/cat-cmd.c M /branches/gnome-keyring/subversion/svn/changelist-cmd.c M /branches/gnome-keyring/subversion/svn/checkout-cmd.c M /branches/gnome-keyring/subversion/svn/cl.h M /branches/gnome-keyring/subversion/svn/cleanup-cmd.c M /branches/gnome-keyring/subversion/svn/commit-cmd.c M /branches/gnome-keyring/subversion/svn/conflict-callbacks.c M /branches/gnome-keyring/subversion/svn/copy-cmd.c M /branches/gnome-keyring/subversion/svn/delete-cmd.c M /branches/gnome-keyring/subversion/svn/diff-cmd.c M /branches/gnome-keyring/subversion/svn/export-cmd.c M /branches/gnome-keyring/subversion/svn/import-cmd.c M /branches/gnome-keyring/subversion/svn/info-cmd.c M /branches/gnome-keyring/subversion/svn/list-cmd.c M /branches/gnome-keyring/subversion/svn/lock-cmd.c M /branches/gnome-keyring/subversion/svn/log-cmd.c M /branches/gnome-keyring/subversion/svn/main.c M /branches/gnome-keyring/subversion/svn/merge-cmd.c M /branches/gnome-keyring/subversion/svn/mergeinfo-cmd.c M /branches/gnome-keyring/subversion/svn/mkdir-cmd.c M /branches/gnome-keyring/subversion/svn/move-cmd.c M /branches/gnome-keyring/subversion/svn/notify.c M /branches/gnome-keyring/subversion/svn/propdel-cmd.c M /branches/gnome-keyring/subversion/svn/propedit-cmd.c M /branches/gnome-keyring/subversion/svn/propget-cmd.c M /branches/gnome-keyring/subversion/svn/proplist-cmd.c M /branches/gnome-keyring/subversion/svn/propset-cmd.c M /branches/gnome-keyring/subversion/svn/resolve-cmd.c M /branches/gnome-keyring/subversion/svn/resolved-cmd.c M /branches/gnome-keyring/subversion/svn/revert-cmd.c M /branches/gnome-keyring/subversion/svn/status-cmd.c M /branches/gnome-keyring/subversion/svn/switch-cmd.c M /branches/gnome-keyring/subversion/svn/unlock-cmd.c M /branches/gnome-keyring/subversion/svn/update-cmd.c M /branches/gnome-keyring/subversion/svn/util.c M /branches/gnome-keyring/subversion/svndumpfilter/main.c A /branches/gnome-keyring/subversion/svnserve/log-escape.c (from /trunk/subversion/svnserve/log-escape.c:31263) M /branches/gnome-keyring/subversion/svnserve/main.c M /branches/gnome-keyring/subversion/svnserve/serve.c M /branches/gnome-keyring/subversion/svnserve/server.h M /branches/gnome-keyring/subversion/svnsync/main.c M /branches/gnome-keyring/subversion/tests/cmdline/README M /branches/gnome-keyring/subversion/tests/cmdline/authz_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/basic_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/depth_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout M /branches/gnome-keyring/subversion/tests/cmdline/log_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/merge_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/prop_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/special_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/svnadmin_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/svndumpfilter_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/svntest/main.py M /branches/gnome-keyring/subversion/tests/cmdline/switch_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/trans_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/update_tests.py M /branches/gnome-keyring/subversion/tests/libsvn_client/client-test.c M /branches/gnome-keyring/subversion/tests/libsvn_diff/diff-diff3-test.c M /branches/gnome-keyring/subversion/tests/libsvn_ra_local/ra-local-test.c M /branches/gnome-keyring/subversion/tests/libsvn_subr/mergeinfo-test.c M /branches/gnome-keyring/subversion/tests/libsvn_subr/path-test.c M /branches/gnome-keyring/tools/client-side/bash_completion M /branches/gnome-keyring/tools/client-side/showchange.pl M /branches/gnome-keyring/tools/client-side/svn-graph.pl M /branches/gnome-keyring/tools/dist/construct-rolling-environment.sh M /branches/gnome-keyring/tools/dist/getsigs.pl M /branches/gnome-keyring/tools/dist/roll.sh M /branches/gnome-keyring/tools/dist/write-announcement.py D /branches/gnome-keyring/tools/server-side/svn_dav_log_parse.py A /branches/gnome-keyring/tools/server-side/svn_server_log_parse.py (from /trunk/tools/server-side/svn_server_log_parse.py:31263) D /branches/gnome-keyring/tools/server-side/test_svn_dav_log_parse.py A /branches/gnome-keyring/tools/server-side/test_svn_server_log_parse.py (from /trunk/tools/server-side/test_svn_server_log_parse.py:31263) M /branches/gnome-keyring/www/faq.html M /branches/gnome-keyring/www/hacking.html M /branches/gnome-keyring/www/links.html M /branches/gnome-keyring/www/release-process.html M /branches/gnome-keyring/www/svn_1.5_releasenotes.html M /branches/gnome-keyring/www/tools_contrib.html On the 'gnome-keyring' branch: Merge r30483:31263 from trunk. * configure.ac: * Makefile.in: * build.conf: * subversion/include/svn_auth.h: * subversion/libsvn_subr/cmdline.c: Resolve trivial conflicts. ------------------------------------------------------------------------ r31265 | arfrever | 2008-05-17 17:10:55 +0200 (Sat, 17 May 2008) | 15 lines Changed paths: M /branches/gnome-keyring/subversion/include/private/svn_auth_private.h M /branches/gnome-keyring/subversion/libsvn_subr/simple_providers.c On the 'gnome-keyring' branch: * subversion/libsvn_subr/simple_providers.c: Move the definition of SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE from here ... * subversion/include/private/svn_auth_private.h: ... to here. * subversion/libsvn_subr/simple_providers.c (svn_auth__simple_save_creds_helper): Add SVN_AUTH__GNOME_KEYRING_PASSWORD_TYPE to the list of encrypted password types. (gnome_keyring_simple_first_creds): Update call to svn_auth__simple_first_creds_helper(). (gnome_keyring_simple_save_creds): Update call to svn_auth__simple_save_creds_helper(). ------------------------------------------------------------------------ r31266 | arfrever | 2008-05-17 18:41:58 +0200 (Sat, 17 May 2008) | 34 lines Changed paths: M /branches/gnome-keyring/Makefile.in M /branches/gnome-keyring/build.conf M /branches/gnome-keyring/configure.ac M /branches/gnome-keyring/subversion/include/svn_auth.h M /branches/gnome-keyring/subversion/include/svn_auth_dso.h A /branches/gnome-keyring/subversion/libsvn_auth_gnome_keyring A /branches/gnome-keyring/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c M /branches/gnome-keyring/subversion/libsvn_subr/cmdline.c M /branches/gnome-keyring/subversion/libsvn_subr/simple_providers.c On the 'gnome-keyring' branch: Create the 'libsvn_auth_gnome_keyring' library. * build.conf (libsvn_auth_gnome_keyring): Implement. (libsvn_subr.libs): Delete gnome-keyring. * configure.ac (GNOME Keyring): Check for shared libraries and APR_HAS_DSO. (Build and install rules): Add libsvn_auth_gnome_keyring rules. * Makefile.in (gnome_keyring_libdir, INSTALL_GNOME_KEYRING_LIB): Define. * subversion/include/svn_auth.h (svn_auth_get_gnome_keyring_simple_provider): Move from here ... * subversion/include/svn_auth_dso.h (svn_auth_get_gnome_keyring_simple_provider): ... to here. * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): Use get_auth_simple_provider() to dynamically load GNOME Keyring provider. * subversion/libsvn_subr/simple_providers.c (gnome_keyring_password_get, gnome_keyring_password_set, gnome_keyring_simple_first_creds, gnome_keyring_simple_save_creds, gnome_keyring_init, gnome_keyring_simple_provider, svn_auth_get_gnome_keyring_simple_provider): Move from here ... * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (gnome_keyring_password_get, gnome_keyring_password_set, gnome_keyring_simple_first_creds, gnome_keyring_simple_save_creds, gnome_keyring_init, gnome_keyring_simple_provider, svn_auth_get_gnome_keyring_simple_provider): ... to here. ------------------------------------------------------------------------ r31267 | arfrever | 2008-05-17 18:50:26 +0200 (Sat, 17 May 2008) | 5 lines Changed paths: M /branches/gnome-keyring/configure.ac On the 'gnome-keyring' branch: * configure.ac (GNOME Keyring): Use temporarily changed CPPFLAGS instead of CFLAGS. ------------------------------------------------------------------------ r31268 | hwright | 2008-05-17 19:48:56 +0200 (Sat, 17 May 2008) | 3 lines Changed paths: M /branches/fs-rep-sharing M /branches/fs-rep-sharing/CHANGES M /branches/fs-rep-sharing/COMMITTERS M /branches/fs-rep-sharing/Makefile.in M /branches/fs-rep-sharing/build/generator/gen_base.py M /branches/fs-rep-sharing/build.conf M /branches/fs-rep-sharing/configure.ac M /branches/fs-rep-sharing/contrib/client-side/svnmerge/svnmerge-migrate-history.py M /branches/fs-rep-sharing/contrib/client-side/svnmerge/svnmerge-migrate-test.sh A /branches/fs-rep-sharing/contrib/hook-scripts/svn-keyword-check.pl (from /trunk/contrib/hook-scripts/svn-keyword-check.pl:31267) M /branches/fs-rep-sharing/notes/commit-access-templates/contrib-committer.tmpl M /branches/fs-rep-sharing/notes/commit-access-templates/full-committer.tmpl M /branches/fs-rep-sharing/notes/commit-access-templates/partial-committer.tmpl D /branches/fs-rep-sharing/notes/tree-conflicts/testing.txt M /branches/fs-rep-sharing/subversion/bindings/javahl/native/SVNClient.cpp M /branches/fs-rep-sharing/subversion/bindings/swig/core.i M /branches/fs-rep-sharing/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c M /branches/fs-rep-sharing/subversion/bindings/swig/python/tests/client.py M /branches/fs-rep-sharing/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c M /branches/fs-rep-sharing/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h M /branches/fs-rep-sharing/subversion/bindings/swig/ruby/svn/client.rb M /branches/fs-rep-sharing/subversion/bindings/swig/ruby/svn/core.rb M /branches/fs-rep-sharing/subversion/bindings/swig/ruby/test/test_client.rb M /branches/fs-rep-sharing/subversion/bindings/swig/svn_client.i A /branches/fs-rep-sharing/subversion/include/private/svn_auth_private.h (from /trunk/subversion/include/private/svn_auth_private.h:31267) M /branches/fs-rep-sharing/subversion/include/private/svn_log.h M /branches/fs-rep-sharing/subversion/include/svn_auth.h A /branches/fs-rep-sharing/subversion/include/svn_auth_dso.h (from /trunk/subversion/include/svn_auth_dso.h:31267) M /branches/fs-rep-sharing/subversion/include/svn_client.h M /branches/fs-rep-sharing/subversion/include/svn_repos.h M /branches/fs-rep-sharing/subversion/include/svn_subst.h M /branches/fs-rep-sharing/subversion/include/svn_wc.h A /branches/fs-rep-sharing/subversion/libsvn_auth_kwallet (from /trunk/subversion/libsvn_auth_kwallet:31267) R /branches/fs-rep-sharing/subversion/libsvn_auth_kwallet/kwallet.cpp (from /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp:31267) M /branches/fs-rep-sharing/subversion/libsvn_client/add.c M /branches/fs-rep-sharing/subversion/libsvn_client/client.h M /branches/fs-rep-sharing/subversion/libsvn_client/commit.c M /branches/fs-rep-sharing/subversion/libsvn_client/commit_util.c M /branches/fs-rep-sharing/subversion/libsvn_client/copy.c M /branches/fs-rep-sharing/subversion/libsvn_client/delete.c M /branches/fs-rep-sharing/subversion/libsvn_client/merge.c M /branches/fs-rep-sharing/subversion/libsvn_client/mergeinfo.h M /branches/fs-rep-sharing/subversion/libsvn_client/prop_commands.c M /branches/fs-rep-sharing/subversion/libsvn_client/ra.c M /branches/fs-rep-sharing/subversion/libsvn_fs_base/fs.c M /branches/fs-rep-sharing/subversion/libsvn_ra/compat.c M /branches/fs-rep-sharing/subversion/libsvn_ra/ra_loader.c M /branches/fs-rep-sharing/subversion/libsvn_ra_neon/util.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/blame.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/log.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/merge.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/property.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/ra_serf.h M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/serf.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/util.c M /branches/fs-rep-sharing/subversion/libsvn_repos/fs-wrap.c M /branches/fs-rep-sharing/subversion/libsvn_subr/cmdline.c M /branches/fs-rep-sharing/subversion/libsvn_subr/path.c M /branches/fs-rep-sharing/subversion/libsvn_subr/simple_providers.c M /branches/fs-rep-sharing/subversion/libsvn_subr/time.c M /branches/fs-rep-sharing/subversion/libsvn_wc/adm_ops.c M /branches/fs-rep-sharing/subversion/libsvn_wc/copy.c M /branches/fs-rep-sharing/subversion/libsvn_wc/merge.c M /branches/fs-rep-sharing/subversion/libsvn_wc/util.c M /branches/fs-rep-sharing/subversion/po/de.po M /branches/fs-rep-sharing/subversion/po/pl.po M /branches/fs-rep-sharing/subversion/po/zh_CN.po M /branches/fs-rep-sharing/subversion/svn/blame-cmd.c M /branches/fs-rep-sharing/subversion/svn/cl.h M /branches/fs-rep-sharing/subversion/svn/commit-cmd.c M /branches/fs-rep-sharing/subversion/svn/copy-cmd.c M /branches/fs-rep-sharing/subversion/svn/delete-cmd.c M /branches/fs-rep-sharing/subversion/svn/import-cmd.c M /branches/fs-rep-sharing/subversion/svn/log-cmd.c M /branches/fs-rep-sharing/subversion/svn/main.c M /branches/fs-rep-sharing/subversion/svn/mkdir-cmd.c M /branches/fs-rep-sharing/subversion/svn/move-cmd.c M /branches/fs-rep-sharing/subversion/svn/notify.c M /branches/fs-rep-sharing/subversion/svn/propdel-cmd.c M /branches/fs-rep-sharing/subversion/svn/propedit-cmd.c M /branches/fs-rep-sharing/subversion/svn/propset-cmd.c M /branches/fs-rep-sharing/subversion/svn/util.c M /branches/fs-rep-sharing/subversion/tests/cmdline/depth_tests.py M /branches/fs-rep-sharing/subversion/tests/cmdline/log_tests.py M /branches/fs-rep-sharing/subversion/tests/cmdline/merge_tests.py M /branches/fs-rep-sharing/subversion/tests/cmdline/prop_tests.py M /branches/fs-rep-sharing/subversion/tests/libsvn_subr/path-test.c M /branches/fs-rep-sharing/tools/client-side/showchange.pl M /branches/fs-rep-sharing/tools/server-side/svn_server_log_parse.py M /branches/fs-rep-sharing/tools/server-side/test_svn_server_log_parse.py M /branches/fs-rep-sharing/www/hacking.html M /branches/fs-rep-sharing/www/links.html M /branches/fs-rep-sharing/www/svn_1.5_releasenotes.html M /branches/fs-rep-sharing/www/tools_contrib.html On fs-rep-sharing branch: Merge from trunk. ------------------------------------------------------------------------ r31269 | arfrever | 2008-05-17 20:30:43 +0200 (Sat, 17 May 2008) | 14 lines Changed paths: M /branches/gnome-keyring/configure.ac M /branches/gnome-keyring/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c On the 'gnome-keyring' branch: Don't use GNOME Keyring when the '--non-interactive' option is used. Don't show the following warning when Subversion is run outside X session: ** (process:NUMBER): WARNING **: couldn't connect to dbus session bus: dbus-launch failed to autolaunch D-Bus session: Autolaunch error: X11 initialization failed. * configure.ac (GNOME Keyring): Check for D-Bus. Add D-Bus include directories to SVN_GNOME_KEYRING_INCLUDES. Add D-Bus libraries to SVN_GNOME_KEYRING_LIBS. * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (): Include . (gnome_keyring_password_get, gnome_keyring_password_set): Return false when non_interactive or '! dbus_bus_get(DBUS_BUS_SESSION, NULL)' is true. ------------------------------------------------------------------------ r31270 | arfrever | 2008-05-17 20:39:20 +0200 (Sat, 17 May 2008) | 4 lines Changed paths: M /branches/gnome-keyring/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c On the 'gnome-keyring' branch: * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c: Include . ------------------------------------------------------------------------ r31271 | hwright | 2008-05-17 23:55:40 +0200 (Sat, 17 May 2008) | 31 lines Changed paths: M /trunk/subversion/include/svn_client.h M /trunk/subversion/include/svn_props.h M /trunk/subversion/libsvn_client/add.c M /trunk/subversion/libsvn_client/client.h M /trunk/subversion/libsvn_client/commit.c M /trunk/subversion/libsvn_client/commit_util.c M /trunk/subversion/libsvn_client/copy.c M /trunk/subversion/libsvn_client/delete.c M /trunk/subversion/libsvn_client/prop_commands.c M /trunk/subversion/libsvn_subr/properties.c As part of issue #3200, declare the revprop_table parameters const. * subversion/include/svn_client.h (svn_client_mkdir3, svn_client_delete3, svn_client_import3, svn_client_commit4, svn_client_copy4, svn_client_move5, svn_client_propset3): const-ify the revprop_table parameter. * subversion/include/svn_props.h, subversion/libsvn_subr/properties.c (svn_prop_has_svn_prop): Same. * subversion/libsvn_client/delete.c (delete_urls, svn_client_delete3): Same. * subversion/libsvn_client/client.h, subversion/libsvn_client/commit_util.c (svn_client__ensure_revprop_table): Same. * subversion/libsvn_client/prop_commands.c (propset_on_url, svn_client_propset3): Same. * subversion/libsvn_client/copy.c (repos_to_repos_copy, wc_to_repos_copy, setup_copy, svn_client_copy4, svn_client_move5): Same. * subversion/libsvn_client/add.c (mkdir_urls, svn_client_mkdir3): Same. * subversion/libsvn_client/commit.c (get_ra_editor, svn_client_import3, svn_client_commit4): Same. ------------------------------------------------------------------------ r31272 | hwright | 2008-05-18 01:09:44 +0200 (Sun, 18 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Add r31271 to the issue 3200 group. ------------------------------------------------------------------------ r31273 | hwright | 2008-05-18 05:48:41 +0200 (Sun, 18 May 2008) | 25 lines Changed paths: M /trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp M /trunk/subversion/bindings/javahl/native/ProplistCallback.h M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java JavaHL: Update the log interface to return arbitrary revprops, not just the "standard" ones. This better supports the underlying C API, as well as makes it more extensible for the future. This was done in conjunction with work for issue #3200, and should be merged to 1.5.x if it is. If not, we'll need to rev the appropriate APIs to maintain backwards compat. [ in subversion/bindings/javahl/ ] * tests/org/tigris/subversion/javahl/BasicTests.java (getMergeinfoRevisions): Update to new interface. * native/ProplistCallback.h (makeMapFromHash): Make static and public so the log callback can use it. * native/LogMessageCallback.cpp (singleMessage): Return all the revprops retrieved by 'log' to the caller. * src/org/tigris/subversion/javahl/LogMessageCallback.java (singleMessage): Update to accept a Map or revprops, instead of just the standard svn:* revprops. * src/org/tigris/subversion/javahl/SVNClient.java (MyLogMessageCallback): Parse the date into microseconds, to maintain compat. ------------------------------------------------------------------------ r31274 | hwright | 2008-05-18 06:19:48 +0200 (Sun, 18 May 2008) | 29 lines Changed paths: A /trunk/subversion/bindings/javahl/native/RevpropTable.cpp A /trunk/subversion/bindings/javahl/native/RevpropTable.h M /trunk/subversion/bindings/javahl/native/SVNClient.cpp M /trunk/subversion/bindings/javahl/native/SVNClient.h M /trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Extend issue #3200 API changes to JavaHL for commit(). Additional APIs will be forthcoming. [ subversion/bindings/javahl/ ] * tests/org/tigris/subversion/javahl/BasicTests.java (testCommitRevprops): New test. * native/org_tigris_subversion_javahl_SVNClient.cpp (Java_org_tigris_subversion_javahl_SVNClient_commit): Add revprop table argument, convert it, and pass it down the stack. * native/SVNClient.h, native/SVNClient.cpp (commit): Add revprop table argument and pass it to the C API. * native/RevpropTable.h, native/RevpropTable.cpp: New. * src/org/tigris/subversion/javahl/SVNClient.java (commit): Add default parameter of null. (commit): Add revprop table argument. * src/org/tigris/subversion/javahl/SVNClientSynchronized.java (commit): Add revprop table argument. * src/org/tigris/subversion/javahl/SVNClientInterface.java (commit): Add revprop table argument. ------------------------------------------------------------------------ r31275 | hwright | 2008-05-18 08:43:52 +0200 (Sun, 18 May 2008) | 26 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp M /trunk/subversion/bindings/javahl/native/SVNClient.h M /trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Extend issue #3200 API changes to JavaHL for remove(), copy(), move(), mkdir(), and doImport(). [ subversion/bindings/javahl/ ] * tests/org/tigris/subversion/javahl/BasicTests.java (testBasicImport, testCopy): Update tests. * native/org_tigris_subversion_javahl_SVNClient.cpp (Java_org_tigris_subversion_javahl_SVNClient_remove, Java_org_tigris_subversion_javahl_SVNClient_copy, Java_org_tigris_subversion_javahl_SVNClient_move, Java_org_tigris_subversion_javahl_SVNClient_mkdir, Java_org_tigris_subversion_javahl_SVNClient_doImport): Add revpropTable parameter and send it down the stack. * native/SVNClient.h, native/SVNClient.cpp (doImport, mkdir, move, copy, remove): Add parameter, and pass it down the stack to the C API. * src/org/tigris/subversion/javahl/SVNClientSynchronized.java, src/org/tigris/subversion/javahl/SVNClient.java, src/org/tigris/subversion/javahl/SVNClientInterface.java (remove, mkdir, move, copy, doImport): Add revpropTable parameter, and update relevant wrappers. ------------------------------------------------------------------------ r31276 | hwright | 2008-05-18 09:08:55 +0200 (Sun, 18 May 2008) | 19 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp M /trunk/subversion/bindings/javahl/native/SVNClient.h M /trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java Extend issue #3200 API changes to JavaHL for propertySet(). Although we could extend this to propertyRemove() and propertyCreate(), it doesn't seem very useful at this time. [ subversion/bindings/javahl/ ] * native/org_tigris_subversion_javahl_SVNClient.cpp (Java_org_tigris_subversion_javahl_SVNClient_propertySet): Add revpropTable parameter and send it down the stack. * native/SVNClient.h, native/SVNClient.cpp (propertySet): Add parameter, and pass it down the stack to the C API. * src/org/tigris/subversion/javahl/SVNClientSynchronized.java, src/org/tigris/subversion/javahl/SVNClient.java, src/org/tigris/subversion/javahl/SVNClientInterface.java (propertySet): Add revpropTable parameter, and update relevant wrappers. (propertyRemove, propertyCreate): Update wrappers. ------------------------------------------------------------------------ r31277 | hwright | 2008-05-18 09:11:07 +0200 (Sun, 18 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31273 and r31274-r31276. ------------------------------------------------------------------------ r31278 | fabien | 2008-05-18 09:54:31 +0200 (Sun, 18 May 2008) | 4 lines Changed paths: M /branches/1.5.x/subversion/po/fr.po French translation update for r31277: * subversion/po/fr.po: fixed 4 new and 21 fuzzy ------------------------------------------------------------------------ r31279 | lgo | 2008-05-18 11:05:25 +0200 (Sun, 18 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: add vote and remark to r31196. ------------------------------------------------------------------------ r31280 | lgo | 2008-05-18 11:30:39 +0200 (Sun, 18 May 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/commit_tests.py Add regression test for issue #3198. * subversion/tests/cmdline/commit_tests.py (commit_added_missing): New test for issue #3198, fixed in r31196. (test_list): Run the new test, should pass. ------------------------------------------------------------------------ r31281 | lgo | 2008-05-18 11:34:32 +0200 (Sun, 18 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: add r31280 to the r31196 group and vote for backport. ------------------------------------------------------------------------ r31282 | fabien | 2008-05-18 11:40:40 +0200 (Sun, 18 May 2008) | 4 lines Changed paths: M /trunk/subversion/po/fr.po French translation update for r31278. * subversion/po/fr.po: fixed some fuzzy and new translations. ------------------------------------------------------------------------ r31283 | danielsh | 2008-05-18 15:36:04 +0200 (Sun, 18 May 2008) | 5 lines Changed paths: M /trunk/subversion/tests/cmdline/commit_tests.py Trivial followup to r31280 (test for issue #3198). * subversion/tests/cmdline/commit_tests.py (commit_added_missing): Reverse sense of comment. ------------------------------------------------------------------------ r31284 | danielsh | 2008-05-18 15:39:46 +0200 (Sun, 18 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Add obvious fix r31283 to the r31196 group, and vote for it. ------------------------------------------------------------------------ r31285 | danielsh | 2008-05-18 16:40:34 +0200 (Sun, 18 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Grammar fix. ------------------------------------------------------------------------ r31286 | arfrever | 2008-05-18 16:44:28 +0200 (Sun, 18 May 2008) | 3 lines Changed paths: M /branches/gnome-keyring M /branches/gnome-keyring/subversion/bindings/javahl/native/LogMessageCallback.cpp M /branches/gnome-keyring/subversion/bindings/javahl/native/ProplistCallback.h A /branches/gnome-keyring/subversion/bindings/javahl/native/RevpropTable.cpp (from /trunk/subversion/bindings/javahl/native/RevpropTable.cpp:31285) A /branches/gnome-keyring/subversion/bindings/javahl/native/RevpropTable.h (from /trunk/subversion/bindings/javahl/native/RevpropTable.h:31285) M /branches/gnome-keyring/subversion/bindings/javahl/native/SVNClient.cpp M /branches/gnome-keyring/subversion/bindings/javahl/native/SVNClient.h M /branches/gnome-keyring/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp M /branches/gnome-keyring/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java M /branches/gnome-keyring/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/gnome-keyring/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /branches/gnome-keyring/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /branches/gnome-keyring/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/gnome-keyring/subversion/include/svn_client.h M /branches/gnome-keyring/subversion/include/svn_props.h M /branches/gnome-keyring/subversion/libsvn_client/add.c M /branches/gnome-keyring/subversion/libsvn_client/client.h M /branches/gnome-keyring/subversion/libsvn_client/commit.c M /branches/gnome-keyring/subversion/libsvn_client/commit_util.c M /branches/gnome-keyring/subversion/libsvn_client/copy.c M /branches/gnome-keyring/subversion/libsvn_client/delete.c M /branches/gnome-keyring/subversion/libsvn_client/prop_commands.c M /branches/gnome-keyring/subversion/libsvn_subr/properties.c M /branches/gnome-keyring/subversion/po/fr.po M /branches/gnome-keyring/subversion/tests/cmdline/commit_tests.py On the 'gnome-keyring' branch: Merge r31263:31285 from trunk. ------------------------------------------------------------------------ r31287 | lgo | 2008-05-18 16:50:15 +0200 (Sun, 18 May 2008) | 7 lines Changed paths: M /trunk/subversion/tests/cmdline/commit_tests.py Fix the regression test added in r31280 (test for issue #3198) to also work in case-ignoring file systems. * subversion/tests/cmdline/commit_tests.py (commit_added_missing): Use path names a.txt and b.txt, as 'b' already exists as directory 'B'. ------------------------------------------------------------------------ r31288 | lgo | 2008-05-18 16:53:50 +0200 (Sun, 18 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: add r31287 to the 31196 group. ------------------------------------------------------------------------ r31289 | arfrever | 2008-05-18 21:25:28 +0200 (Sun, 18 May 2008) | 34 lines Changed paths: M /trunk/subversion/bindings/javahl/native/Prompter.cpp M /trunk/subversion/bindings/javahl/native/SVNClient.cpp Don't use deprecated svn_client_get_*_provider functions in JavaHL. * subversion/bindings/javahl/native/Prompter.cpp (): Include appropriate headers. (Prompter::getProviderSimple): Call svn_auth_get_simple_prompt_provider() instead of svn_client_get_simple_prompt_provider(). (Prompter::getProviderUsername): Call svn_auth_get_username_prompt_provider() instead of svn_client_get_username_prompt_provider(). (Prompter::getProviderServerSSLTrust): Call svn_auth_get_ssl_server_trust_prompt_provider() instead of svn_client_get_ssl_server_trust_prompt_provider(). (Prompter::getProviderClientSSL): Call svn_auth_get_ssl_client_cert_prompt_provider() instead of svn_client_get_ssl_client_cert_prompt_provider(). (Prompter::getProviderClientSSLPassword): Call svn_auth_get_ssl_client_cert_pw_prompt_provider() instead of svn_client_get_ssl_client_cert_pw_prompt_provider(). * subversion/bindings/javahl/native/SVNClient.cpp (): Include "svn_auth.h". (SVNClient::getContext): Call svn_auth_get_windows_simple_provider() instead of svn_client_get_windows_simple_provider(). Call svn_auth_get_simple_provider() instead of svn_client_get_simple_provider(). Call svn_auth_get_username_provider() instead of svn_client_get_username_provider(). Call svn_auth_get_ssl_server_trust_file_provider() instead of svn_client_get_ssl_server_trust_file_provider(). Call svn_auth_get_ssl_client_cert_file_provider() instead of svn_client_get_ssl_client_cert_file_provider(). Call svn_auth_get_ssl_client_cert_pw_file_provider() instead of svn_client_get_ssl_client_cert_pw_file_provider. ------------------------------------------------------------------------ r31290 | arfrever | 2008-05-18 21:31:12 +0200 (Sun, 18 May 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_subr/cmdline.c * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): Fix indentation. ------------------------------------------------------------------------ r31291 | arfrever | 2008-05-18 21:40:54 +0200 (Sun, 18 May 2008) | 10 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp Use Keychain and KWallet in JavaHL. * subversion/libsvn_subr/cmdline.c (get_auth_simple_provider): Copy from here ... * subversion/bindings/javahl/native/SVNClient.cpp (get_auth_simple_provider): ... to here. * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::getContext): Use Keychain and KWallet providers. ------------------------------------------------------------------------ r31292 | markphip | 2008-05-18 22:13:33 +0200 (Sun, 18 May 2008) | 8 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp JavaHL: Followup to r23812. Add Windows SSL certificate trust provider support to JavaHL. [ in subversion/bindings/javahl/ ] * native/SVNClient.cpp (SVNClient::getContext): Use Windows SSL certificate trust provider. ------------------------------------------------------------------------ r31293 | sbutler | 2008-05-19 08:11:49 +0200 (Mon, 19 May 2008) | 12 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/svntest/actions.py On the tree-conflicts branch, add test setup functions for "deep" tree conflicts involving directories and their descendants. * subversion/tests/cmdline/svntest/actions.py (make_tc_test_trees, tc_leaf_del, tc_tree_del, tc_text_append, set_up_deep_tree_conflicts_up, set_up_deep_tree_conflicts_sw): New functions. ------------------------------------------------------------------------ r31294 | jensseidel | 2008-05-19 09:21:40 +0200 (Mon, 19 May 2008) | 5 lines Changed paths: M /branches/1.5.x/subversion/po/de.po German translation update. * subversion/po/de.po: Called tools/po/po-update.sh de Current status: 1399t 247f 156u ------------------------------------------------------------------------ r31295 | jensseidel | 2008-05-19 09:24:39 +0200 (Mon, 19 May 2008) | 4 lines Changed paths: M /branches/1.5.x/subversion/po/de.po German translation update. * subversion/po/de.po: Current status: 1585t 147f 70u ------------------------------------------------------------------------ r31296 | kameshj | 2008-05-19 16:32:39 +0200 (Mon, 19 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c Fix the typo. * subversion/libsvn_wc/update_editor.c (add_directory): 'unexepected' -> 'unexpected'. ------------------------------------------------------------------------ r31297 | markphip | 2008-05-19 17:31:18 +0200 (Mon, 19 May 2008) | 3 lines Changed paths: M /branches/1.5.x/STATUS STATUS: Nominate and vote for r31292 ------------------------------------------------------------------------ r31298 | markphip | 2008-05-19 17:35:57 +0200 (Mon, 19 May 2008) | 3 lines Changed paths: M /branches/gnome-keyring M /branches/gnome-keyring/subversion/bindings/javahl/native/Prompter.cpp M /branches/gnome-keyring/subversion/bindings/javahl/native/SVNClient.cpp M /branches/gnome-keyring/subversion/libsvn_subr/cmdline.c M /branches/gnome-keyring/subversion/libsvn_wc/update_editor.c M /branches/gnome-keyring/subversion/tests/cmdline/commit_tests.py On the 'gnome-keyring' branch: Merge r31285:31297 from trunk. ------------------------------------------------------------------------ r31299 | markphip | 2008-05-19 17:40:28 +0200 (Mon, 19 May 2008) | 6 lines Changed paths: M /branches/gnome-keyring/subversion/bindings/javahl/native/SVNClient.cpp On the 'gnome-keyring' branch: Use GNOME Keyring in JavaHL. * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::getContext): Use GNOME Keyring provider. ------------------------------------------------------------------------ r31300 | pburba | 2008-05-19 20:19:19 +0200 (Mon, 19 May 2008) | 10 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Test for issue #3199, Subtree merges broken when required ranges don't intersect with merge target. * subversion/tests/cmdline/merge_tests.py (subtree_merges_dont_intersect_with_targets): New. (test_list): Add XFailing subtree_merges_dont_intersect_with_targets. ------------------------------------------------------------------------ r31301 | pburba | 2008-05-19 20:26:41 +0200 (Mon, 19 May 2008) | 17 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Partial fix for issue #3199, Subtree merges broken when required ranges don't intersect with merge target. * subversion/libsvn_client/merge.c (remove_first_range_from_remaining_ranges): Add end_rev argument. Don't always remove the first remaining range for each child. This is the wrong behavior if the first range in the target and the first range in a child don't intersect. In that case, two separate editor drives are required, and if we remove the non-intersecting first range then one of those ranges is never merged. (do_directory_merge): Update call to remove_first_range_from_remaining_ranges(). * subversion/tests/cmdline/merge_tests.py (subtree_merges_dont_intersect_with_targets): Removed comment about XFail. (test_list): Remove XFail from subtree_merges_dont_intersect_with_targets. ------------------------------------------------------------------------ r31302 | glasser | 2008-05-19 22:18:56 +0200 (Mon, 19 May 2008) | 19 lines Changed paths: M /branches/in-memory-cache/build/run_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/svntest/main.py M /branches/in-memory-cache/subversion/tests/tests.conf On the in-memory-cache branch: Follow up r30312 by also supporting tests.conf in Python tests. That is, allow you to test memcached support in the cmdline test suite. * build/run_tests.py (TestHarness._run_test): Pass --config-file to Python tests. * subversion/tests/cmdline/svntest/main.py (config_file): New variable. (get_fsfs_conf_file_path): New. (create_repos): Copy in the config file if it's given. (usage): Document --config-file. (run_tests): Parse --config-file. * subversion/tests/tests.conf Change comment to claim it's used by all the tests, not just the C tests. ------------------------------------------------------------------------ r31303 | glasser | 2008-05-19 23:47:19 +0200 (Mon, 19 May 2008) | 10 lines Changed paths: M /trunk/subversion/tests/cmdline/prop_tests.py M /trunk/subversion/tests/cmdline/svntest/main.py Make all tests pass against 1.4.x again by not expecting 1.4.x servers to check date syntax. * subversion/tests/cmdline/prop_tests.py (test_list): Make invalid_propvalues skip unless the server will actually check date syntax. * subversion/tests/cmdline/svntest/main.py (server_enforces_date_syntax): New. ------------------------------------------------------------------------ r31304 | glasser | 2008-05-19 23:49:00 +0200 (Mon, 19 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Nominate r31303 for backport to 1.5.x. ------------------------------------------------------------------------ r31305 | kfogel | 2008-05-20 06:54:26 +0200 (Tue, 20 May 2008) | 5 lines Changed paths: M /trunk/www/links.html * www/links.html (hosting): Add xp-dev.com. Patch by: Roopinder Singh (Tweaked by me.) ------------------------------------------------------------------------ r31306 | danielsh | 2008-05-20 08:32:25 +0200 (Tue, 20 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31303. ------------------------------------------------------------------------ r31307 | danielsh | 2008-05-20 08:33:31 +0200 (Tue, 20 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Nominate r31228. ------------------------------------------------------------------------ r31308 | stylesen | 2008-05-20 13:15:56 +0200 (Tue, 20 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_subr/ssl_server_trust_providers.c Fix typo in comment. * subversion/libsvn_subr/ssl_server_trust_providers.c (): s/retieve/retrieve/ ------------------------------------------------------------------------ r31309 | julianfoad | 2008-05-20 14:41:05 +0200 (Tue, 20 May 2008) | 8 lines Changed paths: M /branches/tree-conflicts/subversion/include/svn_wc.h M /branches/tree-conflicts/subversion/libsvn_wc/tree_conflicts.h Trivial updates to doc strings. * subversion/include/svn_wc.h Update a file name that was changed, and correct an argument name. * subversion/libsvn_wc/tree_conflicts.h Update the name of the "notes/tree-conflicts" directory. ------------------------------------------------------------------------ r31310 | julianfoad | 2008-05-20 15:56:46 +0200 (Tue, 20 May 2008) | 8 lines Changed paths: M /branches/tree-conflicts/subversion/libsvn_wc/update_editor.c Detect a tree conflict when an update applies a directory property modification to a directory that has been deleted. This makes tree_conflict_tests.py test #5 pass. * subversion/libsvn_wc/update_editor.c (open_directory): Pass the correct log accumulator to the conflict detector. ------------------------------------------------------------------------ r31311 | kfogel | 2008-05-20 17:36:39 +0200 (Tue, 20 May 2008) | 8 lines Changed paths: M /trunk/subversion/tests/cmdline/copy_tests.py Add a regression test for a bug that will be fixed in r31314. Found by: Alexander Kitaev * subversion/tests/cmdline/copy_tests.py (unneeded_parents): New test. (test_list): Run it. ------------------------------------------------------------------------ r31312 | pburba | 2008-05-20 18:53:35 +0200 (Tue, 20 May 2008) | 25 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Fix broken notification portion of issue #3199, 'subtree merges broken when required ranges don't intersect with merge target'. Really this is a follow-up to r30746, as that was the cause of the problems described in http://subversion.tigris.org/issues/show_bug.cgi?id=3199#desc3. r30746 fixed a merge notification bug when a path with explicit mergeinfo was deleted by a merge. But in fixing that bug it introduced a new one not found till issue #3199. Likely r30746 caused other notification bugs that have gone unnoticed, since the test suite is a *bit* lax in checking the merge notification headers. * subversion/libsvn_client/merge.c (find_nearest_ancestor): Add a flag dictating whether a path can be considered its own ancestor or not. (notification_receiver): Update call to find_nearest_ancestor() returning the default behavior to pre-r30746, i.e. a path can be its own ancestor. Only when deleting a path do we want the notification path to be a proper WC ancestor of the deleted path (this is what r30746 should have done all along). * subversion/tests/cmdline/merge_tests.py (subtree_merges_dont_intersect_with_targets): Rerun the final two merges, a.k.a. the ones that matter for this test, checking the merge notification headers. ------------------------------------------------------------------------ r31313 | lgo | 2008-05-20 19:16:38 +0200 (Tue, 20 May 2008) | 59 lines Changed paths: M /trunk/subversion/include/svn_error_codes.h M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/libsvn_ra_neon/commit.c M /trunk/subversion/libsvn_ra_neon/get_locks.c M /trunk/subversion/libsvn_ra_neon/props.c M /trunk/subversion/libsvn_ra_neon/session.c M /trunk/subversion/libsvn_ra_neon/util.c M /trunk/subversion/libsvn_ra_serf/blame.c M /trunk/subversion/libsvn_ra_serf/commit.c M /trunk/subversion/libsvn_ra_serf/getlocations.c M /trunk/subversion/libsvn_ra_serf/getlocationsegments.c M /trunk/subversion/libsvn_ra_serf/mergeinfo.c M /trunk/subversion/libsvn_ra_serf/property.c M /trunk/subversion/libsvn_ra_serf/ra_serf.h M /trunk/subversion/libsvn_ra_serf/serf.c M /trunk/subversion/libsvn_ra_serf/update.c M /trunk/subversion/libsvn_ra_serf/util.c M /trunk/subversion/svn/mkdir-cmd.c Fix issue #3137: use a consistent error code when a path is not found in the repository. DAV uses a 404 status code to indicate missing paths, so we now convert that code to SVN_ERR_FS_NOT_FOUND, as we do for ra_local and ra_svn. As this is client side only, this patch also removes all instances were we test for the now deprecated error code SVN_ERR_RA_DAV_PATH_NOT_FOUND. * subversion/include/svn_error_codes.h (SVN_ERR_RA_DAV_PATH_NOT_FOUND): Deprecate error code. * subversion/libsvn_ra_serf/ra_serf.h (svn_ra_serf__error_on_status): New function declaration. * subversion/libsvn_ra_serf/util.c (svn_ra_serf__error_on_status): New function definition. * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__has_capability, svn_ra_serf__check_path, svn_ra_serf__stat): Use SVN_ERR_FS_NOT_FOUND error code here .. * subversion/libsvn_ra_serf/util.c (svn_ra_serf__discover_root): .. and here. * subversion/libsvn_ra_serf/mergeinfo.c (svn_ra_serf__get_mergeinfo): Use svn_ra_serf__error_on_status here .. * subversion/libsvn_ra_serf/getlocationsegments.c (svn_ra_serf__get_location_segments): .. * subversion/libsvn_ra_serf/blame.c (svn_ra_serf__get_file_revs): .. * subversion/libsvn_ra_serf/update.c (handle_stream): .. * subversion/libsvn_ra_serf/property.c (svn_ra_serf__wait_for_props): .. * subversion/libsvn_ra_serf/getlocations.c (svn_ra_serf__get_locations): .. * subversion/libsvn_ra_serf/commit.c (checkout_dir): .. and here. (checkout_dir, get_version_url): Use better error code. (checkout_file): Use svn_ra_serf__error_on_status and better error code. * subversion/libsvn_ra_neon/props.c (svn_ra_neon__get_one_prop, svn_ra_neon__search_for_starting_props, svn_ra_neon__do_check_path, svn_ra_neon__do_stat): Use SVN_ERR_FS_NOT_FOUND error code here .. * subversion/libsvn_ra_neon/get_locks.c (svn_ra_neon__get_locks): .. * subversion/libsvn_ra_neon/util.c (generate_error): .. * subversion/libsvn_ra_neon/commit.c (commit_add_file): .. and here. * subversion/libsvn_ra_neon/session.c (svn_ra_neon__has_capability): Don't check for SVN_ERR_RA_DAV_PATH_NOT_FOUND. * subversion/svn/mkdir-cmd.c (svn_cl__mkdir): Don't check for SVN_ERR_RA_DAV_PATH_NOT_FOUND. * subversion/libsvn_client/merge.c (filter_self_referential_mergeinfo, calculate_remaining_ranges, get_mergeinfo_walk_cb): Don't check for SVN_ERR_RA_DAV_PATH_NOT_FOUND. ------------------------------------------------------------------------ r31314 | kfogel | 2008-05-20 20:08:11 +0200 (Tue, 20 May 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_client/copy.c M /trunk/subversion/tests/cmdline/copy_tests.py Fix bug whereby 'svn cp --parents URL/TO/EXISTING/FILE URL/TO/EXISTING/DIR' would seg fault. This follows up to the regression test added in r31311. Found by: Alexander Kitaev * subversion/libsvn_client/copy.c (repos_to_repos_copy): Specially handle the case where dir is an immediate child of top_url. * subversion/tests/cmdline/copy_tests.py (test_list): Expect 'unneeded_parents' to pass now. ------------------------------------------------------------------------ r31315 | cmpilato | 2008-05-20 21:13:34 +0200 (Tue, 20 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Votey votey. ------------------------------------------------------------------------ r31316 | lgo | 2008-05-20 21:19:12 +0200 (Tue, 20 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r30629, approving. Add r31313. ------------------------------------------------------------------------ r31317 | glasser | 2008-05-20 21:49:59 +0200 (Tue, 20 May 2008) | 7 lines Changed paths: M /trunk/subversion/tests/cmdline/copy_tests.py Fix a test so that future tests can pass. * subversion/tests/cmdline/copy_tests.py (replaced_local_source_for_incoming_copy): Don't claim that you don't commit to the repository if you really do, or else future tests will get broken. ------------------------------------------------------------------------ r31318 | glasser | 2008-05-20 21:56:54 +0200 (Tue, 20 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Nominate r31317 for backport to the 1.5.x branch. ------------------------------------------------------------------------ r31319 | lgo | 2008-05-20 22:04:22 +0200 (Tue, 20 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r31317, approving. ------------------------------------------------------------------------ r31320 | kfogel | 2008-05-20 23:11:26 +0200 (Tue, 20 May 2008) | 25 lines Changed paths: M /trunk/subversion/svn/info-cmd.c Fix issue #3076 whereby 'svn info' would return success (zero) even if it printed warnings about some of the targets. Now if any target encounters an error, return non-zero after handling all targets. * subversion/svn/info-cmd.c (svn_cl__info): If any targets errored, return the last error at the end, so svn will exit with a non-zero exit code. Add a test for SVN_ERR_ENTRY_NOT_FOUND, which is the actual code returned for a non-existent or existent-but-unversioned file (as indicated by manual testing, and thank goodness for tools/dev/which-error.py). Finally, rework the conditional structure a bit, making this change appear larger than it really is. Suggested by: Mark E. Hamilton epg See this message and the thread around it: http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=77852 From: "Mark E. Hamilton" To: users@subversion.tigris.org Subject: Re: svn info not setting exit status. Message-ID: <483324FA.3040404@sandia.gov> Date: Tue, 20 May 2008 13:22:34 -0600 ------------------------------------------------------------------------ r31321 | glasser | 2008-05-21 01:23:52 +0200 (Wed, 21 May 2008) | 2 lines Changed paths: M /branches/in-memory-cache M /branches/in-memory-cache/Makefile.in M /branches/in-memory-cache/build/generator/gen_base.py M /branches/in-memory-cache/build.conf M /branches/in-memory-cache/configure.ac M /branches/in-memory-cache/subversion/bindings/javahl/native/LogMessageCallback.cpp M /branches/in-memory-cache/subversion/bindings/javahl/native/Prompter.cpp M /branches/in-memory-cache/subversion/bindings/javahl/native/ProplistCallback.h A /branches/in-memory-cache/subversion/bindings/javahl/native/RevpropTable.cpp (from /trunk/subversion/bindings/javahl/native/RevpropTable.cpp:31320) A /branches/in-memory-cache/subversion/bindings/javahl/native/RevpropTable.h (from /trunk/subversion/bindings/javahl/native/RevpropTable.h:31320) M /branches/in-memory-cache/subversion/bindings/javahl/native/SVNClient.cpp M /branches/in-memory-cache/subversion/bindings/javahl/native/SVNClient.h M /branches/in-memory-cache/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp M /branches/in-memory-cache/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java M /branches/in-memory-cache/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/in-memory-cache/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /branches/in-memory-cache/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /branches/in-memory-cache/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/in-memory-cache/subversion/bindings/swig/core.i M /branches/in-memory-cache/subversion/bindings/swig/python/tests/client.py M /branches/in-memory-cache/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c M /branches/in-memory-cache/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h M /branches/in-memory-cache/subversion/bindings/swig/ruby/svn/client.rb M /branches/in-memory-cache/subversion/bindings/swig/ruby/svn/core.rb M /branches/in-memory-cache/subversion/bindings/swig/ruby/test/test_client.rb M /branches/in-memory-cache/subversion/bindings/swig/svn_client.i A /branches/in-memory-cache/subversion/include/private/svn_auth_private.h (from /trunk/subversion/include/private/svn_auth_private.h:31320) M /branches/in-memory-cache/subversion/include/svn_auth.h A /branches/in-memory-cache/subversion/include/svn_auth_dso.h (from /trunk/subversion/include/svn_auth_dso.h:31320) M /branches/in-memory-cache/subversion/include/svn_client.h M /branches/in-memory-cache/subversion/include/svn_error_codes.h M /branches/in-memory-cache/subversion/include/svn_props.h A /branches/in-memory-cache/subversion/libsvn_auth_kwallet (from /trunk/subversion/libsvn_auth_kwallet:31320) R /branches/in-memory-cache/subversion/libsvn_auth_kwallet/kwallet.cpp (from /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp:31320) M /branches/in-memory-cache/subversion/libsvn_client/add.c M /branches/in-memory-cache/subversion/libsvn_client/client.h M /branches/in-memory-cache/subversion/libsvn_client/commit.c M /branches/in-memory-cache/subversion/libsvn_client/commit_util.c M /branches/in-memory-cache/subversion/libsvn_client/copy.c M /branches/in-memory-cache/subversion/libsvn_client/delete.c M /branches/in-memory-cache/subversion/libsvn_client/merge.c M /branches/in-memory-cache/subversion/libsvn_client/prop_commands.c M /branches/in-memory-cache/subversion/libsvn_ra_neon/commit.c M /branches/in-memory-cache/subversion/libsvn_ra_neon/get_locks.c M /branches/in-memory-cache/subversion/libsvn_ra_neon/props.c M /branches/in-memory-cache/subversion/libsvn_ra_neon/session.c M /branches/in-memory-cache/subversion/libsvn_ra_neon/util.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/blame.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/commit.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/getlocations.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/mergeinfo.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/property.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/ra_serf.h M /branches/in-memory-cache/subversion/libsvn_ra_serf/serf.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/update.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/util.c M /branches/in-memory-cache/subversion/libsvn_subr/cmdline.c M /branches/in-memory-cache/subversion/libsvn_subr/properties.c M /branches/in-memory-cache/subversion/libsvn_subr/simple_providers.c M /branches/in-memory-cache/subversion/libsvn_subr/ssl_server_trust_providers.c M /branches/in-memory-cache/subversion/libsvn_wc/update_editor.c M /branches/in-memory-cache/subversion/po/fr.po M /branches/in-memory-cache/subversion/svn/commit-cmd.c M /branches/in-memory-cache/subversion/svn/copy-cmd.c M /branches/in-memory-cache/subversion/svn/delete-cmd.c M /branches/in-memory-cache/subversion/svn/import-cmd.c M /branches/in-memory-cache/subversion/svn/info-cmd.c M /branches/in-memory-cache/subversion/svn/mkdir-cmd.c M /branches/in-memory-cache/subversion/svn/move-cmd.c M /branches/in-memory-cache/subversion/svn/propdel-cmd.c M /branches/in-memory-cache/subversion/svn/propedit-cmd.c M /branches/in-memory-cache/subversion/svn/propset-cmd.c M /branches/in-memory-cache/subversion/tests/cmdline/commit_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/copy_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/merge_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/prop_tests.py M /branches/in-memory-cache/subversion/tests/cmdline/svntest/main.py M /branches/in-memory-cache/tools/server-side/svn_server_log_parse.py M /branches/in-memory-cache/tools/server-side/test_svn_server_log_parse.py M /branches/in-memory-cache/www/links.html Merge from trunk to in-memory-cache, fixing a conflict in Makefile.in. ------------------------------------------------------------------------ r31322 | hwright | 2008-05-21 05:40:14 +0200 (Wed, 21 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for the issue #3200 group. ------------------------------------------------------------------------ r31323 | hwright | 2008-05-21 05:42:51 +0200 (Wed, 21 May 2008) | 10 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/STATUS M /branches/1.5.x/contrib/server-side/mod_dontdothat/README M /branches/1.5.x/contrib/server-side/mod_dontdothat/mod_dontdothat.c M /branches/1.5.x/subversion/bindings/swig Merge r30629, r30787 from trunk: * r30629, r30787 mod_dontdothat: Allow opt-out of replay rejection. Notes: r30787 is a typo fix. Votes: +1: jerenkrantz, cmpilato +0: lgo ------------------------------------------------------------------------ r31324 | hwright | 2008-05-21 06:27:31 +0200 (Wed, 21 May 2008) | 9 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/javahl/native/SVNClient.cpp M /branches/1.5.x/subversion/bindings/swig Merge r31292 from trunk: * r31292 JavaHL: add support for Windows SSL certs as was done for CLI. Notes: This was added to the CLI in r23812 but was never added in JavaHL. Votes: +1: markphip, cmpilato ------------------------------------------------------------------------ r31325 | hwright | 2008-05-21 06:28:36 +0200 (Wed, 21 May 2008) | 12 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/tests/cmdline/copy_tests.py Merge r31317 from trunk: * r31317 Fix a test so that it doesn't break tests that are run after it. Notes: Unless you go out of your way to run tests in the suite out of order (and we don't have a --random-order), this doesn't actually hurt until we try to backport another test to this file, so not a 1.5.0 release blocker. Votes: +1: glasser, lgo ------------------------------------------------------------------------ r31326 | julianfoad | 2008-05-21 12:28:58 +0200 (Wed, 21 May 2008) | 39 lines Changed paths: M /branches/tree-conflicts/subversion/libsvn_client/merge.c M /branches/tree-conflicts/subversion/tests/cmdline/merge_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/svntest/actions.py M /branches/tree-conflicts/subversion/tests/cmdline/svntest/main.py M /branches/tree-conflicts/subversion/tests/cmdline/svntest/tree.py Detect the tree conflict of modifying a deleted directory during merge. This makes test 13 in tree_conflict_tests.py pass. Fix or XFail all tests in merge_tests.py that were failing because of tree-conflicts work. In the general test suite, show some output to ease debugging. * subversion/libsvn_client/merge.c (merge_dir_opened): If the directory being opened isn't a directory in the target, raise a tree conflict. * subversion/tests/cmdline/merge_tests.py (delete_file_and_dir, merge_tree_deleted_in_target, merge_added_dir_to_deleted_in_target, three_way_merge_add_of_existing_binary_file, merge_skips_obstructions, merge_into_missing, merge_add_over_versioned_file_conflicts, avoid_reflected_revs, mergeinfo_recording_in_skipped_merge): Adjust to expect the results of the present tree conflict detection code. (verify_lines): Make the check more robust. (verify_tree_conflict_info): New function. (tree_conflicts_in_merged_files, tree_conflicts_and_obstructions): Adjust to expect the results of the present tree conflict detection code. Use verify_tree_conflict_info() to factor out details of the output format. (test_list): Mark as XFail three tests that were failing and are not yet corrected, and unmark one of the new tree-conflict tests that now works. * subversion/tests/cmdline/svntest/actions.py (set_up_tree_conflicts_for_merge, make_tc_test_trees): Make the file content strings consistent. * subversion/tests/cmdline/svntest/main.py (run_command_stdin): Display the command's output if running in verbose mode. * subversion/tests/cmdline/svntest/tree.py (SVNTreeNode::pprint): When displaying a node with children == None, don't declare it is a file, because sometimes it is not. Instead, say "probably a file". ------------------------------------------------------------------------ r31327 | julianfoad | 2008-05-21 13:26:32 +0200 (Wed, 21 May 2008) | 7 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/log_tests.py Fix some tests that were failing due to tree conflict handling. Tests 10 and 11 of blame_tests.py, and 16 17 18 19 of log_tests.py, now pass. * subversion/tests/cmdline/log_tests.py (merge_history_repos): Resolve a tree conflict that was causing this set-up function to fail. ------------------------------------------------------------------------ r31328 | julianfoad | 2008-05-21 14:58:55 +0200 (Wed, 21 May 2008) | 6 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/svntest/main.py Fix run_command_stdin()'s printing of stderr which I broke in r31326. * subversion/tests/cmdline/svntest/main.py (run_command_stdin): Print stderr if an error occurs, not just when running in verbose mode. ------------------------------------------------------------------------ r31329 | julianfoad | 2008-05-21 15:08:58 +0200 (Wed, 21 May 2008) | 14 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/tree_conflict_tests.py Make test 7 in tree_conflict_tests.py pass. It was failing because of getting two conflicts at once, for the source and the destination of a move, when we only wanted to test a conflict on the source of the move. * subversion/tests/cmdline/tree_conflict_tests.py (incoming_paths, localmod_paths): New functions. (modify): Take a dictionary of paths to use, rather than constructing the set of paths internally, so that different paths can be used for the target of a 'move' operation in the incoming and the localmod scenarios. (set_up): Adjust calls to modify() accordingly. (ensure_tree_conflict): Adjust calls to modify() accordingly. Use run_and_verify_svn() instead of run_svn(), and remove some verbosity that is now handled within those run_* functions. ------------------------------------------------------------------------ r31330 | pburba | 2008-05-21 15:15:35 +0200 (Wed, 21 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31300, r31301, r31312 group. ------------------------------------------------------------------------ r31331 | julianfoad | 2008-05-21 15:24:59 +0200 (Wed, 21 May 2008) | 5 lines Changed paths: M /branches/tree-conflicts/subversion/libsvn_client/merge.c Destroy a sub-pool after use. A follow-up to r31326 which introduced it. * subversion/libsvn_client/merge.c (merge_dir_opened): Destroy the subpool. ------------------------------------------------------------------------ r31332 | epg | 2008-05-21 19:02:36 +0200 (Wed, 21 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Vote for r31243, r31246, r31249, r31250, r31251, r31271, noting Ruby caveat. ------------------------------------------------------------------------ r31333 | cmpilato | 2008-05-21 19:03:45 +0200 (Wed, 21 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31303, and move approved stuff into the appropriate section. ------------------------------------------------------------------------ r31334 | cmpilato | 2008-05-21 19:42:25 +0200 (Wed, 21 May 2008) | 17 lines Changed paths: M /trunk/subversion/svn/main.c Allow -c parameters to use commas or any whitespace to delimit the requested change revisions. After this change, the following crazy command works as expected: $ cd /path/to/subversion-1.5.x $ svn merge -c "31243,, , r31246 31249, r31250, r31251" \ --dry-run http://svn.collab.net/repos/svn/trunk | grep Merging --- Merging r31243 into '.': --- Merging r31246 into 'subversion/bindings/swig': --- Merging r31249 into 'subversion/bindings/swig': --- Merging r31250 into '.': --- Merging r31251 into '.': $ * subversion/svn/main.c (main): Rework -c argument parsing around svn_cstring_split(). ------------------------------------------------------------------------ r31335 | cmpilato | 2008-05-21 19:44:45 +0200 (Wed, 21 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Recommend r31334 for backport. ------------------------------------------------------------------------ r31336 | arfrever | 2008-05-21 19:49:12 +0200 (Wed, 21 May 2008) | 3 lines Changed paths: M /branches/gnome-keyring M /branches/gnome-keyring/subversion/include/svn_error_codes.h M /branches/gnome-keyring/subversion/libsvn_client/copy.c M /branches/gnome-keyring/subversion/libsvn_client/merge.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/commit.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/get_locks.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/props.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/session.c M /branches/gnome-keyring/subversion/libsvn_ra_neon/util.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/blame.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/commit.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/getlocations.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/mergeinfo.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/property.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/ra_serf.h M /branches/gnome-keyring/subversion/libsvn_ra_serf/serf.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/update.c M /branches/gnome-keyring/subversion/libsvn_ra_serf/util.c M /branches/gnome-keyring/subversion/libsvn_subr/ssl_server_trust_providers.c M /branches/gnome-keyring/subversion/svn/info-cmd.c M /branches/gnome-keyring/subversion/svn/main.c M /branches/gnome-keyring/subversion/svn/mkdir-cmd.c M /branches/gnome-keyring/subversion/tests/cmdline/copy_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/merge_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/prop_tests.py M /branches/gnome-keyring/subversion/tests/cmdline/svntest/main.py M /branches/gnome-keyring/www/links.html On the 'gnome-keyring' branch: Merge r31297:31335 from trunk. ------------------------------------------------------------------------ r31337 | arfrever | 2008-05-21 20:33:35 +0200 (Wed, 21 May 2008) | 2 lines Changed paths: M /trunk M /trunk/Makefile.in M /trunk/build.conf M /trunk/configure.ac M /trunk/subversion/bindings/javahl/native/SVNClient.cpp M /trunk/subversion/include/private/svn_auth_private.h M /trunk/subversion/include/svn_auth_dso.h A /trunk/subversion/libsvn_auth_gnome_keyring (from /branches/gnome-keyring/subversion/libsvn_auth_gnome_keyring:31336) R /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (from /branches/gnome-keyring/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c:31336) M /trunk/subversion/libsvn_subr/cmdline.c M /trunk/subversion/libsvn_subr/simple_providers.c M /trunk/tools/server-side/svn_server_log_parse.py M /trunk/tools/server-side/test_svn_server_log_parse.py Merge the 'gnome-keyring' branch to trunk. ------------------------------------------------------------------------ r31338 | arfrever | 2008-05-21 20:35:45 +0200 (Wed, 21 May 2008) | 2 lines Changed paths: D /branches/gnome-keyring Delete the 'gnome-keyring' branch which was merged to trunk in r31337. ------------------------------------------------------------------------ r31339 | epg | 2008-05-21 21:07:02 +0200 (Wed, 21 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Vote for r31313 and r31334. ------------------------------------------------------------------------ r31340 | cmpilato | 2008-05-21 22:12:48 +0200 (Wed, 21 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31313, approving. ------------------------------------------------------------------------ r31341 | danielsh | 2008-05-21 22:48:15 +0200 (Wed, 21 May 2008) | 23 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/actions.py Prevent the Python tests from changing the pristine repository by installing hook scripts on it that disallow any changes. Previously, changes to the pristine repository were silently allowed, and could lead to non-local test failures. See this thread for details: http://svn.haxx.se/dev/archive-2008-05/0806.shtml Message-ID: <1ea387f60805201250l5d983b1fheb5fb30f904b28e6@mail.gmail.com> Date: Tue, 20 May 2008 12:50:32 -0700 From: "David Glasser" Subject: Re: svn commit: r29434 - trunk/subversion/tests/cmdline Suggested by: me lgo glasser kfogel Finally... * subversion/tests/cmdline/svntest/actions.py (create_failing_hook): New helper. (setup_pristine_repository): Install always-failing start-commit, pre-lock, and pre-revprop-change hooks on the pristine repository (after initialising it). ------------------------------------------------------------------------ r31342 | cmpilato | 2008-05-21 23:24:24 +0200 (Wed, 21 May 2008) | 18 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/javahl/native/SVNClient.cpp M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/bindings/swig/python/tests/client.py M /branches/1.5.x/subversion/bindings/swig/ruby/svn/client.rb M /branches/1.5.x/subversion/bindings/swig/ruby/test/test_client.rb M /branches/1.5.x/subversion/bindings/swig/svn_client.i M /branches/1.5.x/subversion/include/svn_client.h M /branches/1.5.x/subversion/include/svn_props.h M /branches/1.5.x/subversion/libsvn_client/add.c M /branches/1.5.x/subversion/libsvn_client/client.h M /branches/1.5.x/subversion/libsvn_client/commit.c M /branches/1.5.x/subversion/libsvn_client/commit_util.c M /branches/1.5.x/subversion/libsvn_client/copy.c M /branches/1.5.x/subversion/libsvn_client/delete.c M /branches/1.5.x/subversion/libsvn_client/prop_commands.c M /branches/1.5.x/subversion/libsvn_subr/properties.c M /branches/1.5.x/subversion/svn/commit-cmd.c M /branches/1.5.x/subversion/svn/copy-cmd.c M /branches/1.5.x/subversion/svn/delete-cmd.c M /branches/1.5.x/subversion/svn/import-cmd.c M /branches/1.5.x/subversion/svn/mkdir-cmd.c M /branches/1.5.x/subversion/svn/move-cmd.c M /branches/1.5.x/subversion/svn/propdel-cmd.c M /branches/1.5.x/subversion/svn/propedit-cmd.c M /branches/1.5.x/subversion/svn/propset-cmd.c Merge from trunk this change group: * r31243, r31246, r31249, r31250, r31251, r31271 Fix issue #3200, API Ickiness: svn_client_ctx_t shouldn't carry "extra revprops"; the svn_client APIs should Notes: If we *don't* backport this in 1.5.0, we need to undo the changes or otherwise rework them to use newly-revved svn_client APIs. This is not quite finished -- need feedback from Ruby, Perl, and JavaHL bindings maintainers. Votes: +1: cmpilato, hwright, epg (but worried about Ruby) Also: * STATUS Remove the change group. ------------------------------------------------------------------------ r31343 | cmpilato | 2008-05-21 23:32:23 +0200 (Wed, 21 May 2008) | 16 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/javahl/native/LogMessageCallback.cpp M /branches/1.5.x/subversion/bindings/javahl/native/ProplistCallback.h M /branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java M /branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/1.5.x/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/1.5.x/subversion/bindings/swig Merge from trunk this change group: * r31273 Let JavaHL return arbitrary revprops through the logMessages() method. Notes: Although not directly part of issue #3200, it is complimentary to it. The r31274 group depends on this change to test (and to merge cleanly). Votes: +1: hwright (pending merge of issue #3200 fixes) +0: cmpilato Also: * STATUS Remove the change group. ------------------------------------------------------------------------ r31344 | cmpilato | 2008-05-21 23:38:42 +0200 (Wed, 21 May 2008) | 16 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS A /branches/1.5.x/subversion/bindings/javahl/native/RevpropTable.cpp (from /trunk/subversion/bindings/javahl/native/RevpropTable.cpp:31276) A /branches/1.5.x/subversion/bindings/javahl/native/RevpropTable.h (from /trunk/subversion/bindings/javahl/native/RevpropTable.h:31276) M /branches/1.5.x/subversion/bindings/javahl/native/SVNClient.cpp M /branches/1.5.x/subversion/bindings/javahl/native/SVNClient.h M /branches/1.5.x/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp M /branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /branches/1.5.x/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/1.5.x/subversion/bindings/swig Merge from trunk this change group: * r31274, r31275, r31276 Extend issue #3200 API fixes to the JavaHL bindings. Notes: This depends on r31273 and the issue #3200 group. As it touches 1.5 APIs, This should be merged, or fixed up on trunk. Votes: +1: hwright (pending merge of issue #3200 fixes) +0: cmpilato Also: * STATUS Remove the change group. ------------------------------------------------------------------------ r31345 | cmpilato | 2008-05-21 23:40:38 +0200 (Wed, 21 May 2008) | 14 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/tests/cmdline/prop_tests.py M /branches/1.5.x/subversion/tests/cmdline/svntest/main.py Merge from trunk this change group: * r31303 Skip a recently backported test when doing backwards-compatibility testing. Notes: Makes the backwards-compatibility test suite pass again. Votes: +1: glasser, danielsh, cmpilato Also: * STATUS Remove the change group. ------------------------------------------------------------------------ r31346 | glasser | 2008-05-21 23:41:55 +0200 (Wed, 21 May 2008) | 1 line Changed paths: M /branches/in-memory-cache M /branches/in-memory-cache/Makefile.in M /branches/in-memory-cache/build.conf M /branches/in-memory-cache/configure.ac M /branches/in-memory-cache/subversion/bindings/javahl/native/SVNClient.cpp M /branches/in-memory-cache/subversion/include/private/svn_auth_private.h M /branches/in-memory-cache/subversion/include/svn_auth_dso.h A /branches/in-memory-cache/subversion/libsvn_auth_gnome_keyring (from /trunk/subversion/libsvn_auth_gnome_keyring:31345) R /branches/in-memory-cache/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (from /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c:31345) M /branches/in-memory-cache/subversion/libsvn_subr/cmdline.c M /branches/in-memory-cache/subversion/libsvn_subr/simple_providers.c M /branches/in-memory-cache/subversion/svn/main.c M /branches/in-memory-cache/subversion/tests/cmdline/svntest/actions.py M /branches/in-memory-cache/tools/server-side/svn_server_log_parse.py M /branches/in-memory-cache/tools/server-side/test_svn_server_log_parse.py Merge from trunk to in-memory-cache branch. ------------------------------------------------------------------------ r31347 | pburba | 2008-05-22 00:01:41 +0200 (Thu, 22 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r30748, note that the issue #3157 group depends on it. ------------------------------------------------------------------------ r31348 | kou | 2008-05-22 13:11:50 +0200 (Thu, 22 May 2008) | 11 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/svn/client.rb M /trunk/subversion/bindings/swig/ruby/test/test_client.rb Support revprop_table in Svn::Client::Context#mkdir family. * subversion/bindings/swig/ruby/svn/client.rb (Svn::Client::Context#mkdir): Use Svn::Client::Context#mkdir2. (Svn::Client::Context#mkdir2, Svn::Client::Context#mkdir_p, Svn::Client::Context#mkdir_p2): New method. * subversion/bindings/swig/ruby/test/test_client.rb (SvnClientTest#test_mkdir_p): New test. ------------------------------------------------------------------------ r31349 | kou | 2008-05-22 13:29:37 +0200 (Thu, 22 May 2008) | 12 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/test_client.rb Follow the current notify information behavior. (Receive absolete path not relative path.) * subversion/bindings/swig/ruby/test/test_client.rb (SvnClientTest#assert_mkdir_with_multiple_paths): New assertion. (SvnClientTest#test_mkdir_with_multiple_paths): - Rename from test_mkdir_multiple2. - Use assert_mkdir_with_multiple_paths. (SvnClientTest#test_mkdir_with_multiple_paths_as_array): - Rename from test_mkdir_multiple. - Use assert_mkdir_with_multiple_paths. ------------------------------------------------------------------------ r31350 | kou | 2008-05-22 14:23:52 +0200 (Thu, 22 May 2008) | 9 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/svn/client.rb M /trunk/subversion/bindings/swig/ruby/test/test_client.rb Follow the current notify information behavior. (Receive absolute path not relative path.) * subversion/bindings/swig/ruby/test/test_client.rb (SvnClientTest#test_copy): Use absolute path to compare notified path. * subversion/bindings/swig/ruby/svn/client.rb (Svn::Client::Contexet#copy): Remove a needless space. ------------------------------------------------------------------------ r31351 | kou | 2008-05-22 15:11:25 +0200 (Thu, 22 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31348. ------------------------------------------------------------------------ r31352 | cmpilato | 2008-05-22 15:58:43 +0200 (Thu, 22 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31348, approving. ------------------------------------------------------------------------ r31353 | joeswatosh | 2008-05-22 16:05:46 +0200 (Thu, 22 May 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/test_core.rb Follow on to r30745 "Fix bug when creating string representations of ranges X:Y where X > Y." by reordering the expected ranges * subversion/bindings/swig/ruby/test/test_core.rb (SvnCoreTest#test_range_list_to_s): Reorder the expected ranges ------------------------------------------------------------------------ r31354 | cmpilato | 2008-05-22 16:14:41 +0200 (Thu, 22 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Note that r31313 does not merge cleanly. ------------------------------------------------------------------------ r31355 | joeswatosh | 2008-05-22 16:17:01 +0200 (Thu, 22 May 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/test_client.rb Follow on to r31349 "Follow the current notify information behavior. (Receive absolute path not relative path.)" * subversion/bindings/swig/ruby/test/test_client.rb (SvnClientTest#test_move,SvnClientTest#test_move_force): Adjust test expectations. ------------------------------------------------------------------------ r31356 | cmpilato | 2008-05-22 16:26:05 +0200 (Thu, 22 May 2008) | 13 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/bindings/swig/ruby/svn/client.rb M /branches/1.5.x/subversion/bindings/swig/ruby/test/test_client.rb Merge from trunk this change group: * r31348 Support revprop_table in Svn::Client::Context#mkdir family. (follow-up r31249) Votes: +1: kou, cmpilato Also: * STATUS Remove the change group. ------------------------------------------------------------------------ r31357 | cmpilato | 2008-05-22 16:46:45 +0200 (Thu, 22 May 2008) | 16 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/svn_error_codes.h M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_ra_neon/commit.c M /branches/1.5.x/subversion/libsvn_ra_neon/get_locks.c M /branches/1.5.x/subversion/libsvn_ra_neon/props.c M /branches/1.5.x/subversion/libsvn_ra_neon/session.c M /branches/1.5.x/subversion/libsvn_ra_neon/util.c M /branches/1.5.x/subversion/libsvn_ra_serf/blame.c M /branches/1.5.x/subversion/libsvn_ra_serf/commit.c M /branches/1.5.x/subversion/libsvn_ra_serf/getlocations.c M /branches/1.5.x/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/1.5.x/subversion/libsvn_ra_serf/mergeinfo.c M /branches/1.5.x/subversion/libsvn_ra_serf/property.c M /branches/1.5.x/subversion/libsvn_ra_serf/ra_serf.h M /branches/1.5.x/subversion/libsvn_ra_serf/serf.c M /branches/1.5.x/subversion/libsvn_ra_serf/update.c M /branches/1.5.x/subversion/libsvn_ra_serf/util.c M /branches/1.5.x/subversion/svn/mkdir-cmd.c Merge from trunk this change group: * r31313 Make all ra layers return a consistent error when a path is not found in the repository. Notes: Small change, but API consistency is always a good thing. Does not merge cleanly! Votes: +1: lgo, epg, cmpilato Also: * STATUS Remove the change group. ------------------------------------------------------------------------ r31358 | firemeteor | 2008-05-22 18:22:49 +0200 (Thu, 22 May 2008) | 1 line Changed paths: A /branches/issue-2843-dev (from /trunk:31357) Created feature branch for issue 2843. ------------------------------------------------------------------------ r31359 | markphip | 2008-05-22 18:43:23 +0200 (Thu, 22 May 2008) | 5 lines Changed paths: M /branches/1.5.x/STATUS STATUS: Vote for r30748, r31059, 31060, 31061, 31075, 31151 I reviewed these and ran tests as a group. It seems like r30748 ought to just be moved into the other group. ------------------------------------------------------------------------ r31360 | firemeteor | 2008-05-22 18:46:46 +0200 (Thu, 22 May 2008) | 9 lines Changed paths: M /branches/issue-2843-dev/subversion/tests/cmdline/depth_tests.py On the issue-2843-dev branch: Tune the expected_output so that we only expect report on root when folding a subtree. * subversion/tests/cmdlind/depth_tests.py (depth_folding_clean_trees_2, depth_fold_expand_clean_trees, fold_tree_with_unversioned_modified_items): Tune expected_output. ------------------------------------------------------------------------ r31361 | arfrever | 2008-05-22 18:59:56 +0200 (Thu, 22 May 2008) | 6 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp M /trunk/subversion/libsvn_subr/cmdline.c * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::getContext): Use dynamically loaded simple providers in alphabetic order. ------------------------------------------------------------------------ r31362 | glasser | 2008-05-22 19:15:31 +0200 (Thu, 22 May 2008) | 12 lines Changed paths: M /branches/in-memory-cache/subversion/libsvn_fs_fs/fs_fs.c On the in-memory-cache branch: Don't try to cache fulltexts that are bigger than about a megabyte (since they may go over the memcached maximum). Size calculated by some examination of memcached source and some experimentation (at least on the build I have, 1048518 bytes seems to be the maximum value size). * subversion/libsvn_fs_fs/fs_fs.c (fulltext_size_is_cacheable): New. (read_representation): Check size before doing cache stuff. ------------------------------------------------------------------------ r31363 | glasser | 2008-05-22 19:21:41 +0200 (Thu, 22 May 2008) | 1 line Changed paths: M /branches/in-memory-cache M /branches/in-memory-cache/subversion/bindings/javahl/native/SVNClient.cpp M /branches/in-memory-cache/subversion/bindings/swig/ruby/svn/client.rb M /branches/in-memory-cache/subversion/bindings/swig/ruby/test/test_client.rb M /branches/in-memory-cache/subversion/bindings/swig/ruby/test/test_core.rb M /branches/in-memory-cache/subversion/libsvn_subr/cmdline.c Merge from trunk to in-memory-cache. ------------------------------------------------------------------------ r31364 | kameshj | 2008-05-22 19:56:09 +0200 (Thu, 22 May 2008) | 14 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/checkout_tests.py Extend 'checkout_test-7'('forced_checkout_with_versioned_obstruction') to cover few more cases and fix one of the expecations. For versioned obstruction should be left undisturbed when it corresponds to some other url. * subversion/tests/cmdline/checkout_tests.py (forced_checkout_with_versioned_obstruction): Fix the expected error when the checkout hits a obstructed foreign repository. Make sure 'other_wc_dir/A' is undisturbed by the checkout from different url on other_wc_dir. Reviewed by: julianfoad ------------------------------------------------------------------------ r31365 | kameshj | 2008-05-22 20:00:15 +0200 (Thu, 22 May 2008) | 11 lines Changed paths: M /branches/tree-conflicts/subversion/libsvn_wc/update_editor.c Fix a problem that could cause a checkout to fail, leaving broken data in the WC. This is now detected in checkout_tests-7. * subversion/libsvn_wc/update_editor.c (add_directory): For versioned obstruction check whether obstruction corresponds to the same corresponding-URL as the current update drive. If it points to some other URL error out saying so, else do tree-conflict detection. Review by: julianfoad ------------------------------------------------------------------------ r31366 | epg | 2008-05-22 20:07:35 +0200 (Thu, 22 May 2008) | 3 lines Changed paths: M /trunk/CHANGES * CHANGES (Developer-visible changes/API changes): Note SVN_ERR_RA_DAV_PATH_NOT_FOUND is now deprecated. ------------------------------------------------------------------------ r31367 | arfrever | 2008-05-22 20:46:43 +0200 (Thu, 22 May 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp M /trunk/subversion/libsvn_subr/cmdline.c * subversion/libsvn_subr/cmdline.c (get_auth_simple_provider): * subversion/bindings/javahl/native/SVNClient.cpp (get_auth_simple_provider): Check for errors before loading symbols. Suggested by: Philip Martin ------------------------------------------------------------------------ r31368 | lgo | 2008-05-22 21:15:19 +0200 (Thu, 22 May 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/property.c ra_serf: Avoid leaking error object. Found by: cmpilato * subversion/libsvn_ra_serf/property.c (svn_ra_serf__wait_for_props): clear error object if there was another more relevant error. ------------------------------------------------------------------------ r31369 | pburba | 2008-05-22 21:17:25 +0200 (Thu, 22 May 2008) | 8 lines Changed paths: M /trunk/subversion/include/svn_mergeinfo.h Explain empty mergeinfo in comments for svn:mergeinfo and svn_mergeinfo_t. * subversion/include/svn_mergeinfo.h (global svn:mergienfo property comment): Explain empty mergeinfo and update grammar. (svn_mergeinfo_t): Note how no mergeinfo and empty mergeinfo are differentiated. ------------------------------------------------------------------------ r31370 | arfrever | 2008-05-22 21:27:52 +0200 (Thu, 22 May 2008) | 3 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::getContext): Don't use KWallet in JavaHL. ------------------------------------------------------------------------ r31371 | lgo | 2008-05-22 21:54:07 +0200 (Thu, 22 May 2008) | 1 line Changed paths: M /trunk/subversion/libsvn_ra_serf/property.c * subversion/libsvn_ra_serf/property.c: small code fix, no functional change. ------------------------------------------------------------------------ r31372 | julianfoad | 2008-05-22 21:59:52 +0200 (Thu, 22 May 2008) | 17 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/tree_conflict_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/tree_conflict_tests.txt Work on the tree-conflict test suite. * subversion/tests/cmdline/tree_conflict_tests.py General: Change the scenario tuples from (path, change-actions, obstructions) to (init-actions, change-actions), creating the path automatically from change-actions and getting rid of the "obstructions" field which was never yet used. (ensure_tree_conflict): After the conflict has been raised, add a check that an attempt to commit will fail. Then mark the conflict as resolved (though this doesn't completely succeed, as more than one conflict is currently raised by some scenarios). (test_list): Mark the two failing tests "Skip"/"XFail" so that this file of tests passes overall. * subversion/tests/cmdline/tree_conflict_tests.txt Update the description to reflect the change to the scenario tuple. ------------------------------------------------------------------------ r31373 | pburba | 2008-05-22 22:38:39 +0200 (Thu, 22 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Change vote on issue #3157 block. ------------------------------------------------------------------------ r31374 | lgo | 2008-05-22 22:54:17 +0200 (Thu, 22 May 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: Convert 301 and 302 status code to errors. Found by: epg * subversion/libsvn_ra_serf/util.c (svn_ra_serf__error_on_status): Handle 301 and 302. ------------------------------------------------------------------------ r31375 | lgo | 2008-05-23 00:24:01 +0200 (Fri, 23 May 2008) | 13 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/serf.c ra_serf: When getting info on a directory in the repository, check that we're really working with a directory. Found by: epg * subversion/libsvn_ra_serf/serf.c (resource_is_directory): New function. Reads the resource type from list of properties and checks if the resource is a collection. (svn_ra_serf__get_dir): Calls to svn_ra_serf__deliver_props and svn_ra_serf__wait_for_props can be combined in one call to svn_ra_serf__retrieve_props. When we have to get the properties already, also check the content of the reourcetype property. ------------------------------------------------------------------------ r31376 | glasser | 2008-05-23 01:48:39 +0200 (Fri, 23 May 2008) | 10 lines Changed paths: M /branches/in-memory-cache/subversion/libsvn_fs_fs/caching.c On the in-memory-cache branch: Followup to r31247, setting our cache error handler on the fulltext cache as well. * subversion/libsvn_fs_fs/caching.c (svn_fs_fs__initialize_caches): Move the dir_cache error handler setup back to under dir_cache's creation, and set up the error handler on fulltext_cache too. ------------------------------------------------------------------------ r31377 | glasser | 2008-05-23 01:50:49 +0200 (Fri, 23 May 2008) | 12 lines Changed paths: M /branches/in-memory-cache/subversion/svnserve/serve.c On the in-memory-cache branch: In r30430, I added a trivial FS "warning" (really error) handler to svnserve. Since then, the svnserve-logging branch got merged to trunk and then to this branch, which added a handler that actually did something. So remove the old one. * subversion/svnserve/serve.c (handle_fs_warnings): Remove. (find_repos): Don't call svn_fs_set_warning_func here (it's called in serve later). ------------------------------------------------------------------------ r31378 | glasser | 2008-05-23 01:51:50 +0200 (Fri, 23 May 2008) | 1 line Changed paths: M /branches/in-memory-cache M /branches/in-memory-cache/CHANGES M /branches/in-memory-cache/subversion/bindings/javahl/native/SVNClient.cpp M /branches/in-memory-cache/subversion/include/svn_mergeinfo.h M /branches/in-memory-cache/subversion/libsvn_ra_serf/property.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/serf.c M /branches/in-memory-cache/subversion/libsvn_ra_serf/util.c M /branches/in-memory-cache/subversion/libsvn_subr/cmdline.c Merge from trunk to in-memory-cache, perhaps for the last time. ------------------------------------------------------------------------ r31379 | glasser | 2008-05-23 02:00:32 +0200 (Fri, 23 May 2008) | 24 lines Changed paths: M /trunk M /trunk/Makefile.in M /trunk/aclocal.m4 A /trunk/build/ac-macros/apr_memcache.m4 (from /branches/in-memory-cache/build/ac-macros/apr_memcache.m4:31378) M /trunk/build/run_tests.py M /trunk/build.conf M /trunk/configure.ac M /trunk/gen-make.py M /trunk/subversion/bindings/swig/python/tests/mergeinfo.py M /trunk/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py M /trunk/subversion/include/svn_base64.h A /trunk/subversion/include/svn_cache.h (from /branches/in-memory-cache/subversion/include/svn_cache.h:31378) M /trunk/subversion/include/svn_error_codes.h M /trunk/subversion/include/svn_io.h M /trunk/subversion/include/svn_path.h A /trunk/subversion/libsvn_fs_fs/caching.c (from /branches/in-memory-cache/subversion/libsvn_fs_fs/caching.c:31378) M /trunk/subversion/libsvn_fs_fs/dag.c M /trunk/subversion/libsvn_fs_fs/dag.h M /trunk/subversion/libsvn_fs_fs/fs.c M /trunk/subversion/libsvn_fs_fs/fs.h M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/libsvn_fs_fs/fs_fs.h M /trunk/subversion/libsvn_fs_fs/structure M /trunk/subversion/libsvn_fs_fs/tree.c M /trunk/subversion/libsvn_ra_local/ra_plugin.c A /trunk/subversion/libsvn_subr/cache-inprocess.c (from /branches/in-memory-cache/subversion/libsvn_subr/cache-inprocess.c:31378) A /trunk/subversion/libsvn_subr/cache-memcache.c (from /branches/in-memory-cache/subversion/libsvn_subr/cache-memcache.c:31378) A /trunk/subversion/libsvn_subr/cache.c (from /branches/in-memory-cache/subversion/libsvn_subr/cache.c:31378) A /trunk/subversion/libsvn_subr/cache.h (from /branches/in-memory-cache/subversion/libsvn_subr/cache.h:31378) M /trunk/subversion/libsvn_subr/stream.c M /trunk/subversion/libsvn_subr/svn_base64.c M /trunk/subversion/svnserve/serve.c M /trunk/subversion/tests/cmdline/svndumpfilter_tests.py M /trunk/subversion/tests/cmdline/svntest/main.py M /trunk/subversion/tests/libsvn_fs/fs-test.c M /trunk/subversion/tests/libsvn_fs/locks-test.c M /trunk/subversion/tests/libsvn_fs_base/changes-test.c M /trunk/subversion/tests/libsvn_fs_base/fs-base-test.c M /trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c M /trunk/subversion/tests/libsvn_ra_local/ra-local-test.c M /trunk/subversion/tests/libsvn_repos/repos-test.c A /trunk/subversion/tests/libsvn_subr/cache-test.c (from /branches/in-memory-cache/subversion/tests/libsvn_subr/cache-test.c:31378) M /trunk/subversion/tests/svn_test.h M /trunk/subversion/tests/svn_test_fs.c M /trunk/subversion/tests/svn_test_fs.h M /trunk/subversion/tests/svn_test_main.c A /trunk/subversion/tests/tests.conf (from /branches/in-memory-cache/subversion/tests/tests.conf:31378) M /trunk/tools/server-side/svn_server_log_parse.py M /trunk/tools/server-side/test_svn_server_log_parse.py Merge the in-memory-cache branch to trunk. See that branch's log for full details, but in short: The branch rewrote various in-memory caches in FSFS to use a unified API. By default this API is implemented by some in-process hashes, but via a configuration file (db/fsfs.conf), it can use memcached instead. Additionally, expanded fulltexts are cached if memcached is available. memcached is accessed with the apr_memcached API, which will be in a future version (1.3.x branch, now) of apr-util, and is also available as an separately-distributed library. The build system knows how to deal with both. Other things that changed: * The test suite now has a config file; currently, the config file is just used as the FSFS config file for any created repositories. * New random APIs: svn_base64_encode_string2, svn_stream_from_string. * ra_local ignores "FS warnings" instead of aborting. ------------------------------------------------------------------------ r31380 | glasser | 2008-05-23 02:01:15 +0200 (Fri, 23 May 2008) | 1 line Changed paths: D /branches/in-memory-cache Prune merged branch. ------------------------------------------------------------------------ r31381 | glasser | 2008-05-23 02:09:32 +0200 (Fri, 23 May 2008) | 6 lines Changed paths: M /trunk/subversion/tests/libsvn_subr Follow-up to r31380. * subversion/tests/libsvn_subr Commit a dirprop change that I failed to select in psvn when committing the merge. ------------------------------------------------------------------------ r31382 | kou | 2008-05-23 04:20:58 +0200 (Fri, 23 May 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/test_client.rb Follow on mergeinfo changes in r30949. * subversion/bindings/swig/ruby/test/test_client.rb (SvnClientTest#assert_changed, SvnClientTest#assert_not_changed): New assertion. (SvnClientTest#assert_merge): Delete svn:mergeinfo property to merge again. ------------------------------------------------------------------------ r31383 | firemeteor | 2008-05-23 08:01:22 +0200 (Fri, 23 May 2008) | 2 lines Changed paths: M /trunk/COMMITTERS * COMMITTERS (firemeteor): Added Guo Rui for issue-2843-dev branch. ------------------------------------------------------------------------ r31384 | kou | 2008-05-23 09:15:05 +0200 (Fri, 23 May 2008) | 5 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/svn/client.rb Fix wrong argument name. * subversion/bindings/swig/ruby/svn/client.rb (Svn::Client::Context#proplist): Swap rev and peg_rev. ------------------------------------------------------------------------ r31385 | glasser | 2008-05-23 10:00:03 +0200 (Fri, 23 May 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/caching.c Followup to r31376: only set an error handler on a cache you actually make. * subversion/libsvn_fs_fs/caching.c (svn_fs_fs__initialize_caches): We only make the fulltext cache if we're using memcached, so only set its error handler in that mode. Found by: hwright ------------------------------------------------------------------------ r31386 | kameshj | 2008-05-23 11:14:00 +0200 (Fri, 23 May 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/caching.c M /trunk/subversion/libsvn_subr/cache-inprocess.c Fix compiler warning of 'missing prototype for function'. * subversion/libsvn_fs_fs/caching.c (read_config): make it as 'static' function. * subversion/libsvn_subr/cache-inprocess.c (inprocess_cache_iter, inprocess_cache_get): make it as 'static' function. (inprocess_cache_set): make it as 'static' function and fix argument alignment. ------------------------------------------------------------------------ r31387 | julianfoad | 2008-05-23 14:57:39 +0200 (Fri, 23 May 2008) | 9 lines Changed paths: M /trunk/subversion/tests/cmdline/prop_tests.py M /trunk/subversion/tests/cmdline/svntest/testcase.py Fix the test suite so that nesting XFail() inside Skip() reports the correct result codes - like "XFAIL" instead of "PASS". * subversion/tests/cmdline/prop_tests.py (test_list): Re-instate a Skip() that was commented out because of this problem. * subversion/tests/cmdline/svntest/testcase.py (Skip): Delegate the run_text() method to that of the nested class. ------------------------------------------------------------------------ r31388 | julianfoad | 2008-05-23 16:02:55 +0200 (Fri, 23 May 2008) | 10 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/tree_conflict_tests.py Edits for clarity. No significant functional change. * subversion/tests/cmdline/tree_conflict_tests.py General: Rename some functions and variables for clarity. (ensure_tree_conflict): During each sub-test, "chdir" into the WC to the paths passed around internally. Improve the display of exceptions occurring during a sub-test. (test_list): Change test 8 from Skip to XFail because we do want it to work, eventually. ------------------------------------------------------------------------ r31389 | julianfoad | 2008-05-23 16:55:10 +0200 (Fri, 23 May 2008) | 10 lines Changed paths: A /trunk/notes/tree-conflicts/design-overview.txt D /trunk/notes/tree-conflicts/policy.txt A /trunk/notes/tree-conflicts/requirements.txt (from /trunk/notes/tree-conflicts/policy.txt:31299) Tree conflicts documentation update. * notes/tree-conflicts/design-overview.txt New document. * notes/tree-conflicts/policy.txt Rename to... * notes/tree-conflicts/requirements.txt ...renamed to better indicate its purpose. ------------------------------------------------------------------------ r31390 | markphip | 2008-05-23 16:57:21 +0200 (Fri, 23 May 2008) | 9 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_client/mergeinfo.c M /branches/1.5.x/subversion/libsvn_client/mergeinfo.h M /branches/1.5.x/subversion/libsvn_wc/merge.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py Reverse merged r31185, r31186, r31218 These changes will not be included in 1.5.0. They are put back in STATUS as approved changes for a post-1.5.0 release. Ran make check check-javahl check-swig-rb|py|pl One unrelated Ruby test failed and reported to dev@ ------------------------------------------------------------------------ r31391 | kfogel | 2008-05-23 19:17:46 +0200 (Fri, 23 May 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c * subversion/libsvn_client/merge.c (filter_natural_history_from_mergeinfo): Fix typo in comment, following up to r31075 (Fix issue #3157). ------------------------------------------------------------------------ r31392 | danielsh | 2008-05-23 19:30:04 +0200 (Fri, 23 May 2008) | 9 lines Changed paths: M /trunk/win-tests.py Follow-up to r31379: Make the new --config-file option work on Windows. * win-tests.py (): Add a new config_file variable, set it to the value of the '--config-file' option, and use it when creating the TestHarness instance. (_usage_exit): Document the '--config-file' option. Log message stolen from: vgeorgescu ------------------------------------------------------------------------ r31393 | danielsh | 2008-05-23 19:31:44 +0200 (Fri, 23 May 2008) | 4 lines Changed paths: M /trunk/win-tests.py Follow-up to r25651. * win-tests.py: Actually add the --server-minor-version option. ------------------------------------------------------------------------ r31394 | glasser | 2008-05-23 19:58:22 +0200 (Fri, 23 May 2008) | 4 lines Changed paths: M /trunk/CHANGES * CHANGES Mention that we renamed --enable-dso to --enable-runtime-module-search (we also changed what it does). ------------------------------------------------------------------------ r31395 | glasser | 2008-05-23 20:03:56 +0200 (Fri, 23 May 2008) | 5 lines Changed paths: D /trunk/notes/reintegrate-todo.txt * notes/reintegrate-todo.txt Delete this, since reintegrate ended up in trunk long ago; the remaining items are either done or in the issue tracker (#3081 and #3128). ------------------------------------------------------------------------ r31396 | glasser | 2008-05-23 20:57:48 +0200 (Fri, 23 May 2008) | 4 lines Changed paths: M /trunk/subversion/svn/main.c * subversion/svn/main.c (svn_cl__cmd_table): Remove --accept option from 'checkout', since it is meaningless. ------------------------------------------------------------------------ r31397 | glasser | 2008-05-23 20:58:14 +0200 (Fri, 23 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Nominate r31396 for backport to 1.5.x. ------------------------------------------------------------------------ r31398 | pburba | 2008-05-23 20:58:57 +0200 (Fri, 23 May 2008) | 8 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Expand merge_tests.py 95 to cover new problem in issue #3157. * subversion/tests/cmdline/merge_tests.py (dont_explicitly_record_implicit_mergeinfo): Do another merge where the merge target's subtree has natural history which is a proper subset of the merge source. (test_list): Mark dont_explicitly_record_implicit_mergeinfo as XFail. ------------------------------------------------------------------------ r31399 | nori | 2008-05-23 21:17:58 +0200 (Fri, 23 May 2008) | 8 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Finish proofreading of r27239, making corrections and improvements and unifying terms. This "Take 6" is for messages in the rest of files. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+350o"). ------------------------------------------------------------------------ r31400 | nori | 2008-05-23 21:18:16 +0200 (Fri, 23 May 2008) | 10 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Add 244 extra messages and their translations, which is required by source code at r31333, as obsolete entries. Since r31333 requires 2 more entries (newer descriptions on 'svn merge' and 'svn switch'), I'll prepare them, make more tweaks, and finally run './tools/po/po-update.sh ja'. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+594o"). ------------------------------------------------------------------------ r31401 | nori | 2008-05-23 21:18:29 +0200 (Fri, 23 May 2008) | 7 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Make some improvements and terminological unifications. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+594o"). ------------------------------------------------------------------------ r31402 | markphip | 2008-05-23 21:45:46 +0200 (Fri, 23 May 2008) | 15 lines Changed paths: A /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java JavaHL: Followup to r31273. Create a LogDate class that performs the parsing of our date string into microseconds. Includes convenience methods for getting the date in various formats. [ in subversion/bindings/javahl/ ] * tests/org/tigris/subversion/javahl/BasicTests.java (testLogDate): New test for basic String parsing of class. * src/org/tigris/subversion/javahl/LogDate.java New class that parses our date into microseconds * src/org/tigris/subversion/javahl/SVNClient.java (MyLogMessageCallback): Use the LogDate class to parse the date. ------------------------------------------------------------------------ r31403 | markphip | 2008-05-23 21:50:23 +0200 (Fri, 23 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate and vote for r31402 ------------------------------------------------------------------------ r31404 | markphip | 2008-05-23 22:20:10 +0200 (Fri, 23 May 2008) | 14 lines Changed paths: M /branches/1.5.x/subversion/bindings/swig/ruby/test/test_client.rb Fix a test failure in Ruby bindings. In r31211 on trunk our notifications were changed to send paths differently. In r31348 the Ruby tests were updated for the context changes and in r31356 this was merged to the 1.5.x branch. The test contains 1-line of code that needs to be modified for the branch. * subversion/bindings/swig/ruby/test/test_client.rb (test_mkdir_p): Update test for 1.5.x Patch by: kou Votes: +1: markphip, cmpilato ------------------------------------------------------------------------ r31405 | hwright | 2008-05-23 22:52:24 +0200 (Fri, 23 May 2008) | 3 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Move the reverse-merged items to the 1.5.1 section, so as not to clutter the Approved section. ------------------------------------------------------------------------ r31406 | markphip | 2008-05-23 22:54:23 +0200 (Fri, 23 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Move items not being considered for 1.5.0 into the 1.5.1 section. ------------------------------------------------------------------------ r31407 | markphip | 2008-05-24 01:42:01 +0200 (Sat, 24 May 2008) | 10 lines Changed paths: M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java JavaHL: Followup to r31402. Simple Java improvements to new LogDate class. [ in subversion/bindings/javahl/ ] * src/org/tigris/subversion/javahl/LogDate.java Removed super() and made class variables final Suggested by: hwright blair ------------------------------------------------------------------------ r31408 | markphip | 2008-05-24 01:43:44 +0200 (Sat, 24 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate and vote for r31407 ------------------------------------------------------------------------ r31409 | epg | 2008-05-24 01:46:28 +0200 (Sat, 24 May 2008) | 4 lines Changed paths: M /trunk/build/ac-macros/apache.m4 * build/ac-macros/apache.m4 Add option --with-apache-libexecdir option (help string could use a little work) to allow overriding where apxs wants to install Apache modules. ------------------------------------------------------------------------ r31410 | hwright | 2008-05-24 01:52:18 +0200 (Sat, 24 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for and approve the r31402 group. ------------------------------------------------------------------------ r31411 | hwright | 2008-05-24 01:58:00 +0200 (Sat, 24 May 2008) | 3 lines Changed paths: M /branches/fs-rep-sharing M /branches/fs-rep-sharing/CHANGES M /branches/fs-rep-sharing/COMMITTERS M /branches/fs-rep-sharing/Makefile.in M /branches/fs-rep-sharing/aclocal.m4 A /branches/fs-rep-sharing/build/ac-macros/apr_memcache.m4 (from /trunk/build/ac-macros/apr_memcache.m4:31406) M /branches/fs-rep-sharing/build/run_tests.py M /branches/fs-rep-sharing/build.conf M /branches/fs-rep-sharing/configure.ac M /branches/fs-rep-sharing/gen-make.py D /branches/fs-rep-sharing/notes/reintegrate-todo.txt A /branches/fs-rep-sharing/notes/tree-conflicts/design-overview.txt (from /trunk/notes/tree-conflicts/design-overview.txt:31406) D /branches/fs-rep-sharing/notes/tree-conflicts/policy.txt A /branches/fs-rep-sharing/notes/tree-conflicts/requirements.txt (from /trunk/notes/tree-conflicts/requirements.txt:31406) M /branches/fs-rep-sharing/subversion/bindings/javahl/native/LogMessageCallback.cpp M /branches/fs-rep-sharing/subversion/bindings/javahl/native/Prompter.cpp M /branches/fs-rep-sharing/subversion/bindings/javahl/native/ProplistCallback.h A /branches/fs-rep-sharing/subversion/bindings/javahl/native/RevpropTable.cpp (from /trunk/subversion/bindings/javahl/native/RevpropTable.cpp:31406) A /branches/fs-rep-sharing/subversion/bindings/javahl/native/RevpropTable.h (from /trunk/subversion/bindings/javahl/native/RevpropTable.h:31406) M /branches/fs-rep-sharing/subversion/bindings/javahl/native/SVNClient.cpp M /branches/fs-rep-sharing/subversion/bindings/javahl/native/SVNClient.h M /branches/fs-rep-sharing/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp A /branches/fs-rep-sharing/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java:31406) M /branches/fs-rep-sharing/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java M /branches/fs-rep-sharing/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/fs-rep-sharing/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /branches/fs-rep-sharing/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /branches/fs-rep-sharing/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/fs-rep-sharing/subversion/bindings/swig/python/tests/mergeinfo.py M /branches/fs-rep-sharing/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py M /branches/fs-rep-sharing/subversion/bindings/swig/ruby/svn/client.rb M /branches/fs-rep-sharing/subversion/bindings/swig/ruby/test/test_client.rb M /branches/fs-rep-sharing/subversion/bindings/swig/ruby/test/test_core.rb M /branches/fs-rep-sharing/subversion/include/private/svn_auth_private.h M /branches/fs-rep-sharing/subversion/include/svn_auth_dso.h M /branches/fs-rep-sharing/subversion/include/svn_base64.h A /branches/fs-rep-sharing/subversion/include/svn_cache.h (from /trunk/subversion/include/svn_cache.h:31406) M /branches/fs-rep-sharing/subversion/include/svn_client.h M /branches/fs-rep-sharing/subversion/include/svn_error_codes.h M /branches/fs-rep-sharing/subversion/include/svn_io.h M /branches/fs-rep-sharing/subversion/include/svn_mergeinfo.h M /branches/fs-rep-sharing/subversion/include/svn_path.h M /branches/fs-rep-sharing/subversion/include/svn_props.h A /branches/fs-rep-sharing/subversion/libsvn_auth_gnome_keyring (from /trunk/subversion/libsvn_auth_gnome_keyring:31406) R /branches/fs-rep-sharing/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (from /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c:31406) M /branches/fs-rep-sharing/subversion/libsvn_client/add.c M /branches/fs-rep-sharing/subversion/libsvn_client/client.h M /branches/fs-rep-sharing/subversion/libsvn_client/commit.c M /branches/fs-rep-sharing/subversion/libsvn_client/commit_util.c M /branches/fs-rep-sharing/subversion/libsvn_client/copy.c M /branches/fs-rep-sharing/subversion/libsvn_client/delete.c M /branches/fs-rep-sharing/subversion/libsvn_client/merge.c M /branches/fs-rep-sharing/subversion/libsvn_client/prop_commands.c A /branches/fs-rep-sharing/subversion/libsvn_fs_fs/caching.c (from /trunk/subversion/libsvn_fs_fs/caching.c:31406) M /branches/fs-rep-sharing/subversion/libsvn_fs_fs/dag.c M /branches/fs-rep-sharing/subversion/libsvn_fs_fs/dag.h M /branches/fs-rep-sharing/subversion/libsvn_fs_fs/fs.c M /branches/fs-rep-sharing/subversion/libsvn_fs_fs/fs.h M /branches/fs-rep-sharing/subversion/libsvn_fs_fs/fs_fs.c M /branches/fs-rep-sharing/subversion/libsvn_fs_fs/fs_fs.h M /branches/fs-rep-sharing/subversion/libsvn_fs_fs/structure M /branches/fs-rep-sharing/subversion/libsvn_fs_fs/tree.c M /branches/fs-rep-sharing/subversion/libsvn_ra_local/ra_plugin.c M /branches/fs-rep-sharing/subversion/libsvn_ra_neon/commit.c M /branches/fs-rep-sharing/subversion/libsvn_ra_neon/get_locks.c M /branches/fs-rep-sharing/subversion/libsvn_ra_neon/props.c M /branches/fs-rep-sharing/subversion/libsvn_ra_neon/session.c M /branches/fs-rep-sharing/subversion/libsvn_ra_neon/util.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/blame.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/commit.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/getlocations.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/mergeinfo.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/property.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/ra_serf.h M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/serf.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/update.c M /branches/fs-rep-sharing/subversion/libsvn_ra_serf/util.c A /branches/fs-rep-sharing/subversion/libsvn_subr/cache-inprocess.c (from /trunk/subversion/libsvn_subr/cache-inprocess.c:31406) A /branches/fs-rep-sharing/subversion/libsvn_subr/cache-memcache.c (from /trunk/subversion/libsvn_subr/cache-memcache.c:31406) A /branches/fs-rep-sharing/subversion/libsvn_subr/cache.c (from /trunk/subversion/libsvn_subr/cache.c:31406) A /branches/fs-rep-sharing/subversion/libsvn_subr/cache.h (from /trunk/subversion/libsvn_subr/cache.h:31406) M /branches/fs-rep-sharing/subversion/libsvn_subr/cmdline.c M /branches/fs-rep-sharing/subversion/libsvn_subr/properties.c M /branches/fs-rep-sharing/subversion/libsvn_subr/simple_providers.c M /branches/fs-rep-sharing/subversion/libsvn_subr/ssl_server_trust_providers.c M /branches/fs-rep-sharing/subversion/libsvn_subr/stream.c M /branches/fs-rep-sharing/subversion/libsvn_subr/svn_base64.c M /branches/fs-rep-sharing/subversion/libsvn_wc/update_editor.c M /branches/fs-rep-sharing/subversion/po/fr.po M /branches/fs-rep-sharing/subversion/po/ja.po M /branches/fs-rep-sharing/subversion/svn/info-cmd.c M /branches/fs-rep-sharing/subversion/svn/main.c M /branches/fs-rep-sharing/subversion/svn/mkdir-cmd.c M /branches/fs-rep-sharing/subversion/svnserve/serve.c M /branches/fs-rep-sharing/subversion/tests/cmdline/commit_tests.py M /branches/fs-rep-sharing/subversion/tests/cmdline/copy_tests.py M /branches/fs-rep-sharing/subversion/tests/cmdline/merge_tests.py M /branches/fs-rep-sharing/subversion/tests/cmdline/prop_tests.py M /branches/fs-rep-sharing/subversion/tests/cmdline/svndumpfilter_tests.py M /branches/fs-rep-sharing/subversion/tests/cmdline/svntest/actions.py M /branches/fs-rep-sharing/subversion/tests/cmdline/svntest/main.py M /branches/fs-rep-sharing/subversion/tests/cmdline/svntest/testcase.py M /branches/fs-rep-sharing/subversion/tests/libsvn_fs/fs-test.c M /branches/fs-rep-sharing/subversion/tests/libsvn_fs/locks-test.c M /branches/fs-rep-sharing/subversion/tests/libsvn_fs_base/changes-test.c M /branches/fs-rep-sharing/subversion/tests/libsvn_fs_base/fs-base-test.c M /branches/fs-rep-sharing/subversion/tests/libsvn_fs_base/strings-reps-test.c M /branches/fs-rep-sharing/subversion/tests/libsvn_ra_local/ra-local-test.c M /branches/fs-rep-sharing/subversion/tests/libsvn_repos/repos-test.c M /branches/fs-rep-sharing/subversion/tests/libsvn_subr A /branches/fs-rep-sharing/subversion/tests/libsvn_subr/cache-test.c (from /trunk/subversion/tests/libsvn_subr/cache-test.c:31406) M /branches/fs-rep-sharing/subversion/tests/svn_test.h M /branches/fs-rep-sharing/subversion/tests/svn_test_fs.c M /branches/fs-rep-sharing/subversion/tests/svn_test_fs.h M /branches/fs-rep-sharing/subversion/tests/svn_test_main.c A /branches/fs-rep-sharing/subversion/tests/tests.conf (from /trunk/subversion/tests/tests.conf:31406) M /branches/fs-rep-sharing/tools/server-side/svn_server_log_parse.py M /branches/fs-rep-sharing/tools/server-side/test_svn_server_log_parse.py M /branches/fs-rep-sharing/win-tests.py M /branches/fs-rep-sharing/www/links.html On the fs-rep-sharing branch: Bring up-to-date with trunk. ------------------------------------------------------------------------ r31412 | hwright | 2008-05-24 04:57:33 +0200 (Sat, 24 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Add some votes. ------------------------------------------------------------------------ r31413 | hwright | 2008-05-24 05:00:02 +0200 (Sat, 24 May 2008) | 10 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/svn/main.c Merge r31334 from trunk: * r31334 Allow commas and whitespace to delimit revisions in -c arguments. Notes: Because this is a relaxation of existing rules, this could probably be deferred to 1.5.1. But it's a simple change. Votes: +1: cmpilato, epg, hwright ------------------------------------------------------------------------ r31414 | hwright | 2008-05-24 05:09:08 +0200 (Sat, 24 May 2008) | 10 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS A /branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java:31402) M /branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/1.5.x/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/1.5.x/subversion/bindings/swig Merge r31402, r31407 from trunk: * r31402, r31407 JavaHL: Follow-up to r31273. Create a LogDate convenience class that parses our dates into microseconds. Notes: r31407 just contains some trivial Java technique improvements. Votes: +1: markphip, hwright ------------------------------------------------------------------------ r31415 | danielsh | 2008-05-24 14:07:47 +0200 (Sat, 24 May 2008) | 6 lines Changed paths: M /trunk/subversion/include/svn_repos.h Note that some callback semantics are new in 1.5. * subversion/include/svn_repos.h (svn_repos_history_func_t, svn_repos_history2): To avoid confusion, reiterate that SVN_ERR_CEASE_INVOCATION is new in 1.5 (while the functions have existed since 1.1). ------------------------------------------------------------------------ r31416 | danielsh | 2008-05-24 14:10:14 +0200 (Sat, 24 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Nominate r31415. ------------------------------------------------------------------------ r31417 | markphip | 2008-05-24 16:35:22 +0200 (Sat, 24 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r31396 - approving ------------------------------------------------------------------------ r31418 | markphip | 2008-05-24 16:36:50 +0200 (Sat, 24 May 2008) | 10 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/svn/main.c Merge r31396 from trunk: * r31396 Don't allow 'svn checkout --accept=...'. Notes: This new option is meaningless for 'checkout'. Technically we may have to keep supporting it if it goes in 1.5.0. Votes: +1: glasser, hwright, markphip ------------------------------------------------------------------------ r31419 | markphip | 2008-05-24 16:52:35 +0200 (Sat, 24 May 2008) | 5 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r31415. I suspect this could just be committed under the obvious-fix rule. But perhaps not for a backport. Anyway, just needs one more vote. ------------------------------------------------------------------------ r31420 | hwright | 2008-05-24 17:13:36 +0200 (Sat, 24 May 2008) | 2 lines Changed paths: M /trunk/CHANGES * CHANGES: Put a /tenative/ date for 1.5.0 final. ------------------------------------------------------------------------ r31421 | hwright | 2008-05-24 17:16:57 +0200 (Sat, 24 May 2008) | 3 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r31415, approving. Also, remove the 1.5.0 candidates section. ------------------------------------------------------------------------ r31422 | kfogel | 2008-05-24 17:48:11 +0200 (Sat, 24 May 2008) | 22 lines Changed paths: M /trunk/subversion/include/svn_error_codes.h M /trunk/subversion/svn/info-cmd.c Fix an error redundancy and an error leak, following up to r31320. Suggested by: glasser * subversion/svn/info-cmd.c (svn_cl__info): Clear intermediate error at bottom of loop, having removed unnecessary 'continue' statements so that this will work, and return a generic error to caller if any targets had problems. * subversion/include/svn_error_codes.h (SVN_ERR_BASE): Tweak wording to accommodate any error ordering. See here for more discussion: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=138842 From: Karl Fogel To: "David Glasser" Cc: dev@subversion.tigris.org Subject: Re: svn commit: r31320 - trunk/subversion/svn Date: Wed, 21 May 2008 16:50:09 -0400 Message-ID: <878wy3xtz2.fsf@red-bean.com> ------------------------------------------------------------------------ r31423 | danielsh | 2008-05-24 17:59:46 +0200 (Sat, 24 May 2008) | 7 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/svn_repos.h Merge r31415 from trunk: * r31415 Note that the SVN_ERR_CEASE_INVOCATION semantics of svn_repos_history2 and svn_repos_history_func_t are new in 1.5. Votes: +1: danielsh, markphip, hwright ------------------------------------------------------------------------ r31424 | markphip | 2008-05-24 18:02:55 +0200 (Sat, 24 May 2008) | 4 lines Changed paths: M /branches/1.5.x/CHANGES Synch-up CHANGES with all changes from trunk * CHANGES Merge all revisions from trunk ------------------------------------------------------------------------ r31425 | arfrever | 2008-05-24 18:14:04 +0200 (Sat, 24 May 2008) | 18 lines Changed paths: M /trunk/configure.ac M /trunk/subversion/libsvn_ra/ra_loader.c Support the 'http-library' option when Subversion was configured with the '--enable-runtime-module-search' option. See also r31722. * configure.ac: Define SVN_HAVE_NEON when support for Neon is enabled. Define SVN_HAVE_SERF when support for Serf is enabled. * subversion/libsvn_ra/ra_loader.c: Define MUST_CHOOSE_DAV when SVN_HAVE_NEON and SVN_HAVE_SERF are defined. The code which handles the 'http-library' option is enabled only when MUST_CHOOSE_DAV is defined. Previously MUST_CHOOSE_DAV was defined when both SVN_LIBSVN_CLIENT_LINKS_RA_NEON and SVN_LIBSVN_CLIENT_LINKS_RA_SERF were defined, which was incorrect, because the configure script doesn't define SVN_LIBSVN_CLIENT_LINKS_RA_*, when it has been called with the '--enable-runtime-module-search' option. ------------------------------------------------------------------------ r31426 | arfrever | 2008-05-24 18:27:55 +0200 (Sat, 24 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31425. ------------------------------------------------------------------------ r31427 | arfrever | 2008-05-24 19:07:45 +0200 (Sat, 24 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp * subversion/libsvn_auth_kwallet/kwallet.cpp (kwallet_password_get, kwallet_password_set): Don't disconnect Subversion from KWallet because disconnection has been working incorrectly since KDE 4.0.4. See https://bugs.kde.org/show_bug.cgi?id=162570 ------------------------------------------------------------------------ r31428 | arfrever | 2008-05-24 22:22:10 +0200 (Sat, 24 May 2008) | 12 lines Changed paths: M /trunk/subversion/include/svn_config.h M /trunk/subversion/libsvn_subr/cmdline.c M /trunk/subversion/libsvn_subr/config_file.c Implement the 'password-stores' config option. * subversion/include/svn_config.h (SVN_CONFIG_OPTION_PASSWORD_STORES): Define. * subversion/libsvn_subr/config_file.c (svn_config_ensure): Update the default 'config' file. * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): Use the 'password-stores' option to determine order of dynamically loaded auth simple providers. ------------------------------------------------------------------------ r31429 | markphip | 2008-05-24 22:34:33 +0200 (Sat, 24 May 2008) | 9 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/svn_error_codes.h M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_ra_neon/commit.c M /branches/1.5.x/subversion/libsvn_ra_neon/get_locks.c M /branches/1.5.x/subversion/libsvn_ra_neon/props.c M /branches/1.5.x/subversion/libsvn_ra_neon/session.c M /branches/1.5.x/subversion/libsvn_ra_neon/util.c M /branches/1.5.x/subversion/libsvn_ra_serf/blame.c M /branches/1.5.x/subversion/libsvn_ra_serf/commit.c M /branches/1.5.x/subversion/libsvn_ra_serf/getlocations.c M /branches/1.5.x/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/1.5.x/subversion/libsvn_ra_serf/mergeinfo.c M /branches/1.5.x/subversion/libsvn_ra_serf/property.c M /branches/1.5.x/subversion/libsvn_ra_serf/ra_serf.h M /branches/1.5.x/subversion/libsvn_ra_serf/serf.c M /branches/1.5.x/subversion/libsvn_ra_serf/update.c M /branches/1.5.x/subversion/libsvn_ra_serf/util.c M /branches/1.5.x/subversion/svn/mkdir-cmd.c Reverse-merge and add -0 to r31357. Serf tests are failing on OSX with this revision applied. All tests, including bindings, pass with this revision backed out. I am not against having this revision, I just do not want to block the release for a non-crucial fix that is causing the tests to fail (for at least me). ------------------------------------------------------------------------ r31430 | hwright | 2008-05-24 23:51:31 +0200 (Sat, 24 May 2008) | 1 line Changed paths: A /tags/1.5.0-rc6 (from /branches/1.5.x:31429) M /tags/1.5.0-rc6/subversion/include/svn_version.h Tagging 1.5.0-rc6 with svn_version.h matching tarball. ------------------------------------------------------------------------ r31431 | markphip | 2008-05-25 02:00:20 +0200 (Sun, 25 May 2008) | 14 lines Changed paths: M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java M /trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java JavaHL: Followup to r31402. Fixed improper timezone handling in date parsing of LogDate class. Dates were being treated as if they represented the local timezone. [ in subversion/bindings/javahl/ ] * src/org/tigris/subversion/javahl/LogDate.java (LogDate): Explicitly parses date as UTC timezone and creates a UTC Calendar object. * tests/org/tigris/subversion/javahl/BasicTests.java (testLogDate): Adjusted expected date by -04:00. Also removed explicit references to Assert class which are not needed in our tests. ------------------------------------------------------------------------ r31432 | markphip | 2008-05-25 02:03:02 +0200 (Sun, 25 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate and vote for r31431. ------------------------------------------------------------------------ r31433 | kou | 2008-05-25 04:02:49 +0200 (Sun, 25 May 2008) | 7 lines Changed paths: M /trunk/subversion/include/svn_auth_dso.h Use file name for #define guard. * subversion/include/svn_auth_dso.h: Change to SVN_AUTH_DSO_H from SVN_AUTH_KWALLET_H. Review by: danielsh ------------------------------------------------------------------------ r31434 | markphip | 2008-05-25 04:30:40 +0200 (Sun, 25 May 2008) | 8 lines Changed paths: M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java JavaHL: Further improvements to date parsing. [ in subversion/bindings/javahl/ ] * src/org/tigris/subversion/javahl/LogDate.java (LogDate): Verify that string is exactly 27 characters and ends in Z. Also, corrected brace format and removed a tab. ------------------------------------------------------------------------ r31435 | markphip | 2008-05-25 04:32:22 +0200 (Sun, 25 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate and vote for r31434. ------------------------------------------------------------------------ r31436 | arfrever | 2008-05-25 04:33:31 +0200 (Sun, 25 May 2008) | 5 lines Changed paths: M /branches/1.5.x/subversion/po/pl.po On the '1.5.x' branch: Polish translation update. * subversion/po/pl.po: Backport some changes from trunk. ------------------------------------------------------------------------ r31437 | arfrever | 2008-05-25 05:00:03 +0200 (Sun, 25 May 2008) | 4 lines Changed paths: M /trunk/subversion/po/pl.po Polish translation update. * subversion/po/pl.po: Polish translation update. ------------------------------------------------------------------------ r31438 | hwright | 2008-05-25 05:00:58 +0200 (Sun, 25 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for the r31431 group, approving. ------------------------------------------------------------------------ r31439 | hwright | 2008-05-25 05:03:24 +0200 (Sun, 25 May 2008) | 8 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java M /branches/1.5.x/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/1.5.x/subversion/bindings/swig Merge r31431, r31434 from trunk: * r31431, r31434 JavaHL: Fix date parsing bug introduced in r31402. Dates were being treated as if they were in local timezone instead of UTC. Votes: +1: markphip, hwright ------------------------------------------------------------------------ r31440 | arfrever | 2008-05-25 05:07:12 +0200 (Sun, 25 May 2008) | 2 lines Changed paths: M /trunk/Makefile.in * Makefile.in: Reorder some definitions. No functional change. ------------------------------------------------------------------------ r31441 | hwright | 2008-05-25 05:32:53 +0200 (Sun, 25 May 2008) | 1 line Changed paths: A /tags/1.5.0-rc7 (from /branches/1.5.x:31439) M /tags/1.5.0-rc7/subversion/include/svn_version.h Tagging 1.5.0-rc7 with svn_version.h matching tarball. ------------------------------------------------------------------------ r31442 | fabien | 2008-05-25 12:08:00 +0200 (Sun, 25 May 2008) | 4 lines Changed paths: M /branches/1.5.x/subversion/po/fr.po French translation update for r31441. * subversion/po/fr.po: one fuzzy fixed ------------------------------------------------------------------------ r31443 | fabien | 2008-05-25 12:27:18 +0200 (Sun, 25 May 2008) | 4 lines Changed paths: M /trunk/subversion/po/fr.po French translation update for r31442 * subversion/po/fr.po: po-update and fixes. ------------------------------------------------------------------------ r31444 | arfrever | 2008-05-25 14:57:28 +0200 (Sun, 25 May 2008) | 12 lines Changed paths: M /trunk/subversion/po/de.po M /trunk/subversion/po/es.po M /trunk/subversion/po/fr.po M /trunk/subversion/po/it.po M /trunk/subversion/po/ja.po M /trunk/subversion/po/ko.po M /trunk/subversion/po/nb.po M /trunk/subversion/po/pt_BR.po M /trunk/subversion/po/sv.po M /trunk/subversion/po/zh_CN.po M /trunk/subversion/po/zh_TW.po * subversion/po/de.po: * subversion/po/es.po: * subversion/po/fr.po: * subversion/po/it.po: * subversion/po/ja.po: * subversion/po/ko.po: * subversion/po/nb.po: * subversion/po/pt_BR.po: * subversion/po/sv.po: * subversion/po/zh_CN.po: * subversion/po/zh_TW.po: Update version numbers. ------------------------------------------------------------------------ r31445 | arfrever | 2008-05-25 15:05:36 +0200 (Sun, 25 May 2008) | 12 lines Changed paths: M /branches/1.5.x/subversion/po/de.po M /branches/1.5.x/subversion/po/it.po M /branches/1.5.x/subversion/po/ja.po M /branches/1.5.x/subversion/po/ko.po M /branches/1.5.x/subversion/po/nb.po M /branches/1.5.x/subversion/po/pt_BR.po M /branches/1.5.x/subversion/po/sv.po M /branches/1.5.x/subversion/po/zh_CN.po M /branches/1.5.x/subversion/po/zh_TW.po On the '1.5.x' branch: * subversion/po/de.po: * subversion/po/it.po: * subversion/po/ja.po: * subversion/po/ko.po: * subversion/po/nb.po: * subversion/po/pt_BR.po: * subversion/po/sv.po: * subversion/po/zh_CN.po: * subversion/po/zh_TW.po: Update version numbers. ------------------------------------------------------------------------ r31446 | arfrever | 2008-05-25 16:43:27 +0200 (Sun, 25 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_subr/cmdline.c Follow-up to r31428: * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): Delete obsolete comment. ------------------------------------------------------------------------ r31447 | lgo | 2008-05-25 22:50:30 +0200 (Sun, 25 May 2008) | 8 lines Changed paths: A /trunk/notes/obliterate A /trunk/notes/obliterate/obliterate-functional-spec.txt Add very early version of the functional specification for the 'svn obliterate' feature. It's in the very early stages, and needs much more detailing, but the purpose is to expand this in the one-and-only set of functional specifications to be used to design and implement the final solution. * notes/obliterate * notes/obliterate/obliterate-functional-spec.txt: New directory and file. ------------------------------------------------------------------------ r31448 | jensseidel | 2008-05-26 00:13:53 +0200 (Mon, 26 May 2008) | 4 lines Changed paths: M /branches/1.5.x/subversion/po/de.po German translation update. * subversion/po/de.po: Current status: 1802t 0f 0u ------------------------------------------------------------------------ r31449 | stylesen | 2008-05-26 13:23:13 +0200 (Mon, 26 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_subr/simple_providers.c Code indentation fix only. * subversion/libsvn_subr/simple_providers.c (svn_auth__simple_save_creds_helper): fix indentation. ------------------------------------------------------------------------ r31450 | jensseidel | 2008-05-26 16:44:31 +0200 (Mon, 26 May 2008) | 6 lines Changed paths: M /branches/1.5.x/subversion/po/de.po German translation update. * subversion/po/de.po: Current status: 1804t 0f 0u Three untranslated messages were added, two were missing because of a xgettext problem. Most text fits now on a 80 character wide terminal. ------------------------------------------------------------------------ r31451 | nori | 2008-05-26 18:31:08 +0200 (Mon, 26 May 2008) | 7 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Add 28 extra messages and their translations, which is required by source code at r31449, as obsolete entries. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+622o"). ------------------------------------------------------------------------ r31452 | nori | 2008-05-26 18:31:22 +0200 (Mon, 26 May 2008) | 8 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Add 10 extra messages and their translations, which is required by source code on the 1.5.x branch at r31449, as obsolete entries. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+632o"). ------------------------------------------------------------------------ r31453 | nori | 2008-05-26 18:31:35 +0200 (Mon, 26 May 2008) | 7 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Make some improvements and terminological unifications. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+632o"). ------------------------------------------------------------------------ r31454 | glasser | 2008-05-26 21:39:05 +0200 (Mon, 26 May 2008) | 19 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c M /trunk/subversion/svn/conflict-callbacks.c M /trunk/subversion/svn/main.c M /trunk/subversion/svn/util.c Various message cleanups. Suggested by: jensseidel * subversion/libsvn_wc/props.c (apply_single_prop_change): Add period to prop conflict message. * subversion/svn/conflict-callbacks.c (svn_cl__conflict_handler): Change some commas to semicolons, and insert a missing one. * subversion/svn/main.c (svn_cl__options): Add a missing period. (svn_cl__cmd_table): Add a missing period. Reword some stuff. Normalize to 'behavior'. * subversion/svn/util.c (svn_cl__get_log_message): Remove an extraneous space. ------------------------------------------------------------------------ r31455 | jensseidel | 2008-05-26 22:01:42 +0200 (Mon, 26 May 2008) | 5 lines Changed paths: M /trunk/subversion/po/de.po German translation update. * subversion/po/de.po: Synchronized with 1.5.x branch. Current status: 1780t 31f 40u ------------------------------------------------------------------------ r31456 | kfogel | 2008-05-26 22:14:43 +0200 (Mon, 26 May 2008) | 13 lines Changed paths: M /trunk/www/hacking.html * www/hacking.html (Stabilizing and maintaining releases): Say that documentation changes do not require voting. See the thread starting here for more: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=139052 From: Karl Fogel To: "Mark Phippard" Cc: "Subversion Development" Date: Sat, 24 May 2008 12:20:15 -0400 Message-ID: <87iqx3vfls.fsf@red-bean.com> Subject: Re: SVN 1.5 cleared for takeoff ------------------------------------------------------------------------ r31457 | jensseidel | 2008-05-26 23:09:19 +0200 (Mon, 26 May 2008) | 2 lines Changed paths: M /trunk/TRANSLATING * TRANSLATING: Removed broken links. ------------------------------------------------------------------------ r31458 | kfogel | 2008-05-26 23:21:08 +0200 (Mon, 26 May 2008) | 25 lines Changed paths: M /trunk/subversion/include/private/svn_opt_private.h M /trunk/subversion/include/svn_opt.h M /trunk/subversion/libsvn_client/cmdline.c M /trunk/subversion/libsvn_subr/opt.c M /trunk/subversion/tests/cmdline/basic_tests.py Fix peg revision support for repository root urls to address issue #3193. Along the way, unify some aspects of peg revision parsing into a new helper function. Patch by: Troy Curtis Jr (Only minor tweaks by me.) * subversion/include/private/svn_opt_private.h (svn_opt__split_arg_at_peg_revision): New prototype. * subversion/libsvn_subr/opt.c (svn_opt__split_arg_at_peg_revision): New function. (svn_opt_parse_path, svn_opt_args_to_target_array3): Replace in-line peg revision parsing with call to new function. * subversion/libsvn_client/cmdline.c (svn_opt_args_to_target_array3): Same. * subversion/include/svn_opt.h (svn_opt_parse_path): Document error behavior more precisely. * subversion/tests/cmdline/basic_tests.py (basic_relative_url_with_peg_revisions): New test. (test_list): Run it. ------------------------------------------------------------------------ r31459 | jensseidel | 2008-05-26 23:31:12 +0200 (Mon, 26 May 2008) | 12 lines Changed paths: M /trunk/build/generator/ezt.py M /trunk/packages/python-windows/setup.py M /trunk/subversion/bindings/swig/python/tests/trac/test.py M /trunk/tools/hook-scripts/verify-po.py M /trunk/tools/po/l10n-report.py M /trunk/tools/server-side/svn_server_log_parse.py Added svn:executable flags to various Python files. * build/generator/ezt.py, subversion/bindings/swig/python/tests/trac/test.py, tools/hook-scripts/verify-po.py, tools/server-side/svn_server_log_parse.py, tools/po/l10n-report.py, packages/python-windows/setup.py: Make all Python files with a Shebang executable. Approved by: danielsh ------------------------------------------------------------------------ r31460 | jensseidel | 2008-05-26 23:59:07 +0200 (Mon, 26 May 2008) | 14 lines Changed paths: M /trunk/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh M /trunk/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh M /trunk/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh M /trunk/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh M /trunk/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh M /trunk/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh M /trunk/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh M /trunk/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh Added svn:executable flags to various shell files. * tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh, tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh, tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh, tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh, tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh, tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh, tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh, tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh: Make all shell files with a Shebang executable. Approved by: danielsh ------------------------------------------------------------------------ r31461 | jensseidel | 2008-05-27 00:11:00 +0200 (Tue, 27 May 2008) | 3 lines Changed paths: M /trunk/subversion/svn/util.c * subversion/svn/util.c (svn_cl__get_log_message): Removed a useless space in front of \n in a message. ------------------------------------------------------------------------ r31462 | lgo | 2008-05-27 03:25:38 +0200 (Tue, 27 May 2008) | 3 lines Changed paths: M /trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout * subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout: Follow up r31454: update expected help output. ------------------------------------------------------------------------ r31463 | lgo | 2008-05-27 03:28:16 +0200 (Tue, 27 May 2008) | 3 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py * subversion/tests/cmdline/merge_tests.py: Follow up r31454: update expected file content. ------------------------------------------------------------------------ r31464 | lgo | 2008-05-27 04:34:26 +0200 (Tue, 27 May 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/serf.c ra_serf: Fix authz tests 1 and 12. Fetch the UUID of the repository on the target url and not on the root url of the repositoy as that may not be readable. * subversion/libsvn_ra_serf/serf.c: (svn_ra_serf__get_uuid): use session url, not repo root url, to fetch the repository-uuid property. ------------------------------------------------------------------------ r31465 | lgo | 2008-05-27 13:06:59 +0200 (Tue, 27 May 2008) | 6 lines Changed paths: M /trunk/notes/obliterate/obliterate-functional-spec.txt * notes/obliterate/obliterate-functional-spec.txt Add some details to certain requirements. Add the titles of functional requirements related to propagation of changes (using mergetracking info). Add some items to the TODO list (no, it's not getting shorter). Cleaned up a bit. ------------------------------------------------------------------------ r31466 | kfogel | 2008-05-27 16:37:19 +0200 (Tue, 27 May 2008) | 4 lines Changed paths: M /trunk/www/project_issues.html * www/project_issues.html: Include all existing issues, including resolved/closed issues, in the link and in the search box. Add a comment explaining why. ------------------------------------------------------------------------ r31467 | lgo | 2008-05-27 17:09:01 +0200 (Tue, 27 May 2008) | 3 lines Changed paths: M /trunk/notes/obliterate/obliterate-functional-spec.txt * notes/obliterate/obliterate-functional-spec.txt Fixed copy-pasted section and small layout issue. ------------------------------------------------------------------------ r31468 | cmpilato | 2008-05-27 18:22:14 +0200 (Tue, 27 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_ra/ra_loader.c * subversion/libsvn_ra/ra_loader.c (svn_ra_get_log2): Don't try to iterate over NULL 'paths' array. Found by: Martin von Gagern ------------------------------------------------------------------------ r31469 | cmpilato | 2008-05-27 18:24:58 +0200 (Tue, 27 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Recommend r31468 for backport. ------------------------------------------------------------------------ r31470 | cmpilato | 2008-05-27 18:28:03 +0200 (Tue, 27 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_ra/ra_loader.c * subversion/libsvn_ra/ra_loader.c (svn_ra_get_log): Don't try to iterate over NULL 'paths' array. Found by: glasser ------------------------------------------------------------------------ r31471 | cmpilato | 2008-05-27 18:28:51 +0200 (Tue, 27 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Add r31470 to the r31468 grouping. ------------------------------------------------------------------------ r31472 | glasser | 2008-05-27 18:40:51 +0200 (Tue, 27 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Vote for r31468 and r31470 to be backported to 1.5.x. ------------------------------------------------------------------------ r31473 | nori | 2008-05-27 19:24:29 +0200 (Tue, 27 May 2008) | 8 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Re-add 20 extra messages and their translations from the 1.4.x branch for easier translation maintenance, which has been deleted by msgmerge on trunk. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+652o"). ------------------------------------------------------------------------ r31474 | nori | 2008-05-27 19:24:40 +0200 (Tue, 27 May 2008) | 7 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Add 12 extra messages and their translations, which is required by source code at r31471, as obsolete entries. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+664o"). ------------------------------------------------------------------------ r31475 | nori | 2008-05-27 19:24:50 +0200 (Tue, 27 May 2008) | 6 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Make some improvements. Now ja.po has 1671 translated messages against r27227 (Emacs PO-mode status: "1671t+664o"). ------------------------------------------------------------------------ r31476 | nori | 2008-05-27 19:25:09 +0200 (Tue, 27 May 2008) | 2 lines Changed paths: M /trunk/subversion/libsvn_client/externals.c M /trunk/subversion/libsvn_ra_serf/auth.c M /trunk/subversion/libsvn_subr/cache-memcache.c Kill trailing periods to meet our error message conventions. ------------------------------------------------------------------------ r31477 | nori | 2008-05-27 19:25:40 +0200 (Tue, 27 May 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_subr/mergeinfo.c * subversion/libsvn_subr/mergeinfo.c (parse_pathname): Correct a typo. ------------------------------------------------------------------------ r31478 | lgo | 2008-05-27 19:58:40 +0200 (Tue, 27 May 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/serf.c ra_serf: Follow up r31375, undo accidental change in depth of property retrieval. * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__get_dir): change depth "0" back to "1". Note from the future: This change was faulty and reverted in r31551. ------------------------------------------------------------------------ r31479 | kfogel | 2008-05-27 21:29:18 +0200 (Tue, 27 May 2008) | 7 lines Changed paths: M /trunk/tools/dev/contribulyze.py Improve Contribulyzer output: give each individual contribution a red rectangular border when jumped to. * tools/dev/contribulyze.py (html_header): Take new highlight_targets boolean parameter, use it. (Contributor.html_out): Pass true for the new parameter. ------------------------------------------------------------------------ r31480 | epg | 2008-05-27 21:45:09 +0200 (Tue, 27 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Vote for r31468, r31470, moving to Approved. ------------------------------------------------------------------------ r31481 | hwright | 2008-05-27 22:54:03 +0200 (Tue, 27 May 2008) | 11 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/libsvn_ra/ra_loader.c Merge r31468, r31470 from trunk: * r31468, r31470 Don't attempt to iterate over NULL arrays (which are explicitly allowed per the docstrings of the affected functions). Notes: Obvious fix? Can probably wait for 1.5.1, but is known to effect some third-party API consumers. Votes: +1: cmpilato, glasser, epg ------------------------------------------------------------------------ r31482 | pburba | 2008-05-27 23:05:11 +0200 (Tue, 27 May 2008) | 17 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Follow-up to r31075, fix a bug in initial fix for issue #3157 'Merging a change from a path's natural history creates self-referential mergeinfo'. * subversion/libsvn_client/merge.c (determine_merges_performed): Change signature to take a rangelist rather than a single range. (filter_natural_history_from_mergeinfo): Same. And don't assume that the start of the requested merge range is >= the youngest implicit mergeinfo range, that is not always the case. (do_file_merge, do_directory_merge): Update calls to filter_natural_history_from_mergeinfo() and determine_merges_performed(), using rangelists instead of single ranges. * subversion/tests/cmdline/merge_tests.py (dont_explicitly_record_implicit_mergeinfo): Tweak comment re XFail status. (test_list): Remove XFail from dont_explicitly_record_implicit_mergeinfo. ------------------------------------------------------------------------ r31483 | epg | 2008-05-27 23:50:34 +0200 (Tue, 27 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Change vote to -0 for r31313 until test failures are fixed. ------------------------------------------------------------------------ r31484 | jensseidel | 2008-05-28 00:54:29 +0200 (Wed, 28 May 2008) | 9 lines Changed paths: M /trunk/configure.ac M /trunk/subversion/svn/main.c M /trunk/tools/po/po-update.sh Use workaround for an xgettext limitation. * subversion/svn/main.c, tools/po/po-update.sh, configure.ac: xgettext fails to look up macros in some messages so that these are not put into PO files and that's why untranslated. This patch explicitly adds duplicates of these strings with manually expanded macros. ------------------------------------------------------------------------ r31485 | cmpilato | 2008-05-28 02:20:27 +0200 (Wed, 28 May 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_client/changelist.c Don't allow 'svn cl --cl old-changelist new-changelist' to spam the screen with "Skipped" notifications for directories that (by virtue of being directories) aren't part of the old changelist. * subversion/libsvn_client/changelist.c (set_entry_changelist): Check for changelist membership before checking file node kind. ------------------------------------------------------------------------ r31486 | cmpilato | 2008-05-28 02:23:44 +0200 (Wed, 28 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Recommend r31485 for backport. ------------------------------------------------------------------------ r31487 | mf | 2008-05-28 02:56:30 +0200 (Wed, 28 May 2008) | 13 lines Changed paths: M /trunk/subversion/svn/main.c M /trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Add a note to the help texts of checkout and switch about where to find the action characters. * subversion/svn/main.c (svn_cl__cmd_table."checkout"): Add 'see also update' note. (svn_cl__cmd_table."switch"): Ditto. * subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout: Ditto. Approved by: danielsh ------------------------------------------------------------------------ r31488 | pburba | 2008-05-28 03:04:44 +0200 (Wed, 28 May 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_client/client.h Tweak svn_client__repos_location_segments() doc string. * subversion/libsvn_client/client.h (svn_client__repos_location_segments): Note that *SEGMENTS can be empty, but never NULL. ------------------------------------------------------------------------ r31489 | jensseidel | 2008-05-28 11:09:59 +0200 (Wed, 28 May 2008) | 3 lines Changed paths: M /trunk/subversion/po/es.po M /trunk/subversion/po/fr.po M /trunk/subversion/po/ja.po M /trunk/subversion/po/pl.po M /trunk/subversion/po/zh_CN.po Added translations for messages introduced in r31484 by reusing the previously incomplete message translation. ------------------------------------------------------------------------ r31490 | jensseidel | 2008-05-28 11:15:24 +0200 (Wed, 28 May 2008) | 6 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/po/es.po M /branches/1.5.x/subversion/po/fr.po M /branches/1.5.x/subversion/po/ja.po M /branches/1.5.x/subversion/po/pl.po M /branches/1.5.x/subversion/po/zh_CN.po Merge r31489 from trunk: * r31489 Added translations for messages introduced in r31484 by reusing the previously incomplete message translation. ------------------------------------------------------------------------ r31491 | jensseidel | 2008-05-28 11:53:40 +0200 (Wed, 28 May 2008) | 7 lines Changed paths: M /trunk/subversion/svn_private_config.hw Fixed a build error for Windows introduced in r31484. * svn_private_config.hw: Added the GETTEXT_NOOP macro definition. Suggested by: dionisos ------------------------------------------------------------------------ r31492 | stsp | 2008-05-28 13:05:54 +0200 (Wed, 28 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r30915 for backport to 1.5.1. ------------------------------------------------------------------------ r31493 | firemeteor | 2008-05-28 14:28:38 +0200 (Wed, 28 May 2008) | 6 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c On the issue-2843-dev branch: Remove the protective check against cropping the wc. * subversion/libsvn_wc/update_editor.c (make_editor): Remove the protective check. ------------------------------------------------------------------------ r31494 | jensseidel | 2008-05-28 14:45:15 +0200 (Wed, 28 May 2008) | 6 lines Changed paths: M /trunk/subversion/po/de.po Proofread of German help message translations * subversion/po/de.po: Ensured that messages are properly formatted in 80 column width terminals. Also a proper and consistent capitalisation was enforced. ------------------------------------------------------------------------ r31495 | jensseidel | 2008-05-28 15:06:36 +0200 (Wed, 28 May 2008) | 3 lines Changed paths: M /branches/1.5.x/subversion/po/de.po M /branches/1.5.x/subversion/po/es.po M /branches/1.5.x/subversion/po/fr.po M /branches/1.5.x/subversion/po/ja.po M /branches/1.5.x/subversion/po/pl.po M /branches/1.5.x/subversion/po/zh_CN.po Added another missing message into PO files. It occurs in the "resolve" help and was again missing because of an xgettext limitation. ------------------------------------------------------------------------ r31496 | jensseidel | 2008-05-28 15:13:56 +0200 (Wed, 28 May 2008) | 7 lines Changed paths: M /trunk/subversion/svn/main.c Marked a further string explicitly translatable which is also missed by xgettext. * subversion/svn/main.c: Added additional GETTEXT_NOOP macro. Also use consistent comments near other affected strings. ------------------------------------------------------------------------ r31497 | jensseidel | 2008-05-28 15:48:28 +0200 (Wed, 28 May 2008) | 6 lines Changed paths: M /branches/1.5.x/subversion/po/de.po Merge r31494 from trunk: * subversion/po/de.po: Ensured that messages are properly formatted in 80 column width terminals. Also a proper and consistent capitalisation was enforced. ------------------------------------------------------------------------ r31498 | julianfoad | 2008-05-28 18:53:13 +0200 (Wed, 28 May 2008) | 1 line Changed paths: M /branches/tree-conflicts M /branches/tree-conflicts/CHANGES M /branches/tree-conflicts/COMMITTERS M /branches/tree-conflicts/Makefile.in M /branches/tree-conflicts/TRANSLATING M /branches/tree-conflicts/aclocal.m4 M /branches/tree-conflicts/build/ac-macros/apache.m4 A /branches/tree-conflicts/build/ac-macros/apr_memcache.m4 (from /trunk/build/ac-macros/apr_memcache.m4:31497) M /branches/tree-conflicts/build/generator/ezt.py M /branches/tree-conflicts/build/generator/gen_base.py M /branches/tree-conflicts/build/run_tests.py M /branches/tree-conflicts/build.conf M /branches/tree-conflicts/configure.ac M /branches/tree-conflicts/gen-make.py A /branches/tree-conflicts/notes/obliterate (from /trunk/notes/obliterate:31497) R /branches/tree-conflicts/notes/obliterate/obliterate-functional-spec.txt (from /trunk/notes/obliterate/obliterate-functional-spec.txt:31497) D /branches/tree-conflicts/notes/reintegrate-todo.txt A /branches/tree-conflicts/notes/tree-conflicts/design-overview.txt (from /trunk/notes/tree-conflicts/design-overview.txt:31497) D /branches/tree-conflicts/notes/tree-conflicts/policy.txt A /branches/tree-conflicts/notes/tree-conflicts/requirements.txt (from /trunk/notes/tree-conflicts/requirements.txt:31497) M /branches/tree-conflicts/packages/python-windows/setup.py M /branches/tree-conflicts/subversion/bindings/javahl/native/LogMessageCallback.cpp M /branches/tree-conflicts/subversion/bindings/javahl/native/Prompter.cpp M /branches/tree-conflicts/subversion/bindings/javahl/native/ProplistCallback.h A /branches/tree-conflicts/subversion/bindings/javahl/native/RevpropTable.cpp (from /trunk/subversion/bindings/javahl/native/RevpropTable.cpp:31497) A /branches/tree-conflicts/subversion/bindings/javahl/native/RevpropTable.h (from /trunk/subversion/bindings/javahl/native/RevpropTable.h:31497) M /branches/tree-conflicts/subversion/bindings/javahl/native/SVNClient.cpp M /branches/tree-conflicts/subversion/bindings/javahl/native/SVNClient.h M /branches/tree-conflicts/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp A /branches/tree-conflicts/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java:31497) M /branches/tree-conflicts/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java M /branches/tree-conflicts/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/tree-conflicts/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /branches/tree-conflicts/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /branches/tree-conflicts/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/tree-conflicts/subversion/bindings/swig/core.i M /branches/tree-conflicts/subversion/bindings/swig/python/tests/client.py M /branches/tree-conflicts/subversion/bindings/swig/python/tests/mergeinfo.py M /branches/tree-conflicts/subversion/bindings/swig/python/tests/trac/test.py M /branches/tree-conflicts/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py M /branches/tree-conflicts/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c M /branches/tree-conflicts/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h M /branches/tree-conflicts/subversion/bindings/swig/ruby/svn/client.rb M /branches/tree-conflicts/subversion/bindings/swig/ruby/svn/core.rb M /branches/tree-conflicts/subversion/bindings/swig/ruby/test/test_client.rb M /branches/tree-conflicts/subversion/bindings/swig/ruby/test/test_core.rb M /branches/tree-conflicts/subversion/bindings/swig/svn_client.i A /branches/tree-conflicts/subversion/include/private/svn_auth_private.h (from /trunk/subversion/include/private/svn_auth_private.h:31497) M /branches/tree-conflicts/subversion/include/private/svn_opt_private.h M /branches/tree-conflicts/subversion/include/svn_auth.h A /branches/tree-conflicts/subversion/include/svn_auth_dso.h (from /trunk/subversion/include/svn_auth_dso.h:31497) M /branches/tree-conflicts/subversion/include/svn_base64.h A /branches/tree-conflicts/subversion/include/svn_cache.h (from /trunk/subversion/include/svn_cache.h:31497) M /branches/tree-conflicts/subversion/include/svn_client.h M /branches/tree-conflicts/subversion/include/svn_config.h M /branches/tree-conflicts/subversion/include/svn_error_codes.h M /branches/tree-conflicts/subversion/include/svn_io.h M /branches/tree-conflicts/subversion/include/svn_mergeinfo.h M /branches/tree-conflicts/subversion/include/svn_opt.h M /branches/tree-conflicts/subversion/include/svn_path.h M /branches/tree-conflicts/subversion/include/svn_props.h M /branches/tree-conflicts/subversion/include/svn_repos.h A /branches/tree-conflicts/subversion/libsvn_auth_gnome_keyring (from /trunk/subversion/libsvn_auth_gnome_keyring:31497) R /branches/tree-conflicts/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (from /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c:31497) A /branches/tree-conflicts/subversion/libsvn_auth_kwallet (from /trunk/subversion/libsvn_auth_kwallet:31497) R /branches/tree-conflicts/subversion/libsvn_auth_kwallet/kwallet.cpp (from /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp:31497) M /branches/tree-conflicts/subversion/libsvn_client/add.c M /branches/tree-conflicts/subversion/libsvn_client/changelist.c M /branches/tree-conflicts/subversion/libsvn_client/client.h M /branches/tree-conflicts/subversion/libsvn_client/cmdline.c M /branches/tree-conflicts/subversion/libsvn_client/commit.c M /branches/tree-conflicts/subversion/libsvn_client/commit_util.c M /branches/tree-conflicts/subversion/libsvn_client/copy.c M /branches/tree-conflicts/subversion/libsvn_client/delete.c M /branches/tree-conflicts/subversion/libsvn_client/externals.c M /branches/tree-conflicts/subversion/libsvn_client/merge.c M /branches/tree-conflicts/subversion/libsvn_client/prop_commands.c A /branches/tree-conflicts/subversion/libsvn_fs_fs/caching.c (from /trunk/subversion/libsvn_fs_fs/caching.c:31497) M /branches/tree-conflicts/subversion/libsvn_fs_fs/dag.c M /branches/tree-conflicts/subversion/libsvn_fs_fs/dag.h M /branches/tree-conflicts/subversion/libsvn_fs_fs/fs.c M /branches/tree-conflicts/subversion/libsvn_fs_fs/fs.h M /branches/tree-conflicts/subversion/libsvn_fs_fs/fs_fs.c M /branches/tree-conflicts/subversion/libsvn_fs_fs/fs_fs.h M /branches/tree-conflicts/subversion/libsvn_fs_fs/structure M /branches/tree-conflicts/subversion/libsvn_fs_fs/tree.c M /branches/tree-conflicts/subversion/libsvn_ra/ra_loader.c M /branches/tree-conflicts/subversion/libsvn_ra_local/ra_plugin.c M /branches/tree-conflicts/subversion/libsvn_ra_neon/commit.c M /branches/tree-conflicts/subversion/libsvn_ra_neon/get_locks.c M /branches/tree-conflicts/subversion/libsvn_ra_neon/props.c M /branches/tree-conflicts/subversion/libsvn_ra_neon/session.c M /branches/tree-conflicts/subversion/libsvn_ra_neon/util.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/auth.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/blame.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/commit.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/getlocations.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/mergeinfo.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/property.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/ra_serf.h M /branches/tree-conflicts/subversion/libsvn_ra_serf/serf.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/update.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/util.c A /branches/tree-conflicts/subversion/libsvn_subr/cache-inprocess.c (from /trunk/subversion/libsvn_subr/cache-inprocess.c:31497) A /branches/tree-conflicts/subversion/libsvn_subr/cache-memcache.c (from /trunk/subversion/libsvn_subr/cache-memcache.c:31497) A /branches/tree-conflicts/subversion/libsvn_subr/cache.c (from /trunk/subversion/libsvn_subr/cache.c:31497) A /branches/tree-conflicts/subversion/libsvn_subr/cache.h (from /trunk/subversion/libsvn_subr/cache.h:31497) M /branches/tree-conflicts/subversion/libsvn_subr/cmdline.c M /branches/tree-conflicts/subversion/libsvn_subr/config_file.c M /branches/tree-conflicts/subversion/libsvn_subr/mergeinfo.c M /branches/tree-conflicts/subversion/libsvn_subr/opt.c M /branches/tree-conflicts/subversion/libsvn_subr/properties.c M /branches/tree-conflicts/subversion/libsvn_subr/simple_providers.c M /branches/tree-conflicts/subversion/libsvn_subr/ssl_server_trust_providers.c M /branches/tree-conflicts/subversion/libsvn_subr/stream.c M /branches/tree-conflicts/subversion/libsvn_subr/svn_base64.c M /branches/tree-conflicts/subversion/libsvn_subr/time.c M /branches/tree-conflicts/subversion/libsvn_wc/props.c M /branches/tree-conflicts/subversion/libsvn_wc/update_editor.c M /branches/tree-conflicts/subversion/po/de.po M /branches/tree-conflicts/subversion/po/es.po M /branches/tree-conflicts/subversion/po/fr.po M /branches/tree-conflicts/subversion/po/it.po M /branches/tree-conflicts/subversion/po/ja.po M /branches/tree-conflicts/subversion/po/ko.po M /branches/tree-conflicts/subversion/po/nb.po M /branches/tree-conflicts/subversion/po/pl.po M /branches/tree-conflicts/subversion/po/pt_BR.po M /branches/tree-conflicts/subversion/po/sv.po M /branches/tree-conflicts/subversion/po/zh_CN.po M /branches/tree-conflicts/subversion/po/zh_TW.po M /branches/tree-conflicts/subversion/svn/blame-cmd.c M /branches/tree-conflicts/subversion/svn/cl.h M /branches/tree-conflicts/subversion/svn/commit-cmd.c M /branches/tree-conflicts/subversion/svn/conflict-callbacks.c M /branches/tree-conflicts/subversion/svn/copy-cmd.c M /branches/tree-conflicts/subversion/svn/delete-cmd.c M /branches/tree-conflicts/subversion/svn/import-cmd.c M /branches/tree-conflicts/subversion/svn/info-cmd.c M /branches/tree-conflicts/subversion/svn/log-cmd.c M /branches/tree-conflicts/subversion/svn/main.c M /branches/tree-conflicts/subversion/svn/mkdir-cmd.c M /branches/tree-conflicts/subversion/svn/move-cmd.c M /branches/tree-conflicts/subversion/svn/propdel-cmd.c M /branches/tree-conflicts/subversion/svn/propedit-cmd.c M /branches/tree-conflicts/subversion/svn/propset-cmd.c M /branches/tree-conflicts/subversion/svn/util.c M /branches/tree-conflicts/subversion/svn_private_config.hw M /branches/tree-conflicts/subversion/svnserve/serve.c M /branches/tree-conflicts/subversion/tests/cmdline/basic_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/commit_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/copy_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout M /branches/tree-conflicts/subversion/tests/cmdline/merge_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/prop_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/svndumpfilter_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/svntest/actions.py M /branches/tree-conflicts/subversion/tests/cmdline/svntest/main.py M /branches/tree-conflicts/subversion/tests/cmdline/svntest/testcase.py M /branches/tree-conflicts/subversion/tests/libsvn_fs/fs-test.c M /branches/tree-conflicts/subversion/tests/libsvn_fs/locks-test.c M /branches/tree-conflicts/subversion/tests/libsvn_fs_base/changes-test.c M /branches/tree-conflicts/subversion/tests/libsvn_fs_base/fs-base-test.c M /branches/tree-conflicts/subversion/tests/libsvn_fs_base/strings-reps-test.c M /branches/tree-conflicts/subversion/tests/libsvn_ra_local/ra-local-test.c M /branches/tree-conflicts/subversion/tests/libsvn_repos/repos-test.c M /branches/tree-conflicts/subversion/tests/libsvn_subr A /branches/tree-conflicts/subversion/tests/libsvn_subr/cache-test.c (from /trunk/subversion/tests/libsvn_subr/cache-test.c:31497) M /branches/tree-conflicts/subversion/tests/svn_test.h M /branches/tree-conflicts/subversion/tests/svn_test_fs.c M /branches/tree-conflicts/subversion/tests/svn_test_fs.h M /branches/tree-conflicts/subversion/tests/svn_test_main.c A /branches/tree-conflicts/subversion/tests/tests.conf (from /trunk/subversion/tests/tests.conf:31497) M /branches/tree-conflicts/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh M /branches/tree-conflicts/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh M /branches/tree-conflicts/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh M /branches/tree-conflicts/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh M /branches/tree-conflicts/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh M /branches/tree-conflicts/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh M /branches/tree-conflicts/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh M /branches/tree-conflicts/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh M /branches/tree-conflicts/tools/dev/contribulyze.py M /branches/tree-conflicts/tools/hook-scripts/verify-po.py M /branches/tree-conflicts/tools/po/l10n-report.py M /branches/tree-conflicts/tools/po/po-update.sh M /branches/tree-conflicts/tools/server-side/svn_server_log_parse.py M /branches/tree-conflicts/tools/server-side/test_svn_server_log_parse.py M /branches/tree-conflicts/win-tests.py M /branches/tree-conflicts/www/hacking.html M /branches/tree-conflicts/www/links.html M /branches/tree-conflicts/www/project_issues.html On the tree-conflicts branch, merge outstanding changes from trunk. ------------------------------------------------------------------------ r31499 | lgo | 2008-05-28 20:06:16 +0200 (Wed, 28 May 2008) | 3 lines Changed paths: M /trunk/notes/obliterate/obliterate-functional-spec.txt * notes/obliterate/obliterate-functional-spec.txt Work on obliteration of a file, including and excluding descendants. ------------------------------------------------------------------------ r31500 | arfrever | 2008-05-28 20:56:40 +0200 (Wed, 28 May 2008) | 8 lines Changed paths: M /trunk/configure.ac M /trunk/subversion/svn/main.c M /trunk/subversion/svn_private_config.hw M /trunk/tools/po/po-update.sh Follow-up to r31484, r31491 and r31496: Revert r31484, r31491 and r31496 and ...: * subversion/svn/main.c (svn_cl__options."accept"): (svn_cl__options."show-revs"): Use values of some constant definitions directly. ------------------------------------------------------------------------ r31501 | arfrever | 2008-05-28 21:06:56 +0200 (Wed, 28 May 2008) | 7 lines Changed paths: M /branches/1.5.x/subversion/svn/main.c On the '1.5.x' branch: * subversion/svn/main.c (svn_cl__options."accept"): (svn_cl__options."show-revs"): Use values of some constant definitions directly. ------------------------------------------------------------------------ r31502 | arfrever | 2008-05-28 21:13:37 +0200 (Wed, 28 May 2008) | 6 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r31500: * subversion/svn/main.c (svn_cl__cmd_table."resolve"): Use values of some constant definitions directly. ------------------------------------------------------------------------ r31503 | arfrever | 2008-05-28 21:18:31 +0200 (Wed, 28 May 2008) | 7 lines Changed paths: M /branches/1.5.x/subversion/svn/main.c On the '1.5.x' branch: Follow-up to r31501: * subversion/svn/main.c (svn_cl__cmd_table."resolve"): Use values of some constant definitions directly. ------------------------------------------------------------------------ r31504 | cmpilato | 2008-05-28 21:54:57 +0200 (Wed, 28 May 2008) | 11 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Optimize file merges performed with ancestrally related sources by using the svn_ra_get_log2() interface to figure out in which revisions the source really changed, and using that information to filter out no-op revision ranges prior to merging. We still *record* the original set of revision ranges, of course. * subversion/libsvn_client/merge.c (log_changed_revs, remove_noop_merge_ranges): New functions. (do_file_merge): Selective use remove_noop_merge_ranges() to reduce the amount of work this function needs to do. ------------------------------------------------------------------------ r31505 | cmpilato | 2008-05-28 22:05:49 +0200 (Wed, 28 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Recommend r31504 for backport to 1.5.1. ------------------------------------------------------------------------ r31506 | jensseidel | 2008-05-28 22:24:10 +0200 (Wed, 28 May 2008) | 8 lines Changed paths: M /branches/1.5.x/subversion/svn/main.c On the '1.5.x' branch: Follow-up to r31501: * subversion/svn/main.c (svn_cl__options."accept"): Added a missing comma which was accidentally removed in r31501 and caused a test to fail. This also brings some translations back to 100%. ------------------------------------------------------------------------ r31507 | pburba | 2008-05-28 22:37:20 +0200 (Wed, 28 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Add a blurb about the ubiquitous children_with_mergeinfo array. * subversion/libsvn_client/merge.c (THE CHILDREN_WITH_MERGEINFO ARRAY): New global comment. ------------------------------------------------------------------------ r31508 | hwright | 2008-05-29 09:16:50 +0200 (Thu, 29 May 2008) | 1 line Changed paths: A /tags/1.5.0-rc8 (from /branches/1.5.x:31507) M /tags/1.5.0-rc8/subversion/include/svn_version.h Tagging 1.5.0-rc8 with svn_version.h matching tarball. ------------------------------------------------------------------------ r31509 | julianfoad | 2008-05-29 09:53:56 +0200 (Thu, 29 May 2008) | 21 lines Changed paths: M /branches/tree-conflicts/subversion/tests/cmdline/tree_conflict_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/tree_conflict_tests.txt In the tree-conflict tests, implement testing of merges where the target branch has committed changes. This causes one more test (test number 10) to fail, so mark that as XFail like the others. * tree_conflict_tests.py (set_up_repos): Take an extra argument giving the branch directory in which to work, separately from the path to the WC root. Return the revision numbers of the initial state and the changed state, so that callers can find the relevant change in the repository. (ensure_tree_conflict): Take an extra parameter requesting the local mods to be committed to the target branch, and re-work the function to support this. (test_tc_up_sw): Adjust calls accordingly. (test_tc_merge): Make use of the above to also test merges where the local mods are first committed to the target branch. (test_list): Make test 10 XFail as it fails on this new variety of merge. * tree_conflict_tests.txt Adjust accordingly. Also remove details of current test failures, rather than updating them. ------------------------------------------------------------------------ r31510 | julianfoad | 2008-05-29 11:54:01 +0200 (Thu, 29 May 2008) | 10 lines Changed paths: M /trunk/subversion/include/svn_cache.h M /trunk/subversion/libsvn_subr/cache-memcache.c Non-functional changes to fix Doxygen and preprocessor syntax. Found by my compilers. * subversion/include/svn_cache.h Correct Doxygen syntax in three doc-strings. * subversion/libsvn_subr/cache-memcache.c Use "#ifdef" rather than "#if" with SVN_HAVE_MEMCACHE. ------------------------------------------------------------------------ r31511 | julianfoad | 2008-05-29 12:57:50 +0200 (Thu, 29 May 2008) | 39 lines Changed paths: M /branches/tree-conflicts/build.conf M /branches/tree-conflicts/subversion/include/svn_wc.h M /branches/tree-conflicts/subversion/libsvn_wc/tree_conflicts.c M /branches/tree-conflicts/subversion/svn/info-cmd.c A /branches/tree-conflicts/subversion/svn/tree-conflicts.c A /branches/tree-conflicts/subversion/svn/tree-conflicts.h D /branches/tree-conflicts/subversion/tests/libsvn_wc/tree-conflict-human-readable-test.c Move the code that generates human-readable and XML descriptions of tree conflicts up from libsvn_wc to the client, as libsvn_wc need not know how this information should be presented to the users. * subversion/include/svn_wc.h (svn_wc_conflicted_p2): Add some to-do comments and questions to the doc string. (svn_wc_append_human_readable_tree_conflict_description, svn_wc_append_tree_conflict_info_xml): Move to subversion/svn/tree-conflicts.h, changing the prefix svn_wc_ to svn_cl__. * subversion/libsvn_wc/tree_conflicts.c (tree_conflict_phrases, new_tree_conflict_phrases, select_their_phrase, select_our_phrase, svn_wc_append_human_readable_tree_conflict_description, svn_wc_append_tree_conflict_info_xml): Move to subversion/svn/tree-conflicts.c, changing the prefix svn_wc_ to svn_cl__. * subversion/svn/info-cmd.c (print_info_xml, print_info): Adjust calls to use the new prefix svn_cl__. * subversion/svn/tree-conflicts.c, subversion/svn/tree-conflicts.h New files with content moved out of libsvn_wc. (svn_cl__append_tree_conflict_info_xml): Tweak to hard-code the XML element and attribute names ("dir", "file", "merge", "deleted", etc.) instead of using the words defined to be used in the WC entries file format. * subversion/tests/libsvn_wc/tree-conflict-human-readable-test.c Delete this file, as human-readable descriptions are no longer in libsvn_wc. (I don't feel it's worth transferring these tests to the replacement functions.) * build.conf (tree-conflict-human-readable-test): Delete this test. ------------------------------------------------------------------------ r31512 | julianfoad | 2008-05-29 13:25:08 +0200 (Thu, 29 May 2008) | 5 lines Changed paths: M /trunk/subversion/tests/cmdline/switch_tests.py Fix a typo in a test description, in case anyone is grepping for "obstruction". * subversion/tests/cmdline/switch_tests.py (forced_switch_failures): "types of obstuctions" -> "types of obstruction". ------------------------------------------------------------------------ r31513 | stylesen | 2008-05-29 15:41:50 +0200 (Thu, 29 May 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Set application name only once in the GNOME Keyring provider. * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (gnome_keyring_init): Check whether we have the application name already set. Approved by: arfrever ------------------------------------------------------------------------ r31514 | julianfoad | 2008-05-29 18:10:04 +0200 (Thu, 29 May 2008) | 17 lines Changed paths: M /trunk/subversion/libsvn_client/resolved.c M /trunk/subversion/libsvn_client/revert.c M /trunk/subversion/libsvn_wc/adm_ops.c M /trunk/subversion/svnserve/serve.c Fix a "depth" bug in deprecated APIs svn_wc_resolved_conflict() and svn_wc_resolved_conflict2(), whereby a "recursive" request would be wrongly executed as (probably) depth=files. Also use the depth conversion macros everywhere, for conciseness and consistency. * subversion/libsvn_client/resolved.c (svn_client_resolved): Use the SVN_DEPTH_INFINITY_OR_EMPTY macro. * subversion/libsvn_client/revert.c (svn_client_revert): Use the SVN_DEPTH_INFINITY_OR_EMPTY macro. * subversion/libsvn_wc/adm_ops.c (svn_wc_revert2): Use the SVN_DEPTH_INFINITY_OR_EMPTY macro. (svn_wc_resolved_conflict2): Use the correct depth for recursive operation. * subversion/svnserve/serve.c (status): Use the SVN_DEPTH_INFINITY_OR_EMPTY macro. ------------------------------------------------------------------------ r31515 | arfrever | 2008-05-29 21:28:34 +0200 (Thu, 29 May 2008) | 15 lines Changed paths: M /trunk/subversion/libsvn_subr/cmdline.c M /trunk/subversion/libsvn_subr/config_file.c Follow-up to r31428: * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): Use the 'password-stores' option also for Keychain and Windows CryptoAPI. Print error when the 'password-stores' option contains invalid value. * subversion/libsvn_subr/config_file.c (svn_config_ensure): Update the default 'config' file. Suggested by: me kfogel glasser danielsh ------------------------------------------------------------------------ r31516 | glasser | 2008-05-29 21:35:21 +0200 (Thu, 29 May 2008) | 33 lines Changed paths: M /trunk/subversion/libsvn_delta/depth_filter_editor.c M /trunk/subversion/tests/cmdline/depth_tests.py When using the depth filter editor to filter out entries that are deeper than requested, make sure not to filter out a file which is the target of a depth-empty edit; otherwise the working copy will be corrupted when the target's revision is updated but nothing else is changed. (This bit of code is run when doing an update --depth=empty against a 1.4.x or older server, which interprets recurse=False like depth-files.) See this message and the thread around it for more discussion: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=139512 From: Karl Fogel To: dev@subversion.tigris.org Subject: Re: Possible data corruption issue? Date: Sat, 31 May 2008 19:41:17 -0400 Message-ID: <87k5ha3uua.fsf@red-bean.com> (Note that the Subject changes in mid-thread.) * subversion/libsvn_delta/depth_filter_editor.c (okay_to_edit): Don't special-case directories when figuring out whether or not to filter with requested depth empty. * subversion/tests/cmdline/depth_tests.py (depth_empty_update_on_file): New test (which, without the code patch, fails against 1.4.x servers). (test_list): Add new test. Review by: cmpilato kfogel ------------------------------------------------------------------------ r31517 | nori | 2008-05-29 21:43:44 +0200 (Thu, 29 May 2008) | 5 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/subversion/po/ja.po Japanese translation in the 1.5.x branch updates. * subversion/po/ja.po: Merge update of ja.po in the trunk tree at r31399-31401, r31451-31453, and r31473-31475. ------------------------------------------------------------------------ r31518 | glasser | 2008-05-29 21:47:41 +0200 (Thu, 29 May 2008) | 1 line Changed paths: A /branches/1.5.x-r31516 (from /branches/1.5.x:31517) Backport branch. ------------------------------------------------------------------------ r31519 | glasser | 2008-05-29 21:48:51 +0200 (Thu, 29 May 2008) | 3 lines Changed paths: M /branches/1.5.x-r31516 M /branches/1.5.x-r31516/CHANGES M /branches/1.5.x-r31516/COMMITTERS M /branches/1.5.x-r31516/STATUS M /branches/1.5.x-r31516/subversion/bindings/swig M /branches/1.5.x-r31516/subversion/libsvn_delta/depth_filter_editor.c M /branches/1.5.x-r31516/subversion/tests/cmdline/depth_tests.py Backport r31516 in the vague direction of 1.5.x, fixing a conflict in depth_tests.py. ------------------------------------------------------------------------ r31520 | glasser | 2008-05-29 21:50:42 +0200 (Thu, 29 May 2008) | 4 lines Changed paths: M /branches/1.5.x-r31516/STATUS Followup to r31519: Oops, don't change STATUS on the backport branch. ------------------------------------------------------------------------ r31521 | glasser | 2008-05-29 21:51:41 +0200 (Thu, 29 May 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Nominate r31516 for backport to 1.5.x. ------------------------------------------------------------------------ r31522 | lgo | 2008-05-29 21:53:53 +0200 (Thu, 29 May 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_subr/cmdline.c Follow up r31515: Fix the build on Windows (C89 compiler). * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): Move some variable declarations to the first lines of the block. ------------------------------------------------------------------------ r31523 | nori | 2008-05-29 22:01:35 +0200 (Thu, 29 May 2008) | 5 lines Changed paths: M /trunk/subversion/po/ja.po Japanese translation updates. * subversion/po/ja.po: Add 1 message needed at the latest revisions in the 1.5.x branch. ------------------------------------------------------------------------ r31524 | nori | 2008-05-29 22:04:40 +0200 (Thu, 29 May 2008) | 4 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/subversion/po/ja.po Japanese translation in the 1.5.x branch updates. * subversion/po/ja.po: Merge update of ja.po in the trunk tree at r31523. ------------------------------------------------------------------------ r31525 | glasser | 2008-05-29 22:10:43 +0200 (Thu, 29 May 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_ra_svn/client.c Don't ignore errors setting up the depth filter editor in ra_svn. * subversion/libsvn_ra_svn/client.c (ra_svn_get_reporter): Change to returning svn_error_t. Call svn_delta_depth_filter_editor with SVN_ERR. (ra_svn_update, ra_svn_switch, ra_svn_status, ra_svn_diff): Call ra_svn_get_reporter with SVN_ERR. ------------------------------------------------------------------------ r31526 | glasser | 2008-05-29 22:13:58 +0200 (Thu, 29 May 2008) | 12 lines Changed paths: M /trunk/notes/dump-load-format.txt Consistently omit leading '/' characters in node paths. The specification was previously inconsistent on whether node paths should include a leading '/' character. The output of "svnadmin dump" omits the characters, so change the file to consistently use that convention. * notes/dump-load-format.txt Remove leading '/' characters that appear in node paths. Patch by: Michael Haggerty ------------------------------------------------------------------------ r31527 | arfrever | 2008-05-29 22:14:16 +0200 (Thu, 29 May 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_subr/config_file.c Follow-up to r31515: Update documentation. * subversion/libsvn_subr/config_file.c (svn_config_ensure): Update the default 'config' file. Suggested by: glasser ------------------------------------------------------------------------ r31528 | nori | 2008-05-29 22:19:04 +0200 (Thu, 29 May 2008) | 8 lines Changed paths: M /branches/1.5.x/subversion/po/ja.po Japanese translation in the 1.5.x branch updates. * subversion/po/ja.po: Manually correct wrong translations introduced at r31490 and r31495. These translations are based on translations for "incomplete messages" in the 1.5.x branch at that time, but I have proofread corresponding translations in the trunk... Anyway, thanks to jensseidel for merging fixes to those "incomplete messages". ;-) ------------------------------------------------------------------------ r31529 | nori | 2008-05-29 22:23:48 +0200 (Thu, 29 May 2008) | 7 lines Changed paths: M /branches/1.5.x/subversion/po/ja.po Japanese translation in the 1.5.x branch updates, only by msgmerging. * subversion/po/ja.po: Update translation against r31528 only by running './tools/po/po-update.sh ja'. Now ja.po has 1802 translated messages against r31528 (Emacs PO-mode status: "1802t+536o"). ------------------------------------------------------------------------ r31530 | arfrever | 2008-05-29 22:25:39 +0200 (Thu, 29 May 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_subr/config_file.c Follow-up to r31527: * subversion/libsvn_subr/config_file.c (svn_config_ensure): Fix indentation in the default 'config' file. ------------------------------------------------------------------------ r31531 | danielsh | 2008-05-29 22:42:08 +0200 (Thu, 29 May 2008) | 3 lines Changed paths: M /trunk/notes/dump-load-format.txt Follow-up to r31526: * notes/dump-load-format.txt: Fix typo, s/HNode-kind/Node-kind/. ------------------------------------------------------------------------ r31532 | danielsh | 2008-05-30 00:27:01 +0200 (Fri, 30 May 2008) | 1 line Changed paths: M /trunk/www/hacking.html * www/hacking.html (log-messages): Link to the svn@ commits list archive. ------------------------------------------------------------------------ r31533 | arfrever | 2008-05-30 15:46:40 +0200 (Fri, 30 May 2008) | 5 lines Changed paths: M /trunk/subversion/svn/main.c * subversion/svn/main.c (svn_cl__cmd_table."log"): Fix description of the '-c' option. Found by: jensseidel ------------------------------------------------------------------------ r31534 | nori | 2008-05-30 16:04:45 +0200 (Fri, 30 May 2008) | 2 lines Changed paths: M /trunk/subversion/po/ja.po * subversion/po/ja.po: Bump the copyright year. ------------------------------------------------------------------------ r31535 | nori | 2008-05-30 16:08:02 +0200 (Fri, 30 May 2008) | 2 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/subversion/po/ja.po * subversion/po/ja.po: Merge r31534, only bumping the copyright year. ------------------------------------------------------------------------ r31536 | lgo | 2008-05-30 16:33:05 +0200 (Fri, 30 May 2008) | 5 lines Changed paths: M /trunk/notes/obliterate/obliterate-functional-spec.txt * notes/obliterate/obliterate-functional-spec.txt Add requirement for logging expected obliterated paths to console. Add requirement for selecting a modification on a file or directory. Fill in sections on obliteration of modifications. ------------------------------------------------------------------------ r31537 | lgo | 2008-05-30 20:12:29 +0200 (Fri, 30 May 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/update.c ra_serf: Avoid abort on 403 Forbidden error. * subversion/libsvn_ra_serf/update.c (finish_report): Provide a memory location to store the status code when an error message is found in a response. In this case, the server might return a 403 Forbidden error on a request when mod_dontdothat is in use. ------------------------------------------------------------------------ r31538 | stsp | 2008-05-30 21:21:27 +0200 (Fri, 30 May 2008) | 8 lines Changed paths: M /trunk/www/hacking.html * www/hacking.html (Commit access): Kindly ask people to explicitly mention in their commit messages when they apply the "obvious fix" rule. Review by: danielsh jerenkrantz cmpilato ------------------------------------------------------------------------ r31539 | arfrever | 2008-05-30 21:42:26 +0200 (Fri, 30 May 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Code simplification in libsvn_auth_kwallet. * subversion/libsvn_auth_kwallet/kwallet.cpp (): Don't include . (kwallet_password_get, kwallet_password_set): Use -1 as WId. ------------------------------------------------------------------------ r31540 | lgo | 2008-05-30 22:55:22 +0200 (Fri, 30 May 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Follow up 31533: changing svn's help output means changing expected output of the getopt tests. * subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Updated expected output on -c option. ------------------------------------------------------------------------ r31541 | danielsh | 2008-05-31 17:24:50 +0200 (Sat, 31 May 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Follow-up to r31427: * subversion/libsvn_auth_kwallet/kwallet.cpp (kwallet_password_get, kwallet_password_set): Add comment explaining why disconnectApplication() is commented out. Patch by: stsp me Review by: arfrever ------------------------------------------------------------------------ r31542 | arfrever | 2008-05-31 17:34:58 +0200 (Sat, 31 May 2008) | 15 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp M /trunk/subversion/libsvn_subr/cmdline.c Don't ignore errors when loading libsvn_auth_*. * subversion/libsvn_subr/cmdline.c (get_auth_simple_provider): * subversion/bindings/javahl/native/SVNClient.cpp (get_auth_simple_provider): Change returned type to 'svn_error_t *' and don't ignore any errors. * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::getContext): Update calls to get_auth_simple_provider(). Suggested by: philip ------------------------------------------------------------------------ r31543 | arfrever | 2008-05-31 17:46:41 +0200 (Sat, 31 May 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_subr/cmdline.c Follow-up to r31515: * subversion/libsvn_subr/cmdline.c (svn_cmdline_setup_auth_baton): Fix indentation. Found by: stylesen ------------------------------------------------------------------------ r31544 | danielsh | 2008-05-31 20:14:57 +0200 (Sat, 31 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31485 and r30915. ------------------------------------------------------------------------ r31545 | danielsh | 2008-05-31 20:17:47 +0200 (Sat, 31 May 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Move approved-for-1.5.1 changes to their own section. ------------------------------------------------------------------------ r31546 | clkao | 2008-06-01 04:06:50 +0200 (Sun, 01 Jun 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/swig/perl/native/t/6ra.t Binding test fixes for Perl 5.10. * subversion/bindings/swig/perl/native/t/6ra.t Fix the test for Perl 5.10, which doesn't like in-memory filehandle opened with a reference variable. ------------------------------------------------------------------------ r31547 | niqueco | 2008-06-01 06:16:19 +0200 (Sun, 01 Jun 2008) | 5 lines Changed paths: M /trunk/subversion/po/es.po Spanish translation updated. * subversion/po/es.po: Some translation updates. ------------------------------------------------------------------------ r31548 | niqueco | 2008-06-01 06:27:17 +0200 (Sun, 01 Jun 2008) | 5 lines Changed paths: M /branches/1.5.x/subversion/po/es.po Spanish translation updated. * subversion/po/es.po: Merged translation updates from trunk. ------------------------------------------------------------------------ r31549 | lgo | 2008-06-01 09:05:28 +0200 (Sun, 01 Jun 2008) | 8 lines Changed paths: M /trunk/subversion/tests/libsvn_subr/target-test.c Add a very clear comment about what the file target-tests.c, which may look like a C test, really is. Patch by: Neels Janosch Hofmeyr * subversion/tests/libsvn_subr/target-test.c: Add comment describing the function of this file. ------------------------------------------------------------------------ r31550 | lgo | 2008-06-01 11:04:44 +0200 (Sun, 01 Jun 2008) | 13 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/ra_serf.h M /trunk/subversion/libsvn_ra_serf/serf.c M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: When querying the base properties from the repository, read and cache the uuid in the session. * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__get_uuid): Fetch the base props from the repository to find the uuid. Once cached in the session, return the uuid directly from the cache. * subversion/libsvn_ra_serf/util.c (svn_ra_serf__discover_root): Cache the repository uuid in the session. * subversion/libsvn_ra_serf/ra_serf.h (struct svn_ra_serf__session_t): Add uuid variable. ------------------------------------------------------------------------ r31551 | lgo | 2008-06-01 11:35:07 +0200 (Sun, 01 Jun 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/serf.c ra_serf: Fix the requested depth when fetching directory info. To get the properties we need depth 0, to get the directory entries we need depth 1. This reverts r31478 which tried to fix the original issue introduced in r31375 but in fact made matters worse. * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__get_dir): Use the right depth at the right place. ------------------------------------------------------------------------ r31552 | lgo | 2008-06-01 11:50:29 +0200 (Sun, 01 Jun 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/commit.c ra_serf: Correctly clear a server error if it's already reported based on the status code. * subversion/libsvn_ra_serf/commit.c (checkout_dir): Clear server error. ------------------------------------------------------------------------ r31553 | firemeteor | 2008-06-01 17:09:55 +0200 (Sun, 01 Jun 2008) | 12 lines Changed paths: M /branches/issue-2843-dev/subversion/include/svn_wc.h A /branches/issue-2843-dev/subversion/libsvn_wc/crop.c On the issue-2843-dev branch: Initial implementation of the cropping logic. No notification is generated yet. * subversion/libsvn_wc/crop.c: New file. (svn_wc_crop_tree): New public function. (crop_children): New internal helper. * subversion/include/svn_wc.h (svn_wc_crop_tree): New function. ------------------------------------------------------------------------ r31554 | arfrever | 2008-06-01 20:21:46 +0200 (Sun, 01 Jun 2008) | 4 lines Changed paths: M /trunk/subversion/po/pl.po Polish translation update. * subversion/po/pl.po: Polish translation update. ------------------------------------------------------------------------ r31555 | blair | 2008-06-02 08:15:22 +0200 (Mon, 02 Jun 2008) | 5 lines Changed paths: M /branches/file-externals M /branches/file-externals/CHANGES M /branches/file-externals/COMMITTERS M /branches/file-externals/Makefile.in M /branches/file-externals/TRANSLATING M /branches/file-externals/aclocal.m4 M /branches/file-externals/build/ac-macros/apache.m4 A /branches/file-externals/build/ac-macros/apr_memcache.m4 (from /trunk/build/ac-macros/apr_memcache.m4:31554) M /branches/file-externals/build/generator/ezt.py M /branches/file-externals/build/generator/gen_base.py M /branches/file-externals/build/run_tests.py M /branches/file-externals/build.conf M /branches/file-externals/configure.ac A /branches/file-externals/contrib/hook-scripts/svn-keyword-check.pl (from /trunk/contrib/hook-scripts/svn-keyword-check.pl:31554) M /branches/file-externals/gen-make.py M /branches/file-externals/notes/commit-access-templates/contrib-committer.tmpl M /branches/file-externals/notes/commit-access-templates/full-committer.tmpl M /branches/file-externals/notes/commit-access-templates/partial-committer.tmpl M /branches/file-externals/notes/dump-load-format.txt A /branches/file-externals/notes/obliterate (from /trunk/notes/obliterate:31554) R /branches/file-externals/notes/obliterate/obliterate-functional-spec.txt (from /trunk/notes/obliterate/obliterate-functional-spec.txt:31554) D /branches/file-externals/notes/reintegrate-todo.txt A /branches/file-externals/notes/tree-conflicts/design-overview.txt (from /trunk/notes/tree-conflicts/design-overview.txt:31554) D /branches/file-externals/notes/tree-conflicts/policy.txt A /branches/file-externals/notes/tree-conflicts/requirements.txt (from /trunk/notes/tree-conflicts/requirements.txt:31554) D /branches/file-externals/notes/tree-conflicts/testing.txt M /branches/file-externals/packages/python-windows/setup.py M /branches/file-externals/subversion/bindings/javahl/native/LogMessageCallback.cpp M /branches/file-externals/subversion/bindings/javahl/native/Prompter.cpp M /branches/file-externals/subversion/bindings/javahl/native/ProplistCallback.h A /branches/file-externals/subversion/bindings/javahl/native/RevpropTable.cpp (from /trunk/subversion/bindings/javahl/native/RevpropTable.cpp:31554) A /branches/file-externals/subversion/bindings/javahl/native/RevpropTable.h (from /trunk/subversion/bindings/javahl/native/RevpropTable.h:31554) M /branches/file-externals/subversion/bindings/javahl/native/SVNClient.cpp M /branches/file-externals/subversion/bindings/javahl/native/SVNClient.h M /branches/file-externals/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp A /branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java:31554) M /branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java M /branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /branches/file-externals/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /branches/file-externals/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/file-externals/subversion/bindings/swig/core.i M /branches/file-externals/subversion/bindings/swig/perl/native/t/6ra.t M /branches/file-externals/subversion/bindings/swig/python/tests/client.py M /branches/file-externals/subversion/bindings/swig/python/tests/mergeinfo.py M /branches/file-externals/subversion/bindings/swig/python/tests/trac/test.py M /branches/file-externals/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py M /branches/file-externals/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c M /branches/file-externals/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h M /branches/file-externals/subversion/bindings/swig/ruby/svn/client.rb M /branches/file-externals/subversion/bindings/swig/ruby/svn/core.rb M /branches/file-externals/subversion/bindings/swig/ruby/test/test_client.rb M /branches/file-externals/subversion/bindings/swig/ruby/test/test_core.rb M /branches/file-externals/subversion/bindings/swig/svn_client.i A /branches/file-externals/subversion/include/private/svn_auth_private.h (from /trunk/subversion/include/private/svn_auth_private.h:31554) M /branches/file-externals/subversion/include/private/svn_opt_private.h M /branches/file-externals/subversion/include/svn_auth.h A /branches/file-externals/subversion/include/svn_auth_dso.h (from /trunk/subversion/include/svn_auth_dso.h:31554) M /branches/file-externals/subversion/include/svn_base64.h A /branches/file-externals/subversion/include/svn_cache.h (from /trunk/subversion/include/svn_cache.h:31554) M /branches/file-externals/subversion/include/svn_client.h M /branches/file-externals/subversion/include/svn_config.h M /branches/file-externals/subversion/include/svn_error_codes.h M /branches/file-externals/subversion/include/svn_io.h M /branches/file-externals/subversion/include/svn_mergeinfo.h M /branches/file-externals/subversion/include/svn_opt.h M /branches/file-externals/subversion/include/svn_path.h M /branches/file-externals/subversion/include/svn_props.h M /branches/file-externals/subversion/include/svn_repos.h M /branches/file-externals/subversion/include/svn_wc.h A /branches/file-externals/subversion/libsvn_auth_gnome_keyring (from /trunk/subversion/libsvn_auth_gnome_keyring:31554) R /branches/file-externals/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (from /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c:31554) A /branches/file-externals/subversion/libsvn_auth_kwallet (from /trunk/subversion/libsvn_auth_kwallet:31554) R /branches/file-externals/subversion/libsvn_auth_kwallet/kwallet.cpp (from /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp:31554) M /branches/file-externals/subversion/libsvn_client/add.c M /branches/file-externals/subversion/libsvn_client/changelist.c M /branches/file-externals/subversion/libsvn_client/client.h M /branches/file-externals/subversion/libsvn_client/cmdline.c M /branches/file-externals/subversion/libsvn_client/commit.c M /branches/file-externals/subversion/libsvn_client/commit_util.c M /branches/file-externals/subversion/libsvn_client/copy.c M /branches/file-externals/subversion/libsvn_client/delete.c M /branches/file-externals/subversion/libsvn_client/externals.c M /branches/file-externals/subversion/libsvn_client/merge.c M /branches/file-externals/subversion/libsvn_client/prop_commands.c M /branches/file-externals/subversion/libsvn_client/ra.c M /branches/file-externals/subversion/libsvn_client/resolved.c M /branches/file-externals/subversion/libsvn_client/revert.c M /branches/file-externals/subversion/libsvn_delta/depth_filter_editor.c A /branches/file-externals/subversion/libsvn_fs_fs/caching.c (from /trunk/subversion/libsvn_fs_fs/caching.c:31554) M /branches/file-externals/subversion/libsvn_fs_fs/dag.c M /branches/file-externals/subversion/libsvn_fs_fs/dag.h M /branches/file-externals/subversion/libsvn_fs_fs/fs.c M /branches/file-externals/subversion/libsvn_fs_fs/fs.h M /branches/file-externals/subversion/libsvn_fs_fs/fs_fs.c M /branches/file-externals/subversion/libsvn_fs_fs/fs_fs.h M /branches/file-externals/subversion/libsvn_fs_fs/structure M /branches/file-externals/subversion/libsvn_fs_fs/tree.c M /branches/file-externals/subversion/libsvn_ra/ra_loader.c M /branches/file-externals/subversion/libsvn_ra_local/ra_plugin.c M /branches/file-externals/subversion/libsvn_ra_neon/commit.c M /branches/file-externals/subversion/libsvn_ra_neon/get_locks.c M /branches/file-externals/subversion/libsvn_ra_neon/props.c M /branches/file-externals/subversion/libsvn_ra_neon/session.c M /branches/file-externals/subversion/libsvn_ra_neon/util.c M /branches/file-externals/subversion/libsvn_ra_serf/auth.c M /branches/file-externals/subversion/libsvn_ra_serf/blame.c M /branches/file-externals/subversion/libsvn_ra_serf/commit.c M /branches/file-externals/subversion/libsvn_ra_serf/getlocations.c M /branches/file-externals/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/file-externals/subversion/libsvn_ra_serf/mergeinfo.c M /branches/file-externals/subversion/libsvn_ra_serf/property.c M /branches/file-externals/subversion/libsvn_ra_serf/ra_serf.h M /branches/file-externals/subversion/libsvn_ra_serf/serf.c M /branches/file-externals/subversion/libsvn_ra_serf/update.c M /branches/file-externals/subversion/libsvn_ra_serf/util.c M /branches/file-externals/subversion/libsvn_ra_svn/client.c M /branches/file-externals/subversion/libsvn_repos/fs-wrap.c A /branches/file-externals/subversion/libsvn_subr/cache-inprocess.c (from /trunk/subversion/libsvn_subr/cache-inprocess.c:31554) A /branches/file-externals/subversion/libsvn_subr/cache-memcache.c (from /trunk/subversion/libsvn_subr/cache-memcache.c:31554) A /branches/file-externals/subversion/libsvn_subr/cache.c (from /trunk/subversion/libsvn_subr/cache.c:31554) A /branches/file-externals/subversion/libsvn_subr/cache.h (from /trunk/subversion/libsvn_subr/cache.h:31554) M /branches/file-externals/subversion/libsvn_subr/cmdline.c M /branches/file-externals/subversion/libsvn_subr/config_file.c M /branches/file-externals/subversion/libsvn_subr/mergeinfo.c M /branches/file-externals/subversion/libsvn_subr/opt.c M /branches/file-externals/subversion/libsvn_subr/properties.c M /branches/file-externals/subversion/libsvn_subr/simple_providers.c M /branches/file-externals/subversion/libsvn_subr/ssl_server_trust_providers.c M /branches/file-externals/subversion/libsvn_subr/stream.c M /branches/file-externals/subversion/libsvn_subr/svn_base64.c M /branches/file-externals/subversion/libsvn_subr/time.c M /branches/file-externals/subversion/libsvn_wc/adm_ops.c M /branches/file-externals/subversion/libsvn_wc/props.c M /branches/file-externals/subversion/libsvn_wc/update_editor.c M /branches/file-externals/subversion/libsvn_wc/util.c M /branches/file-externals/subversion/po/de.po M /branches/file-externals/subversion/po/es.po M /branches/file-externals/subversion/po/fr.po M /branches/file-externals/subversion/po/it.po M /branches/file-externals/subversion/po/ja.po M /branches/file-externals/subversion/po/ko.po M /branches/file-externals/subversion/po/nb.po M /branches/file-externals/subversion/po/pl.po M /branches/file-externals/subversion/po/pt_BR.po M /branches/file-externals/subversion/po/sv.po M /branches/file-externals/subversion/po/zh_CN.po M /branches/file-externals/subversion/po/zh_TW.po M /branches/file-externals/subversion/svn/blame-cmd.c M /branches/file-externals/subversion/svn/cl.h M /branches/file-externals/subversion/svn/commit-cmd.c M /branches/file-externals/subversion/svn/conflict-callbacks.c M /branches/file-externals/subversion/svn/copy-cmd.c M /branches/file-externals/subversion/svn/delete-cmd.c M /branches/file-externals/subversion/svn/import-cmd.c M /branches/file-externals/subversion/svn/info-cmd.c M /branches/file-externals/subversion/svn/log-cmd.c M /branches/file-externals/subversion/svn/main.c M /branches/file-externals/subversion/svn/mkdir-cmd.c M /branches/file-externals/subversion/svn/move-cmd.c M /branches/file-externals/subversion/svn/notify.c M /branches/file-externals/subversion/svn/propdel-cmd.c M /branches/file-externals/subversion/svn/propedit-cmd.c M /branches/file-externals/subversion/svn/propset-cmd.c M /branches/file-externals/subversion/svn/util.c M /branches/file-externals/subversion/svnserve/serve.c M /branches/file-externals/subversion/tests/cmdline/basic_tests.py M /branches/file-externals/subversion/tests/cmdline/commit_tests.py M /branches/file-externals/subversion/tests/cmdline/copy_tests.py M /branches/file-externals/subversion/tests/cmdline/depth_tests.py M /branches/file-externals/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout M /branches/file-externals/subversion/tests/cmdline/merge_tests.py M /branches/file-externals/subversion/tests/cmdline/prop_tests.py M /branches/file-externals/subversion/tests/cmdline/svndumpfilter_tests.py M /branches/file-externals/subversion/tests/cmdline/svntest/actions.py M /branches/file-externals/subversion/tests/cmdline/svntest/main.py M /branches/file-externals/subversion/tests/cmdline/svntest/testcase.py M /branches/file-externals/subversion/tests/cmdline/switch_tests.py M /branches/file-externals/subversion/tests/libsvn_fs/fs-test.c M /branches/file-externals/subversion/tests/libsvn_fs/locks-test.c M /branches/file-externals/subversion/tests/libsvn_fs_base/changes-test.c M /branches/file-externals/subversion/tests/libsvn_fs_base/fs-base-test.c M /branches/file-externals/subversion/tests/libsvn_fs_base/strings-reps-test.c M /branches/file-externals/subversion/tests/libsvn_ra_local/ra-local-test.c M /branches/file-externals/subversion/tests/libsvn_repos/repos-test.c M /branches/file-externals/subversion/tests/libsvn_subr A /branches/file-externals/subversion/tests/libsvn_subr/cache-test.c (from /trunk/subversion/tests/libsvn_subr/cache-test.c:31554) M /branches/file-externals/subversion/tests/libsvn_subr/target-test.c M /branches/file-externals/subversion/tests/svn_test.h M /branches/file-externals/subversion/tests/svn_test_fs.c M /branches/file-externals/subversion/tests/svn_test_fs.h M /branches/file-externals/subversion/tests/svn_test_main.c A /branches/file-externals/subversion/tests/tests.conf (from /trunk/subversion/tests/tests.conf:31554) M /branches/file-externals/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh M /branches/file-externals/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh M /branches/file-externals/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh M /branches/file-externals/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh M /branches/file-externals/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh M /branches/file-externals/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh M /branches/file-externals/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh M /branches/file-externals/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh M /branches/file-externals/tools/dev/contribulyze.py M /branches/file-externals/tools/hook-scripts/verify-po.py M /branches/file-externals/tools/po/l10n-report.py M /branches/file-externals/tools/server-side/svn_server_log_parse.py M /branches/file-externals/tools/server-side/test_svn_server_log_parse.py M /branches/file-externals/win-tests.py M /branches/file-externals/www/hacking.html M /branches/file-externals/www/links.html M /branches/file-externals/www/project_issues.html M /branches/file-externals/www/svn_1.5_releasenotes.html In the file externals branch. * branches/file-externals: Merge r31188 through r31554. ------------------------------------------------------------------------ r31556 | kameshj | 2008-06-02 11:15:23 +0200 (Mon, 02 Jun 2008) | 7 lines Changed paths: M /branches/tree-conflicts/subversion/svn/info-cmd.c Fix compiler warning of "implicit declaration of function `svn_cl__append_tree_conflict_info_xml' and 'svn_cl__append_human_readable_tree_conflict_description'". * subversion/svn/info-cmd.c (): include tree-conflicts.h ------------------------------------------------------------------------ r31557 | lgo | 2008-06-02 17:13:29 +0200 (Mon, 02 Jun 2008) | 4 lines Changed paths: M /trunk/notes/obliterate/obliterate-functional-spec.txt * subversion/trunk/notes/obliterate/obliterate-functional-spec.txt Add primary actor for each requirement. Some indentation fixes. ------------------------------------------------------------------------ r31558 | kfogel | 2008-06-02 23:02:19 +0200 (Mon, 02 Jun 2008) | 8 lines Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (mt-known-limitations): New section, documenting merge tracking's Issue #3157 problem. (mt-reintegrate): New anchor, for above to link back to. Patch by: Marc Strapetz me ------------------------------------------------------------------------ r31559 | kfogel | 2008-06-02 23:38:44 +0200 (Mon, 02 Jun 2008) | 4 lines Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html: Fix some nesting and "" issues. Found by: danielsh ------------------------------------------------------------------------ r31560 | kfogel | 2008-06-03 04:16:03 +0200 (Tue, 03 Jun 2008) | 15 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/main.py Make various SVNKit-related fixes to the test suite. Patch by: Alexander Sinyushkin * subversion/tests/cmdline/svntest/main.py (use_jsvn): Make use_jsvn a global variable that reflects whether --use-jsvn was passed or not; do not set use_jsvn to False at the end of the 'if use_jsvn:' clause. (copy_repos): Close dump_in just after the first call to open_pipe(), since we don't use it after that. (run): If use_jsvn, set SVN_CURRENT_TEST environment variable to the test currently being run. (run_tests): If use_jsvn, make svndumpfilter_binary point to jsvndumpfilter binary . ------------------------------------------------------------------------ r31561 | cmpilato | 2008-06-03 15:30:23 +0200 (Tue, 03 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31516. ------------------------------------------------------------------------ r31562 | cmpilato | 2008-06-03 16:06:25 +0200 (Tue, 03 Jun 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_delta/depth_filter_editor.c Add some documentation for the depth-based filter editor logic. * subversion/libsvn_delta/depth_filter_editor.c (struct edit_baton, struct node_baton, okay_to_edit): Add docstrings and other commentary to help future readers comprehend this stuff. ------------------------------------------------------------------------ r31563 | kfogel | 2008-06-03 16:10:27 +0200 (Tue, 03 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Review and vote for r31516 and r31485. ------------------------------------------------------------------------ r31564 | cmpilato | 2008-06-03 16:12:40 +0200 (Tue, 03 Jun 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_client/changelist.c * subversion/libsvn_client/changelist.c (set_entry_changelist): Add docstring. ------------------------------------------------------------------------ r31565 | blair | 2008-06-03 16:20:36 +0200 (Tue, 03 Jun 2008) | 5 lines Changed paths: M /branches/file-externals M /branches/file-externals/notes/obliterate/obliterate-functional-spec.txt M /branches/file-externals/subversion/libsvn_client/changelist.c M /branches/file-externals/subversion/libsvn_delta/depth_filter_editor.c M /branches/file-externals/subversion/tests/cmdline/svntest/main.py M /branches/file-externals/www/svn_1.5_releasenotes.html In the file externals branch. * branches/file-externals: Merge r31555 through r31564. ------------------------------------------------------------------------ r31566 | kfogel | 2008-06-03 16:48:53 +0200 (Tue, 03 Jun 2008) | 3 lines Changed paths: M /trunk/www/hacking.html * www/hacking.html (Crediting): Clarify a naming convention. ------------------------------------------------------------------------ r31567 | hwright | 2008-06-03 17:04:34 +0200 (Tue, 03 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Move r31458, r31516 to Approved. ------------------------------------------------------------------------ r31568 | hwright | 2008-06-03 17:10:13 +0200 (Tue, 03 Jun 2008) | 12 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/libsvn_client/changelist.c Merge r31485 from trunk: * r31485 Don't allow 'svn cl --cl old-changelist new-changelist' to spam the screen with "Skipped" notifications for directories that (by virtue of being directories) aren't part of the old changelist. Notes: Trivial fix, but makes a *world* of difference in terms of output sanity. Votes: +1: cmpilato, danielsh, kfogel ------------------------------------------------------------------------ r31569 | firemeteor | 2008-06-03 17:21:44 +0200 (Tue, 03 Jun 2008) | 15 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_client/update.c M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c On the issue-2843-dev branch: Generate notifications in the cropping logic. And actually invoke the cropping logic in the update logic. Preliminary debug has made the cropping logic work to some degree. However, many tests fail unexpectedly. Further debugging is needed. * subversion/libsvn_wc/crop.c (svn_wc_crop_tree, crop_children): Generate notifications. Some adm_access related tunning to make it work. And some other bugs fixed. * subversion/libsvn_client/update.c (svn_client__update_internal): Lock enough depth and call svn_wc_crop_tree(). ------------------------------------------------------------------------ r31570 | hwright | 2008-06-03 18:32:16 +0200 (Tue, 03 Jun 2008) | 14 lines Changed paths: M /trunk/subversion/bindings/javahl/native/ProplistCallback.cpp M /trunk/tools/dev/graph-dav-servers.py M /trunk/www/images/svn-dav-securityspace-survey.png M /trunk/www/svn-dav-securityspace-survey.html Update the Security Space survey graph for the past few months. Even though the data isn't publicly available (they now charge a fee for access), Security Space has agreed to send us a monthly email with the numbers for mod_dav_svn. [Note: The accidental changes to ProplistCallback.cpp included in this commit were reverted in r31571.] * www/svn-dav-securityspace-survey.html, www/images/svn-dav-securityspace-survey.png, tools/dev/graph-dav-servers.py: Update image and table. ------------------------------------------------------------------------ r31571 | hwright | 2008-06-03 18:34:06 +0200 (Tue, 03 Jun 2008) | 3 lines Changed paths: M /trunk/subversion/bindings/javahl/native/ProplistCallback.cpp * subversion/bindings/javahl/native/ProplistCallback.cpp: Revert a change accidentally committed in r31570. ------------------------------------------------------------------------ r31572 | firemeteor | 2008-06-03 18:46:11 +0200 (Tue, 03 Jun 2008) | 7 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c On the issue-2843-dev branch: Fix a bug introduced in r31493. * subversion/libsvn_wc/update_editor.c (make_editor): Don't wrap the update editor if the depth is sticky. ------------------------------------------------------------------------ r31573 | firemeteor | 2008-06-03 20:47:07 +0200 (Tue, 03 Jun 2008) | 25 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c M /branches/issue-2843-dev/subversion/tests/cmdline/depth_tests.py On the issue-2843-dev branch: Fixes bugs in both the cropping logic and the test cases. Two test cases have been passed. Known problems: 1. The notification logic is not perfect yet, still leave the last test case as XFail(), even though it seems to have been passed. 2. If the target itself is also cropped, the update logic will bring it back later. Should we handle cropping AFTER update? * subversion/libsvn_wc/crop.c (crop_children): Do not return too early. * subversion/tests/cmdline/depth_tests.py (depth_folding_clean_tree_1, depth_fold_expand_clean_tree): Fix malformed expected_* informations. (depth_folding_clean_tree_2): Same. Also fill in the missed --set-depth option. (fold_tree_with_unversioned_modified_items): Same as the first. Also tune the expected output. (test_list): depth_folding_clean_tree_1 and depth_fold_expand_clean_tree are no longer XFail. ------------------------------------------------------------------------ r31574 | lgo | 2008-06-03 23:24:28 +0200 (Tue, 03 Jun 2008) | 4 lines Changed paths: M /trunk/notes/obliterate/obliterate-functional-spec.txt * subversion/trunk/notes/obliterate/obliterate-functional-spec.txt Make a better distinction between SELECT in space, and LIMIT in time. Move default limits description to the most relevant requirement. ------------------------------------------------------------------------ r31575 | pburba | 2008-06-03 23:43:06 +0200 (Tue, 03 Jun 2008) | 8 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py More tests for issue #3067 'subtrees that don't exist at the start or end of a merge range shouldn't break the merge'. * subversion/tests/cmdline/merge_tests.py (new_subtrees_should_not_break_merge): Expand test to cover more use cases. (subtree_source_missing_in_requested_range): New test. (test_list): Add subtree_source_missing_in_requested_range as XFail. ------------------------------------------------------------------------ r31576 | hwright | 2008-06-04 02:17:23 +0200 (Wed, 04 Jun 2008) | 14 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/libsvn_delta/depth_filter_editor.c M /branches/1.5.x/subversion/tests/cmdline/depth_tests.py Merge r31516 from the 1.5.x-r31516 branch: * r31516 Fix bug in "svn up --depth=empty FILE" against pre-1.5 servers. Notes: Technically not a regression since it requires using a new option, but causes potentially-undetectable working copy corruption. Has a test. Mild conflict in the test file (context), so see branch. Branch: 1.5.x-r31516 Votes: +1: glasser, cmpilato, kfogel ------------------------------------------------------------------------ r31577 | hwright | 2008-06-04 02:18:08 +0200 (Wed, 04 Jun 2008) | 2 lines Changed paths: D /branches/1.5.x-r31516 Remove 1.5.x-r31516 branch, merged to 1.5.x in r31576. ------------------------------------------------------------------------ r31578 | stsp | 2008-06-04 11:11:23 +0200 (Wed, 04 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Propose r29432 for backport. We should really have this in 1.5.0. ------------------------------------------------------------------------ r31579 | stsp | 2008-06-04 11:28:39 +0200 (Wed, 04 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Fix typo in notes for r29432. ------------------------------------------------------------------------ r31580 | firemeteor | 2008-06-04 13:50:10 +0200 (Wed, 04 Jun 2008) | 5 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c On the issue-2843-dev branch: * subversion/libsvn_wc/crop.c (crop_children): Update document comments. ------------------------------------------------------------------------ r31581 | blair | 2008-06-04 16:39:04 +0200 (Wed, 04 Jun 2008) | 5 lines Changed paths: M /branches/file-externals M /branches/file-externals/notes/obliterate/obliterate-functional-spec.txt M /branches/file-externals/subversion/tests/cmdline/merge_tests.py M /branches/file-externals/tools/dev/graph-dav-servers.py M /branches/file-externals/www/hacking.html M /branches/file-externals/www/images/svn-dav-securityspace-survey.png M /branches/file-externals/www/svn-dav-securityspace-survey.html In the file externals branch. * branches/file-externals: Merge r31565 through r31580. ------------------------------------------------------------------------ r31582 | kfogel | 2008-06-04 16:54:58 +0200 (Wed, 04 Jun 2008) | 6 lines Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (Known Limitations): Clarify difference between release branches (maintenance branches) and feature branches. Suggested by: Marc Strapetz ------------------------------------------------------------------------ r31583 | blair | 2008-06-04 17:01:31 +0200 (Wed, 04 Jun 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_wc/entries.c * subversion/libsvn_wc/entries.c: Style change. Replace all if (! strcmp(a, b)) with if (strcmp(a, b) == 0) ------------------------------------------------------------------------ r31584 | blair | 2008-06-04 17:06:36 +0200 (Wed, 04 Jun 2008) | 5 lines Changed paths: M /branches/file-externals M /branches/file-externals/subversion/libsvn_wc/entries.c M /branches/file-externals/www/svn_1.5_releasenotes.html In the file externals branch. * branches/file-externals: Merge r31581 through r31583 from trunk. ------------------------------------------------------------------------ r31585 | blair | 2008-06-04 17:13:25 +0200 (Wed, 04 Jun 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_wc/entries.c * subversion/libsvn_wc/entries.c (svn_wc__atts_to_entry): Correct indentation. ------------------------------------------------------------------------ r31586 | hwright | 2008-06-04 17:31:37 +0200 (Wed, 04 Jun 2008) | 1 line Changed paths: A /tags/1.5.0-rc9 (from /branches/1.5.x:31577) M /tags/1.5.0-rc9/subversion/include/svn_version.h Tagging 1.5.0-rc9 with svn_version.h matching tarball. ------------------------------------------------------------------------ r31587 | hwright | 2008-06-04 17:36:15 +0200 (Wed, 04 Jun 2008) | 6 lines Changed paths: M /trunk/www/svn-dav-securityspace-survey.html * www/svn-dav-securityspace-survey.html: Note that the survey data is no longer free, but that Security Space provides us with updated numbers anyway. Suggested by: kfogel ------------------------------------------------------------------------ r31588 | pburba | 2008-06-04 18:00:41 +0200 (Wed, 04 Jun 2008) | 9 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Fix XFailing merge_tests.py 90 'merge added subtree'. It still fails, but now fails for the "right" reason. This is the test for issue #1962. * subversion/tests/cmdline/merge_tests.py (merge_added_subtree): Since r28802 svntest.tree.compare_trees() takes a label as the first argument. ------------------------------------------------------------------------ r31589 | danielsh | 2008-06-04 19:06:48 +0200 (Wed, 04 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Approve r29432 (documentation fix) and vote for it. ------------------------------------------------------------------------ r31590 | cmpilato | 2008-06-04 19:23:35 +0200 (Wed, 04 Jun 2008) | 12 lines Changed paths: M /trunk/subversion/include/svn_ra.h M /trunk/subversion/include/svn_repos.h Tweak some log-related public API docstrings to document reality. Unfortunately, this reality does include a bit of a behavioral change made in 1.5.x. * subversion/include/svn_repos.h (svn_repos_get_logs4, svn_repos_get_logs3): Tweak docstrings to explain some previously ambiguous cases. * subversion/include/svn_ra.h (svn_ra_get_log2: Tweak docstrings to explain some previously ambiguous cases, and to describe a server incompatibility. ------------------------------------------------------------------------ r31591 | kfogel | 2008-06-04 20:34:42 +0200 (Wed, 04 Jun 2008) | 8 lines Changed paths: M /branches/issue-2843-dev/subversion/include/svn_wc.h M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c On the issue-2843-dev branch: * subversion/include/svn_wc.h (svn_wc_crop_tree): Documentation tweaks. * subversion/libsvn_wc/crop.c (svn_wc_crop_tree): Comment and formatting tweaks. ------------------------------------------------------------------------ r31592 | stsp | 2008-06-04 21:54:36 +0200 (Wed, 04 Jun 2008) | 8 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/INSTALL M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig On the 1.5.x branch, merge r29432 from trunk. * INSTALL: Mention support for Neon 0.28. * STATUS: Remove entry for r29432. Approved by: danielsh hwright ------------------------------------------------------------------------ r31593 | epg | 2008-06-05 02:26:30 +0200 (Thu, 05 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Nominate r31223 for 1.5.1. ------------------------------------------------------------------------ r31594 | pburba | 2008-06-05 05:57:47 +0200 (Thu, 05 Jun 2008) | 19 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Partial fix for issue #3067 'subtrees that don't exist at the start or end of a merge range shouldn't break the merge'. There is still more work to do on issue #3067, but this fixes a whole class of problems where the merge target needs only a subset of the revisions its subtrees need merged. * subversion/libsvn_client/merge.c (drive_merge_report_editor): Account for the fact that the merge target might only need a subset of the requested range and instead the target's subtree(s) need(s) the whole range. Rework the code that describes subtrees requiring different merge ranges, trying to make it clearer, a bit more concise, and also account for the fact that the merge target might have a dummy remaining range (which is semantically equivalent to no remaining ranges). * subversion/tests/cmdline/merge_tests.py (new_subtrees_should_not_break_merge): Remove XFail comment. (test_list): Remove XFail from new_subtrees_should_not_break_merge. ------------------------------------------------------------------------ r31595 | hwright | 2008-06-05 07:23:04 +0200 (Thu, 05 Jun 2008) | 10 lines Changed paths: M /trunk/tools/dist/write-announcement.py Check the version number we use to generate the release announcements, to prevent further fat finger mistakes, such as this one: http://svn.haxx.se/dev/archive-2008-06/0171.shtml Found by: Marcel Gosselin * tools/dist/write-announcement.py (main): Double check the version number before producing the announcement. ------------------------------------------------------------------------ r31596 | hwright | 2008-06-05 08:59:01 +0200 (Thu, 05 Jun 2008) | 10 lines Changed paths: A /trunk/tools/dist/getsigs.py Add a new script which essentially duplicates the functionality of getsigs.pl. Two reasons for doing this: * The rest of our infrastructure is in Python, so porting this seems to be an obvious step. * The current perl script doesn't understand signatures of varying lengths, and my perl-fu isn't good enough to teach it to. * tools/dist/getsigs.py: New. ------------------------------------------------------------------------ r31597 | stylesen | 2008-06-05 09:06:52 +0200 (Thu, 05 Jun 2008) | 5 lines Changed paths: M /trunk/tools/dist/getsigs.py Obvious fix. * tools/dist/getsigs.py (): s/you/your/ - Fix typo in comment. ------------------------------------------------------------------------ r31598 | stylesen | 2008-06-05 11:54:15 +0200 (Thu, 05 Jun 2008) | 5 lines Changed paths: M /trunk/notes/tree-conflicts/detection.txt * notes/tree-conflicts/detection.txt (): Clarify doc for record_only merges. Approved by: kameshj ------------------------------------------------------------------------ r31599 | stsp | 2008-06-05 13:36:45 +0200 (Thu, 05 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r31223. ------------------------------------------------------------------------ r31600 | jensseidel | 2008-06-05 15:20:09 +0200 (Thu, 05 Jun 2008) | 10 lines Changed paths: M /branches/1.5.x/subversion/po/de.po On the '1.5.x' branch: Workaround for fixed (language independent) indentation in German translation. * subversion/po/de.po: The code in svn_cl__conflict_handler doesn't respect that translations of "Select: " could have another length than 8 (the English one). That's why the indentation of "(h) help " was wrongly aligned in the conflict resolution menu. ------------------------------------------------------------------------ r31601 | pburba | 2008-06-05 16:29:01 +0200 (Thu, 05 Jun 2008) | 21 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Another partial fix for issue #3067 'subtrees that don't exist at the start or end of a merge range shouldn't break the merge'. There is still more work to do on issue #3067, but this fixes another class of problems where explicit natural history on subtrees wasn't removed during a reverse merge. * subversion/libsvn_client/merge.c (filter_natural_history_from_mergeinfo): Don't filter natural history when *removing* explicit mergeinfo during a reverse merge. First off, this function doesn't actually work correctly when the requested range is for a reverse merge (the revert range must be reversed for svn_rangelist_remove to work properly). But there is no need to fix that; at worse this has no effect, at best it removes explicit natural history from subtrees -- which can occur as described in issue #3157, see comments "B1" and "C2"in http://subversion.tigris.org/issues/show_bug.cgi?id=3157#desc8. * subversion/tests/cmdline/merge_tests.py (subtree_source_missing_in_requested_range): Remove XFail comment. (test_list): Remove XFail from subtree_source_missing_in_requested_range. ------------------------------------------------------------------------ r31602 | kfogel | 2008-06-05 18:26:44 +0200 (Thu, 05 Jun 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_repos/commit.c * subversion/libsvn_repos/commit.c (close_edit): Reorganize code flow to avoid error leaks, and to be more intuitive so it's less likely to leak errors in the future. Note that this diff looks bigger than it is, because it reverses the order of two conditional blocks. Found by: glasser ------------------------------------------------------------------------ r31603 | epg | 2008-06-05 21:59:49 +0200 (Thu, 05 Jun 2008) | 3 lines Changed paths: M /trunk/subversion/bindings/swig/core.i * subversion/bindings/swig/core.i Don't %ignore svn_path_is_url. ------------------------------------------------------------------------ r31604 | kfogel | 2008-06-05 23:03:39 +0200 (Thu, 05 Jun 2008) | 15 lines Changed paths: M /trunk/www/hacking.html * www/hacking.html (Other conventions): Remove the strcmp recommendation, as there is not agreement on it, and even those who favor it generally don't feel strongly enough about it to enforce it consistently. See this message and the thread around it for more context: http://subversion.tigris.org/servlets/ReadMsg?list=dev&&msgNo=139715 From: Karl Fogel To: Branko =?utf-8?Q?=C4=8Cibej?= Cc: dev@subversion.tigris.org Subject: Re: svn commit: r31583 - trunk/subversion/libsvn_wc Date: Thu, 05 Jun 2008 12:19:47 -0400 Message-ID: <87hcc73lcs.fsf@red-bean.com> ------------------------------------------------------------------------ r31605 | kfogel | 2008-06-05 23:49:04 +0200 (Thu, 05 Jun 2008) | 12 lines Changed paths: M /trunk/subversion/include/svn_repos.h M /trunk/subversion/libsvn_repos/commit.c Improve an API by allowing a callback to be null. Suggested by: Neels Janosch Hofmeyr * subversion/include/svn_repos.h (svn_repos_get_commit_editor5): Document that callback can be null. Also, fix up some obsolete documentation: the modern callback type takes a struct instead of separate parameters. * subversion/libsvn_repos/commit.c (close_edit): Test callback before calling. ------------------------------------------------------------------------ r31606 | epg | 2008-06-05 23:50:24 +0200 (Thu, 05 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Nominate r31603 for 1.5.1. ------------------------------------------------------------------------ r31607 | epg | 2008-06-05 23:53:58 +0200 (Thu, 05 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Vote for r31228. ------------------------------------------------------------------------ r31608 | kfogel | 2008-06-05 23:57:22 +0200 (Thu, 05 Jun 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_repos/commit.c * subversion/libsvn_repos/commit.c (close_edit): Formatting fixes only, following up to r17208 and r7408. If I'd thought of it, I would have fixed these in r31602, though. ------------------------------------------------------------------------ r31609 | blair | 2008-06-06 00:03:48 +0200 (Fri, 06 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Vote for r31603. ------------------------------------------------------------------------ r31610 | hwright | 2008-06-06 07:48:08 +0200 (Fri, 06 Jun 2008) | 3 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Fix formatting nit, and move r31603 to approved ('cause it's a bindings fix). ------------------------------------------------------------------------ r31611 | danielsh | 2008-06-06 14:38:31 +0200 (Fri, 06 Jun 2008) | 5 lines Changed paths: M /trunk/notes/svnsync.txt * notes/svnsync.txt: Add FAQ entry about relocating source repository for svnsync. Patch by: Liu Yubao (with thanks to Eric Brayet ) ------------------------------------------------------------------------ r31612 | cmpilato | 2008-06-06 14:58:18 +0200 (Fri, 06 Jun 2008) | 8 lines Changed paths: M /trunk/notes/fsfs * notes/fsfs Note that Subversion 1.5 doesn't suffer as badly from the many-files-in-one-dir problem. Patch by: jrepenning (Tweaked by me.) ------------------------------------------------------------------------ r31613 | blair | 2008-06-06 16:12:35 +0200 (Fri, 06 Jun 2008) | 5 lines Changed paths: M /branches/file-externals M /branches/file-externals/notes/fsfs M /branches/file-externals/notes/svnsync.txt M /branches/file-externals/notes/tree-conflicts/detection.txt M /branches/file-externals/subversion/bindings/swig/core.i M /branches/file-externals/subversion/include/svn_ra.h M /branches/file-externals/subversion/include/svn_repos.h M /branches/file-externals/subversion/libsvn_client/merge.c M /branches/file-externals/subversion/libsvn_repos/commit.c M /branches/file-externals/subversion/libsvn_wc/entries.c M /branches/file-externals/subversion/tests/cmdline/merge_tests.py A /branches/file-externals/tools/dist/getsigs.py (from /trunk/tools/dist/getsigs.py:31612) M /branches/file-externals/tools/dist/write-announcement.py M /branches/file-externals/www/hacking.html M /branches/file-externals/www/svn-dav-securityspace-survey.html In the file externals branch. * branches/file-externals: Merge r31584 through r31612 from trunk. ------------------------------------------------------------------------ r31614 | kfogel | 2008-06-06 20:28:03 +0200 (Fri, 06 Jun 2008) | 26 lines Changed paths: A /trunk/subversion/include/private/svn_utf_private.h M /trunk/subversion/include/svn_repos.h M /trunk/subversion/libsvn_repos/fs-wrap.c M /trunk/subversion/libsvn_subr/utf_impl.h M /trunk/subversion/tests/libsvn_repos/repos-test.c Fix issue #1796: prevent invalid log messages from entering the repository. Although our client does not send invalid messages, a defective or malicious client could, thus corrupting the repository metadata. Patch by: Neels Janosch Hofmeyr (Tweaked by me; previous iterations reviewed by danielsh.) * subversion/include/private/svn_utf_private.h: New file. (svn_utf__is_valid): Moved here from libsvn_subr/utf_impl.h, because needed in libsvn_repos. * subversion/libsvn_subr/utf_impl.h: Include private/svn_utf_private.h. (svn_utf__is_valid): Moved to svn_utf_private.h. (svn_utf__last_valid): Add comment mentioning svn_utf__is_valid. * subversion/libsvn_repos/fs-wrap.c (validate_prop): Validate log messages. * subversion/include/svn_repos.h (svn_repos_fs_change_node_prop): Document validation behavior. * subversion/tests/libsvn_repos/repos-test.c (prop_validation_commit_with_revprop): New helper function. (prop_validation): New test. (test_funcs): Run it. ------------------------------------------------------------------------ r31615 | kfogel | 2008-06-06 20:48:37 +0200 (Fri, 06 Jun 2008) | 7 lines Changed paths: M /trunk/subversion/include/svn_repos.h Documentation fix, following up to r31605. Suggested by: glasser * subversion/include/svn_repos.h (svn_repos_get_commit_editor5): Note that callback used to be required. ------------------------------------------------------------------------ r31616 | pburba | 2008-06-06 21:34:43 +0200 (Fri, 06 Jun 2008) | 5 lines Changed paths: M /trunk/build.conf Follow-up to r31614, the fix for issue #1796. Fix windows build. * build.conf (libsvn_subr): Add private\svn_utf_private.h to msvc-export list. ------------------------------------------------------------------------ r31617 | kfogel | 2008-06-06 21:35:43 +0200 (Fri, 06 Jun 2008) | 3 lines Changed paths: M /trunk/www/svn_1.5_releasenotes.html * www/svn_1.5_releasenotes.html (Depth overview): Grammar fix. ------------------------------------------------------------------------ r31618 | danielsh | 2008-06-07 08:35:27 +0200 (Sat, 07 Jun 2008) | 6 lines Changed paths: M /trunk/notes/svnsync.txt Grammar fix, following up to r31611. Found by: Liu Yubao (The bug itself is my fault.) * notes/svnsync.txt: s/Don't not/Don't/. ------------------------------------------------------------------------ r31619 | lgo | 2008-06-07 11:03:06 +0200 (Sat, 07 Jun 2008) | 13 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/auth.c ra_serf: fix TSVN crash where the authentication prompt is canceled, and another crash when the user provides 3 times an incorrect user/password at the prompt. * subversion/libsvn_ra_serf/auth.c (handle_basic_auth): cache the last error, raise it when we tried all authorization methods. (svn_ra_serf__handle_auth): fix apr_strtok call to use the next header to avoind endless looping over the same authz header. Check auth_state to decide whether to use svn_auth_first_credentials. A previous call might not have set auth_state, eg. when the user canceled the username prompt in TortoiseSVN. This avoids a stacktrace in svn_auth_next_credentials. ------------------------------------------------------------------------ r31620 | stsp | 2008-06-07 12:36:30 +0200 (Sat, 07 Jun 2008) | 13 lines Changed paths: M /trunk/subversion/libsvn_repos/hooks.c * subversion/libsvn_repos/hooks.c (svn_repos__hooks_start_commit): Don't blindly assume that the capabilities parameter is non-NULL. It is NULL if the client does not bother to call svn_repos_remember_client_capabilities(), which does not seem to be required. Also, the private API doc for svn_repos_t says it can be NULL. Patch by: clkao (log message tweaked by me) Review by: danielsh me ------------------------------------------------------------------------ r31621 | stsp | 2008-06-07 12:41:55 +0200 (Sat, 07 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31620 for 1.5.1. ------------------------------------------------------------------------ r31622 | danielsh | 2008-06-07 13:38:01 +0200 (Sat, 07 Jun 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_repos/hooks.c Follow-up to r31620. * subversion/libsvn_repos/hooks.c (svn_repos__hooks_start_commit): Pass "" instead of NULL for args[3] when capabilities is NULL. Also despaghettify the logic a little. Review by: stsp ------------------------------------------------------------------------ r31623 | danielsh | 2008-06-07 13:39:04 +0200 (Sat, 07 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS (r31620): Nominate r31622, including stsp's vote via IRC. ------------------------------------------------------------------------ r31624 | blair | 2008-06-07 20:15:11 +0200 (Sat, 07 Jun 2008) | 5 lines Changed paths: M /branches/file-externals M /branches/file-externals/build.conf M /branches/file-externals/notes/svnsync.txt A /branches/file-externals/subversion/include/private/svn_utf_private.h (from /trunk/subversion/include/private/svn_utf_private.h:31623) M /branches/file-externals/subversion/include/svn_repos.h M /branches/file-externals/subversion/libsvn_ra_serf/auth.c M /branches/file-externals/subversion/libsvn_repos/fs-wrap.c M /branches/file-externals/subversion/libsvn_repos/hooks.c M /branches/file-externals/subversion/libsvn_subr/utf_impl.h M /branches/file-externals/subversion/tests/libsvn_repos/repos-test.c M /branches/file-externals/www/svn_1.5_releasenotes.html In the file externals branch. * branches/file-externals: Merge r31613 through r31623. ------------------------------------------------------------------------ r31625 | glasser | 2008-06-08 08:08:11 +0200 (Sun, 08 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31620/31622, and note that it may be important. ------------------------------------------------------------------------ r31626 | lgo | 2008-06-08 09:32:20 +0200 (Sun, 08 Jun 2008) | 18 lines Changed paths: M /trunk/notes/EuroOSCON-2005-vc-bof.txt M /trunk/notes/cli-repo-root-relative-support.txt M /trunk/notes/commit-access-templates/contrib-committer.tmpl M /trunk/notes/commit-access-templates/full-committer.tmpl M /trunk/notes/commit-access-templates/partial-committer.tmpl M /trunk/notes/interactive-conflict-resolution.txt M /trunk/notes/l10n-problems M /trunk/notes/skip-deltas M /trunk/notes/sql-backend M /trunk/notes/ssh-tricks M /trunk/notes/test-writing M /trunk/notes/tree-conflicts/design-overview.txt M /trunk/notes/tree-conflicts/detection.txt M /trunk/notes/tree-conflicts/requirements.txt M /trunk/notes/wc-improvements Add svn:eol-style "native" property in all files under notes/: * notes/commit-access-templates/partial-committer.tmpl * notes/commit-access-templates/contrib-committer.tmpl * notes/commit-access-templates/full-committer.tmpl * notes/sql-backend * notes/EuroOSCON-2005-vc-bof.txt * notes/interactive-conflict-resolution.txt * notes/wc-improvements * notes/skip-deltas * notes/tree-conflicts/requirements.txt * notes/tree-conflicts/design-overview.txt * notes/tree-conflicts/detection.txt * notes/ssh-tricks * notes/l10n-problems * notes/cli-repo-root-relative-support.txt * notes/test-writing ------------------------------------------------------------------------ r31627 | lgo | 2008-06-08 09:50:30 +0200 (Sun, 08 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31619 for 1.5.1. ------------------------------------------------------------------------ r31628 | danielsh | 2008-06-08 13:23:52 +0200 (Sun, 08 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31223, approving. ------------------------------------------------------------------------ r31629 | lgo | 2008-06-08 15:49:23 +0200 (Sun, 08 Jun 2008) | 24 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/blame.c M /trunk/subversion/libsvn_ra_serf/getlocations.c M /trunk/subversion/libsvn_ra_serf/getlocationsegments.c M /trunk/subversion/libsvn_ra_serf/log.c M /trunk/subversion/libsvn_ra_serf/mergeinfo.c M /trunk/subversion/libsvn_ra_serf/property.c M /trunk/subversion/libsvn_ra_serf/ra_serf.h M /trunk/subversion/libsvn_ra_serf/serf.c Combine duplicate code into an already existing function. * subversion/libsvn_ra_serf/property.c * subversion/libsvn_ra_serf/ra_serf.h (svn_ra_serf__get_baseline_info): Add extra parameter latest_revnum, which will be set to the baseline revision. * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__get_latest_revnum, fetch_path_props, svn_ra_serf__get_dir): Use svn_ra_serf__get_baseline_info to avoid code duplication. * subversion/libsvn_ra_serf/blame.c (svn_ra_serf__get_file_revs): Ditto. * subversion/libsvn_ra_serf/mergeinfo.c (svn_ra_serf__get_mergeinfo): Add extra NULL argument for latest_revnum in call to svn_ra_serf__get_baseline_info. * subversion/libsvn_ra_serf/getlocationsegments.c (svn_ra_serf__get_location_segments): Ditto. * subversion/libsvn_ra_serf/log.c (svn_ra_serf__get_log): Ditto. * subversion/libsvn_ra_serf/getlocations.c (svn_ra_serf__get_locations): Ditto. ------------------------------------------------------------------------ r31630 | lgo | 2008-06-08 17:12:41 +0200 (Sun, 08 Jun 2008) | 14 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/ra_serf.h M /trunk/subversion/libsvn_ra_serf/serf.c M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: Fix copy_tests.py 22, handling of paths that require URI encoding. * subversion/libsvn_ra_serf/util.c (svn_ra_serf__discover_root): Callers expect that the relative path is URI decoded, so make sure we respect that. * subversion/libsvn_ra_serf/ra_serf.h (svn_ra_serf__discover_root, svn_ra_serf__get_baseline_info): Updated comments to note that from now on the relative paths are returned URI decoded. * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__get_dir): Add comment. ------------------------------------------------------------------------ r31631 | stsp | 2008-06-08 18:57:15 +0200 (Sun, 08 Jun 2008) | 3 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Move r31223 and the (r31620, r31622) group into the 1.5.0 candidate section. ------------------------------------------------------------------------ r31632 | danielsh | 2008-06-08 19:06:59 +0200 (Sun, 08 Jun 2008) | 1 line Changed paths: M /trunk/www/hacking.html * www/hacking.html: HTML-escape a '>' sign. ------------------------------------------------------------------------ r31633 | lgo | 2008-06-08 20:28:58 +0200 (Sun, 08 Jun 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/locks.c ra_serf: Return exit code 0 when 'svn lock' fails to get a lock. This is normal behavior. This fixes lock tests 6 and 29. * subversion/libsvn_ra_serf/locks.c (svn_ra_serf__lock): Ignore any lock errors, only bail out on technical errors. ------------------------------------------------------------------------ r31634 | danielsh | 2008-06-08 20:44:56 +0200 (Sun, 08 Jun 2008) | 3 lines Changed paths: M /trunk/subversion/tests/libsvn_subr/path-test.c * subversion/libsvn_subr/path-test.c (test_canonicalize): Add two testcases for trailing slashes. ------------------------------------------------------------------------ r31635 | kon | 2008-06-08 21:48:52 +0200 (Sun, 08 Jun 2008) | 2 lines Changed paths: M /trunk/COMMITTERS * COMMITTERS (kon): Move myself to the dormant section. ------------------------------------------------------------------------ r31636 | kfogel | 2008-06-08 21:59:31 +0200 (Sun, 08 Jun 2008) | 7 lines Changed paths: M /branches/issue-3000 M /branches/issue-3000/CHANGES M /branches/issue-3000/COMMITTERS M /branches/issue-3000/Makefile.in M /branches/issue-3000/TRANSLATING M /branches/issue-3000/aclocal.m4 M /branches/issue-3000/build/ac-macros/apache.m4 M /branches/issue-3000/build/generator/ezt.py M /branches/issue-3000/build/generator/gen_base.py M /branches/issue-3000/build/run_tests.py M /branches/issue-3000/build.conf M /branches/issue-3000/configure.ac M /branches/issue-3000/gen-make.py M /branches/issue-3000/notes/EuroOSCON-2005-vc-bof.txt M /branches/issue-3000/notes/cli-repo-root-relative-support.txt M /branches/issue-3000/notes/commit-access-templates/contrib-committer.tmpl M /branches/issue-3000/notes/commit-access-templates/full-committer.tmpl M /branches/issue-3000/notes/commit-access-templates/partial-committer.tmpl M /branches/issue-3000/notes/dump-load-format.txt M /branches/issue-3000/notes/fsfs M /branches/issue-3000/notes/interactive-conflict-resolution.txt M /branches/issue-3000/notes/l10n-problems A /branches/issue-3000/notes/obliterate (from /trunk/notes/obliterate:31635) D /branches/issue-3000/notes/reintegrate-todo.txt M /branches/issue-3000/notes/skip-deltas M /branches/issue-3000/notes/sql-backend M /branches/issue-3000/notes/ssh-tricks M /branches/issue-3000/notes/svnsync.txt M /branches/issue-3000/notes/test-writing M /branches/issue-3000/notes/tree-conflicts/detection.txt D /branches/issue-3000/notes/tree-conflicts/policy.txt D /branches/issue-3000/notes/tree-conflicts/testing.txt M /branches/issue-3000/notes/wc-improvements M /branches/issue-3000/packages/python-windows/setup.py M /branches/issue-3000/subversion/bindings/javahl/native/LogMessageCallback.cpp M /branches/issue-3000/subversion/bindings/javahl/native/Prompter.cpp M /branches/issue-3000/subversion/bindings/javahl/native/ProplistCallback.h M /branches/issue-3000/subversion/bindings/javahl/native/SVNClient.cpp M /branches/issue-3000/subversion/bindings/javahl/native/SVNClient.h M /branches/issue-3000/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp M /branches/issue-3000/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogMessageCallback.java M /branches/issue-3000/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /branches/issue-3000/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java M /branches/issue-3000/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java M /branches/issue-3000/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/issue-3000/subversion/bindings/swig/core.i M /branches/issue-3000/subversion/bindings/swig/perl/native/t/6ra.t M /branches/issue-3000/subversion/bindings/swig/python/tests/client.py M /branches/issue-3000/subversion/bindings/swig/python/tests/mergeinfo.py M /branches/issue-3000/subversion/bindings/swig/python/tests/trac/test.py M /branches/issue-3000/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py M /branches/issue-3000/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c M /branches/issue-3000/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h M /branches/issue-3000/subversion/bindings/swig/ruby/svn/client.rb M /branches/issue-3000/subversion/bindings/swig/ruby/svn/core.rb M /branches/issue-3000/subversion/bindings/swig/ruby/test/test_client.rb M /branches/issue-3000/subversion/bindings/swig/ruby/test/test_core.rb M /branches/issue-3000/subversion/bindings/swig/svn_client.i M /branches/issue-3000/subversion/include/private/svn_opt_private.h M /branches/issue-3000/subversion/include/svn_auth.h M /branches/issue-3000/subversion/include/svn_base64.h M /branches/issue-3000/subversion/include/svn_client.h M /branches/issue-3000/subversion/include/svn_config.h M /branches/issue-3000/subversion/include/svn_error_codes.h M /branches/issue-3000/subversion/include/svn_io.h M /branches/issue-3000/subversion/include/svn_mergeinfo.h M /branches/issue-3000/subversion/include/svn_opt.h M /branches/issue-3000/subversion/include/svn_path.h M /branches/issue-3000/subversion/include/svn_props.h M /branches/issue-3000/subversion/include/svn_ra.h M /branches/issue-3000/subversion/include/svn_repos.h A /branches/issue-3000/subversion/libsvn_auth_gnome_keyring (from /trunk/subversion/libsvn_auth_gnome_keyring:31635) A /branches/issue-3000/subversion/libsvn_auth_kwallet (from /trunk/subversion/libsvn_auth_kwallet:31635) M /branches/issue-3000/subversion/libsvn_client/add.c M /branches/issue-3000/subversion/libsvn_client/changelist.c M /branches/issue-3000/subversion/libsvn_client/client.h M /branches/issue-3000/subversion/libsvn_client/cmdline.c M /branches/issue-3000/subversion/libsvn_client/commit.c M /branches/issue-3000/subversion/libsvn_client/commit_util.c M /branches/issue-3000/subversion/libsvn_client/copy.c M /branches/issue-3000/subversion/libsvn_client/delete.c M /branches/issue-3000/subversion/libsvn_client/externals.c M /branches/issue-3000/subversion/libsvn_client/merge.c M /branches/issue-3000/subversion/libsvn_client/prop_commands.c M /branches/issue-3000/subversion/libsvn_client/ra.c M /branches/issue-3000/subversion/libsvn_client/resolved.c M /branches/issue-3000/subversion/libsvn_client/revert.c M /branches/issue-3000/subversion/libsvn_delta/depth_filter_editor.c M /branches/issue-3000/subversion/libsvn_fs_fs/dag.c M /branches/issue-3000/subversion/libsvn_fs_fs/dag.h M /branches/issue-3000/subversion/libsvn_fs_fs/fs.c M /branches/issue-3000/subversion/libsvn_fs_fs/fs.h M /branches/issue-3000/subversion/libsvn_fs_fs/fs_fs.c M /branches/issue-3000/subversion/libsvn_fs_fs/fs_fs.h M /branches/issue-3000/subversion/libsvn_fs_fs/structure M /branches/issue-3000/subversion/libsvn_fs_fs/tree.c M /branches/issue-3000/subversion/libsvn_ra/ra_loader.c M /branches/issue-3000/subversion/libsvn_ra_local/ra_plugin.c M /branches/issue-3000/subversion/libsvn_ra_neon/commit.c M /branches/issue-3000/subversion/libsvn_ra_neon/get_locks.c M /branches/issue-3000/subversion/libsvn_ra_neon/props.c M /branches/issue-3000/subversion/libsvn_ra_neon/session.c M /branches/issue-3000/subversion/libsvn_ra_neon/util.c M /branches/issue-3000/subversion/libsvn_ra_serf/auth.c M /branches/issue-3000/subversion/libsvn_ra_serf/blame.c M /branches/issue-3000/subversion/libsvn_ra_serf/commit.c M /branches/issue-3000/subversion/libsvn_ra_serf/getlocations.c M /branches/issue-3000/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/issue-3000/subversion/libsvn_ra_serf/locks.c M /branches/issue-3000/subversion/libsvn_ra_serf/log.c M /branches/issue-3000/subversion/libsvn_ra_serf/mergeinfo.c M /branches/issue-3000/subversion/libsvn_ra_serf/property.c M /branches/issue-3000/subversion/libsvn_ra_serf/ra_serf.h M /branches/issue-3000/subversion/libsvn_ra_serf/serf.c M /branches/issue-3000/subversion/libsvn_ra_serf/update.c M /branches/issue-3000/subversion/libsvn_ra_serf/util.c M /branches/issue-3000/subversion/libsvn_ra_svn/client.c M /branches/issue-3000/subversion/libsvn_repos/commit.c M /branches/issue-3000/subversion/libsvn_repos/fs-wrap.c M /branches/issue-3000/subversion/libsvn_repos/hooks.c M /branches/issue-3000/subversion/libsvn_subr/cmdline.c M /branches/issue-3000/subversion/libsvn_subr/config_file.c M /branches/issue-3000/subversion/libsvn_subr/mergeinfo.c M /branches/issue-3000/subversion/libsvn_subr/opt.c M /branches/issue-3000/subversion/libsvn_subr/properties.c M /branches/issue-3000/subversion/libsvn_subr/simple_providers.c M /branches/issue-3000/subversion/libsvn_subr/ssl_server_trust_providers.c M /branches/issue-3000/subversion/libsvn_subr/stream.c M /branches/issue-3000/subversion/libsvn_subr/svn_base64.c M /branches/issue-3000/subversion/libsvn_subr/time.c M /branches/issue-3000/subversion/libsvn_subr/utf_impl.h M /branches/issue-3000/subversion/libsvn_wc/adm_ops.c M /branches/issue-3000/subversion/libsvn_wc/entries.c M /branches/issue-3000/subversion/libsvn_wc/props.c M /branches/issue-3000/subversion/libsvn_wc/update_editor.c M /branches/issue-3000/subversion/po/de.po M /branches/issue-3000/subversion/po/es.po M /branches/issue-3000/subversion/po/fr.po M /branches/issue-3000/subversion/po/it.po M /branches/issue-3000/subversion/po/ja.po M /branches/issue-3000/subversion/po/ko.po M /branches/issue-3000/subversion/po/nb.po M /branches/issue-3000/subversion/po/pl.po M /branches/issue-3000/subversion/po/pt_BR.po M /branches/issue-3000/subversion/po/sv.po M /branches/issue-3000/subversion/po/zh_CN.po M /branches/issue-3000/subversion/po/zh_TW.po M /branches/issue-3000/subversion/svn/blame-cmd.c M /branches/issue-3000/subversion/svn/cl.h M /branches/issue-3000/subversion/svn/commit-cmd.c M /branches/issue-3000/subversion/svn/conflict-callbacks.c M /branches/issue-3000/subversion/svn/copy-cmd.c M /branches/issue-3000/subversion/svn/delete-cmd.c M /branches/issue-3000/subversion/svn/import-cmd.c M /branches/issue-3000/subversion/svn/info-cmd.c M /branches/issue-3000/subversion/svn/log-cmd.c M /branches/issue-3000/subversion/svn/main.c M /branches/issue-3000/subversion/svn/mkdir-cmd.c M /branches/issue-3000/subversion/svn/move-cmd.c M /branches/issue-3000/subversion/svn/propdel-cmd.c M /branches/issue-3000/subversion/svn/propedit-cmd.c M /branches/issue-3000/subversion/svn/propset-cmd.c M /branches/issue-3000/subversion/svn/util.c M /branches/issue-3000/subversion/svnserve/serve.c M /branches/issue-3000/subversion/tests/cmdline/basic_tests.py M /branches/issue-3000/subversion/tests/cmdline/commit_tests.py M /branches/issue-3000/subversion/tests/cmdline/copy_tests.py M /branches/issue-3000/subversion/tests/cmdline/depth_tests.py M /branches/issue-3000/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout M /branches/issue-3000/subversion/tests/cmdline/merge_tests.py M /branches/issue-3000/subversion/tests/cmdline/prop_tests.py M /branches/issue-3000/subversion/tests/cmdline/svndumpfilter_tests.py M /branches/issue-3000/subversion/tests/cmdline/svntest/actions.py M /branches/issue-3000/subversion/tests/cmdline/svntest/main.py M /branches/issue-3000/subversion/tests/cmdline/svntest/testcase.py M /branches/issue-3000/subversion/tests/cmdline/switch_tests.py M /branches/issue-3000/subversion/tests/libsvn_fs/fs-test.c M /branches/issue-3000/subversion/tests/libsvn_fs/locks-test.c M /branches/issue-3000/subversion/tests/libsvn_fs_base/changes-test.c M /branches/issue-3000/subversion/tests/libsvn_fs_base/fs-base-test.c M /branches/issue-3000/subversion/tests/libsvn_fs_base/strings-reps-test.c M /branches/issue-3000/subversion/tests/libsvn_ra_local/ra-local-test.c M /branches/issue-3000/subversion/tests/libsvn_repos/repos-test.c M /branches/issue-3000/subversion/tests/libsvn_subr M /branches/issue-3000/subversion/tests/libsvn_subr/path-test.c M /branches/issue-3000/subversion/tests/libsvn_subr/target-test.c M /branches/issue-3000/subversion/tests/svn_test.h M /branches/issue-3000/subversion/tests/svn_test_fs.c M /branches/issue-3000/subversion/tests/svn_test_fs.h M /branches/issue-3000/subversion/tests/svn_test_main.c M /branches/issue-3000/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh M /branches/issue-3000/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh M /branches/issue-3000/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh M /branches/issue-3000/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh M /branches/issue-3000/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh M /branches/issue-3000/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh M /branches/issue-3000/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh M /branches/issue-3000/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh M /branches/issue-3000/tools/dev/contribulyze.py M /branches/issue-3000/tools/dev/graph-dav-servers.py M /branches/issue-3000/tools/dist/write-announcement.py M /branches/issue-3000/tools/hook-scripts/verify-po.py M /branches/issue-3000/tools/po/l10n-report.py M /branches/issue-3000/tools/server-side/svn_server_log_parse.py M /branches/issue-3000/tools/server-side/test_svn_server_log_parse.py M /branches/issue-3000/win-tests.py M /branches/issue-3000/www/hacking.html M /branches/issue-3000/www/images/svn-dav-securityspace-survey.png M /branches/issue-3000/www/links.html M /branches/issue-3000/www/project_issues.html M /branches/issue-3000/www/svn-dav-securityspace-survey.html M /branches/issue-3000/www/svn_1.5_releasenotes.html On the issue-3000-dev branch: Bring up to date with trunk. I ran 'svn merge https://svn.collab.net/repos/svn/trunk' and it Just Worked ("Merging r31217 through r31635 into '.'"). That's so awesome. ------------------------------------------------------------------------ r31637 | jensseidel | 2008-06-08 22:50:39 +0200 (Sun, 08 Jun 2008) | 8 lines Changed paths: M /branches/1.5.x/subversion/po/de.po On the '1.5.x' branch: German translation updated. * subversion/po/de.po: Removed a stupid space in front of a colon. That's already fixed in trunk/ but the English string in this branch still suffers from it. ------------------------------------------------------------------------ r31638 | lgo | 2008-06-08 23:25:04 +0200 (Sun, 08 Jun 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/locks.c ra_serf: Follow up r31633. Only ignore lock related errors, not other errors - like 403 Forbidden - that happen to show up on a lock request. * subversion/libsvn_ra_serf/locks.c (svn_ra_serf__lock): Only ignore the error it it's lock related. ------------------------------------------------------------------------ r31639 | kfogel | 2008-06-09 06:53:05 +0200 (Mon, 09 Jun 2008) | 62 lines Changed paths: M /branches/issue-3000/www/bugs.html A /branches/issue-3000/www/development.html (from /branches/issue-3000/www/project_development.html:31635) A /branches/issue-3000/www/features.html A /branches/issue-3000/www/getting.html D /branches/issue-3000/www/getting_subversion.html M /branches/issue-3000/www/hacking.html M /branches/issue-3000/www/index.html A /branches/issue-3000/www/issue-tracker.html (from /branches/issue-3000/www/project_issues.html:31636) M /branches/issue-3000/www/mailing-list-guidelines.html A /branches/issue-3000/www/mailing-lists.html M /branches/issue-3000/www/project_development.html M /branches/issue-3000/www/project_issues.html M /branches/issue-3000/www/project_packages.html M /branches/issue-3000/www/project_tasks.html M /branches/issue-3000/www/project_tools.html M /branches/issue-3000/www/release-process.html M /branches/issue-3000/www/roadmap.html M /branches/issue-3000/www/svn_1.2_releasenotes.html M /branches/issue-3000/www/svn_1.3_releasenotes.html On the issue-3000-dev branch: Completely revamp the web site, using the plan in README.branch. This is a draft; severe bikeshedding both desired and expected :-). Note: I've done nothing with the left-side vertical sidebar yet, except adjust some links. Major changes: ============== * www/index.html: Rewrite. * www/features.html: New file, based on material formerly in index.html, but with new additions as well. * www/mailing-lists.html: New file, explaining what lists to post to and offering advice on how to post. Incorporates some material from links.html and some from mailing-list-guidelines.html. * www/getting.html: New file, based on getting_subversion.html and project_packages.html. * www/issues-tracker.html: New file, based on project_issues.html. * www/development.html: New file, based on project_development.html. * www/bugs.html: Reorganize, and add some more material about how to use the issue tracker. Removals and redirections: ========================== * www/getting_subversion.html: Remove, after folding material into getting.html. * www/project_packages.html: Redirect to getting.html. * www/mailing-list-guidelines.html: Redirect to mailing-lists.html. * www/project_issues.html: Redirect to issue_tracker.html. * www/project_development.html: Redirect to development.html. Minor changes and adjustments: ============================== * www/release-process.html: Adjust for above. * www/svn_1.2_releasenotes.html: Same. * www/svn_1.3_releasenotes.html: Same. * www/hacking.html: Same. * www/project_tools.html: Same. * www/roadmap.html: Same. * www/project_tasks.html: Same, and fix some long-wrong links. ------------------------------------------------------------------------ r31640 | hwright | 2008-06-09 07:03:29 +0200 (Mon, 09 Jun 2008) | 5 lines Changed paths: M /trunk/www/links.html M /trunk/www/project_issues.html M /trunk/www/svn_1.5_releasenotes.html * www/links.html, www/project_issues.html, www/svn_1.5_releasenotes.html: Fix validation errors. ------------------------------------------------------------------------ r31641 | kfogel | 2008-06-09 07:18:04 +0200 (Mon, 09 Jun 2008) | 7 lines Changed paths: M /branches/issue-3000 M /branches/issue-3000/subversion/libsvn_ra_serf/locks.c M /branches/issue-3000/www/issue-tracker.html M /branches/issue-3000/www/links.html M /branches/issue-3000/www/svn_1.5_releasenotes.html On the issue-3000-dev branch: Bring up to date with trunk. This involved porting the r31640 change to www/project_issues.html over to that file's new incarnation, www/issue-tracker.html. ------------------------------------------------------------------------ r31642 | kfogel | 2008-06-09 07:19:44 +0200 (Mon, 09 Jun 2008) | 5 lines Changed paths: M /branches/issue-3000/www/index.html On the issue-3000-dev branch: * www/index.html (development): Wording tweaks. ------------------------------------------------------------------------ r31643 | hwright | 2008-06-09 07:37:11 +0200 (Mon, 09 Jun 2008) | 11 lines Changed paths: M /branches/issue-3000/www/development.html M /branches/issue-3000/www/features.html M /branches/issue-3000/www/getting.html M /branches/issue-3000/www/index.html M /branches/issue-3000/www/mailing-list-guidelines.html M /branches/issue-3000/www/project_packages.html On the issue-3000 branch: Fix a few more validation errors. * www/development.html, www/getting.html, www/project_packages.html, www/features.html, www/mailing-list-guidelines.html, www/index.html: Fix errors in html validation. ------------------------------------------------------------------------ r31644 | hwright | 2008-06-09 07:53:41 +0200 (Mon, 09 Jun 2008) | 7 lines Changed paths: M /branches/issue-3000/www/index.html M /branches/issue-3000/www/issue-tracker.html M /branches/issue-3000/www/mailing-lists.html On the issue-3000 branch: * www/mailing-lists.html, www/issue-tracker.html, www/index.html: Fix the rest of the validation errors. ------------------------------------------------------------------------ r31645 | kfogel | 2008-06-09 08:03:18 +0200 (Mon, 09 Jun 2008) | 5 lines Changed paths: M /branches/issue-3000/www/index.html On the issue-3000-dev branch: * www/index.html (development): Specifically mention that one-off patches are welcome. ------------------------------------------------------------------------ r31646 | lgo | 2008-06-09 08:04:06 +0200 (Mon, 09 Jun 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/locks.c ra_serf: Add non NULLness check before checking the returned error. Hey, we might well have no error at all. * subversion/libsvn_ra_serf/locks.c (svn_ra_serf__lock): Check if there really was an error. ------------------------------------------------------------------------ r31647 | danielsh | 2008-06-09 08:50:06 +0200 (Mon, 09 Jun 2008) | 10 lines Changed paths: M /branches/issue-3000/www/features.html M /branches/issue-3000/www/getting.html M /branches/issue-3000/www/mailing-lists.html On the issue-3000 branch: Tweak MIME types. * www/mailing-lists.html, www/getting.html, www/features.html: Set 'svn:mime-type' to 'text/html', so they can be viewed as HTML from the repository (in http://svn.collab.net/repos/svn/branches/issue-3000/www/mailing-lists.html). ------------------------------------------------------------------------ r31648 | danielsh | 2008-06-09 09:18:27 +0200 (Mon, 09 Jun 2008) | 3 lines Changed paths: M /branches/issue-3000/www/index.html On the issue-3000 branch: * www/index.html: Left-align bulleted lists. ------------------------------------------------------------------------ r31649 | danielsh | 2008-06-09 10:31:45 +0200 (Mon, 09 Jun 2008) | 4 lines Changed paths: M /branches/issue-3000/www/svn_1.5_releasenotes.html On the issue-3000 branch: * www/svn_1.5_releasenotes.html (mt-compatibility): Use http, rather than https, links. ------------------------------------------------------------------------ r31650 | danielsh | 2008-06-09 11:11:28 +0200 (Mon, 09 Jun 2008) | 3 lines Changed paths: M /branches/issue-3000/www/index.html On the issue-3000 branch: * www/index.html: Spell "OS X" with a non-breaking space. ------------------------------------------------------------------------ r31651 | danielsh | 2008-06-09 11:15:25 +0200 (Mon, 09 Jun 2008) | 3 lines Changed paths: M /branches/issue-3000/www/index.html On the issue-3000 branch: * www/index.html: Link to ViewVC. ------------------------------------------------------------------------ r31652 | danielsh | 2008-06-09 11:52:02 +0200 (Mon, 09 Jun 2008) | 3 lines Changed paths: M /branches/issue-3000/www/bugs.html On the issue-3000 branch: * www/bugs.html: s/look/search/ in the bug tracker. ------------------------------------------------------------------------ r31653 | stsp | 2008-06-09 12:12:17 +0200 (Mon, 09 Jun 2008) | 17 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/libsvn_repos/hooks.c On the 1.5.x branch: Merge r31620 and r31622 from trunk. Also, reschedule r31223 to 1.5.1. * subversion/libsvn_repos/hooks.c (svn_repos__hooks_start_commit): Don't blindly assume that the client will always report capabilities. glasser: Um, doesn't not applying this segfault *every single program* written against the pre-1.5 svn_repos API if the repository has a start-commit hook? As much as I hate to drag out this process... * STATUS: Remove entry for (r31620, r31622) group, and reschedule r31223 for 1.5.1. Approved by: glasser markphip ------------------------------------------------------------------------ r31654 | danielsh | 2008-06-09 12:20:31 +0200 (Mon, 09 Jun 2008) | 3 lines Changed paths: M /branches/issue-3000/www/index.html On the issue-3000 branch: whitespace changes only. * www/index.html: Convert tabs to spaces and fix indentation. ------------------------------------------------------------------------ r31655 | firemeteor | 2008-06-09 14:12:35 +0200 (Mon, 09 Jun 2008) | 15 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c M /branches/issue-2843-dev/subversion/tests/cmdline/depth_tests.py On the issue-2843-dev branch. According to Karl: 1) report 'D' on those locally modified items is Okay. And 2) crop a subtree to svn_depth_empty should not take the root away. This purpose should be covered by a dedicated enum, such as svn_depth_excluded. * subversion/tests/cmdline/depth_tests.py (fold_tree_with_unversioned_modified_items): Tune comments. (test_list): The above test is no longer XFAIL. * subversion/libsvn_wc/crop.c (svn_wc_crop_tree): don't crop the root on svn_depth_empty, and prepare for svn_depth_exclude a bit. ------------------------------------------------------------------------ r31656 | cmpilato | 2008-06-09 15:17:21 +0200 (Mon, 09 Jun 2008) | 5 lines Changed paths: M /trunk/Makefile.in * Makefile.in (check): Depend on the 'bin' rule, because the cmdline test suite needs 'svn', 'svnadmin', etc. Patch by: jpeacock ------------------------------------------------------------------------ r31657 | blair | 2008-06-09 17:13:29 +0200 (Mon, 09 Jun 2008) | 5 lines Changed paths: M /branches/file-externals M /branches/file-externals/COMMITTERS M /branches/file-externals/Makefile.in M /branches/file-externals/notes/EuroOSCON-2005-vc-bof.txt M /branches/file-externals/notes/cli-repo-root-relative-support.txt M /branches/file-externals/notes/commit-access-templates/contrib-committer.tmpl M /branches/file-externals/notes/commit-access-templates/full-committer.tmpl M /branches/file-externals/notes/commit-access-templates/partial-committer.tmpl M /branches/file-externals/notes/interactive-conflict-resolution.txt M /branches/file-externals/notes/l10n-problems M /branches/file-externals/notes/skip-deltas M /branches/file-externals/notes/sql-backend M /branches/file-externals/notes/ssh-tricks M /branches/file-externals/notes/test-writing M /branches/file-externals/notes/tree-conflicts/design-overview.txt M /branches/file-externals/notes/tree-conflicts/detection.txt M /branches/file-externals/notes/tree-conflicts/requirements.txt M /branches/file-externals/notes/wc-improvements M /branches/file-externals/subversion/libsvn_ra_serf/blame.c M /branches/file-externals/subversion/libsvn_ra_serf/getlocations.c M /branches/file-externals/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/file-externals/subversion/libsvn_ra_serf/locks.c M /branches/file-externals/subversion/libsvn_ra_serf/log.c M /branches/file-externals/subversion/libsvn_ra_serf/mergeinfo.c M /branches/file-externals/subversion/libsvn_ra_serf/property.c M /branches/file-externals/subversion/libsvn_ra_serf/ra_serf.h M /branches/file-externals/subversion/libsvn_ra_serf/serf.c M /branches/file-externals/subversion/libsvn_ra_serf/util.c M /branches/file-externals/subversion/tests/libsvn_subr/path-test.c M /branches/file-externals/www/hacking.html M /branches/file-externals/www/links.html M /branches/file-externals/www/project_issues.html M /branches/file-externals/www/svn_1.5_releasenotes.html In the file externals branch. * branches/file-externals: Merge r31624 through r31656. ------------------------------------------------------------------------ r31658 | pburba | 2008-06-09 19:05:09 +0200 (Mon, 09 Jun 2008) | 18 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Fix remaining bug from issue #2825 'Handle --depth option for 'merge' operations in terms of both content and merge info'. An inoperative merge to a directory at --depth files should set non-inheritable mergeinfo on the merge target *and* normal mergeinfo on any of the target's file children. This fits with the current disposition of issue #2883. See item D) in http://subversion.tigris.org/issues/show_bug.cgi?id=2825#desc5. * subversion/libsvn_client/merge.c (THE CHILDREN_WITH_MERGEINFO ARRAY): Minor tweak to this global comment. (get_mergeinfo_walk_cb): Simplify check for paths which are immediate children of the merge target when depth is 'immediates'. Also check for file paths which are immediate children of the merge target when depth is 'files'. (get_mergeinfo_paths): Update doc string noting one case we've handled for a long time and one new case. ------------------------------------------------------------------------ r31659 | pburba | 2008-06-09 19:25:57 +0200 (Mon, 09 Jun 2008) | 16 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Remove some redundant code for setting mergeinfo during shallow merges. Follow-up to r31658, and as such is nominally related to issue #2825. * subversion/libsvn_client/merge.c (record_mergeinfo_on_merged_children): Remove. (do_directory_merge): Remove call to record_mergeinfo_on_merged_children(). This call is unnecessary since get_mergeinfo_paths() has already flagged any children of the merge target when the requested depth is 'immediates' and added these to the children_with_mergeinfo array (if depth is 'files' only file children would be included). The existing code in do_directory_merge which iterates over children_with_mergeinfo and updates their mergeinfo already does what record_mergeinfo_on_merged_children() was doing. ------------------------------------------------------------------------ r31660 | kfogel | 2008-06-09 20:44:56 +0200 (Mon, 09 Jun 2008) | 8 lines Changed paths: M /branches/issue-3000/www/index.html On the issue-3000-dev branch: * www/index.html (help): Reword to avoid implication that we'd prefer people to use generic search engines rather than our specialized resources. (development): Put browsing the source tree before checking it out. This follows up to r31651. ------------------------------------------------------------------------ r31661 | danielsh | 2008-06-09 22:40:56 +0200 (Mon, 09 Jun 2008) | 4 lines Changed paths: D /branches/issue-3000/README.branch On the issue-3000 branch: Remove README.branch. NOTE: This commit was reverted in r31662. ------------------------------------------------------------------------ r31662 | danielsh | 2008-06-09 22:54:40 +0200 (Mon, 09 Jun 2008) | 6 lines Changed paths: A /branches/issue-3000/README.branch (from /branches/issue-3000/README.branch:31660) On the issue-3000 branch: Revert r31661. * README.branch: Resurrect. Removing it is the wrong way to keep it from entering trunk. Suggested by: kfogel ------------------------------------------------------------------------ r31663 | kfogel | 2008-06-09 23:17:59 +0200 (Mon, 09 Jun 2008) | 19 lines Changed paths: M /trunk M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp M /trunk/tools/server-side/svn_server_log_parse.py M /trunk/tools/server-side/test_svn_server_log_parse.py M /trunk/www/bugs.html A /trunk/www/development.html (from /branches/issue-3000/www/development.html:31639) A /trunk/www/features.html (from /branches/issue-3000/www/features.html:31639) A /trunk/www/getting.html (from /branches/issue-3000/www/getting.html:31639) D /trunk/www/getting_subversion.html M /trunk/www/hacking.html M /trunk/www/index.html A /trunk/www/issue-tracker.html (from /branches/issue-3000/www/issue-tracker.html:31639) M /trunk/www/mailing-list-guidelines.html A /trunk/www/mailing-lists.html (from /branches/issue-3000/www/mailing-lists.html:31639) M /trunk/www/project_development.html M /trunk/www/project_issues.html M /trunk/www/project_packages.html M /trunk/www/project_tasks.html M /trunk/www/project_tools.html M /trunk/www/release-process.html M /trunk/www/roadmap.html M /trunk/www/svn_1.2_releasenotes.html M /trunk/www/svn_1.3_releasenotes.html M /trunk/www/svn_1.5_releasenotes.html Merge the issue-3000-dev branch to trunk. Lots of crazy things happened on that branch, and doing --reintegrate, or 2-URL, or any other kind of sane merge was too troublesome. Instead, I just did it the old-fashioned way: for rev in r31639 r31642 r31643 r31644 r31645 r31647 r31648 \ r31649 r31650 r31651 r31652 r31654 r31660; \ do \ svn merge -c${rev} \ https://svn.collab.net/repos/svn/branches/issue-3000/; \ done Then markphip pointed out that I could have passed that revision list to 'svn merge' directly. Live and learn :-). One expected conflict had to be resolved, in www/project_issues.html, due to r31640, but other than that everything merged cleanly. ------------------------------------------------------------------------ r31664 | kfogel | 2008-06-09 23:20:00 +0200 (Mon, 09 Jun 2008) | 2 lines Changed paths: D /branches/issue-3000 Remove the issue-3000 branch. It was merged to trunk in r31663. ------------------------------------------------------------------------ r31665 | kfogel | 2008-06-10 04:56:53 +0200 (Tue, 10 Jun 2008) | 22 lines Changed paths: M /trunk/www/development.html M /trunk/www/hacking.html M /trunk/www/index.html M /trunk/www/issue-tracker.html M /trunk/www/project_tasks.html M /trunk/www/project_tools.html A /trunk/www/tasks.html (from /trunk/www/project_tasks.html:31664) Further web site improvements for issue #3000: * www/index.html (intro): Tighten, add some margin padding. (help): Link to the bug tracker too. * www/issue-tracker.html (find): Reorganize, and offer a structured query search. * www/project_tools.html: Remove what is now redundant with front page. * www/tasks.html: New file, copied from... * www/project_tasks.html: ...here, which now redirects to tasks.html. * www/development.html (What Needs Doing): New section. (Translating Subversion output): Move some material from here... * www/hacking.html (Localization (l10n)): ...to here. ------------------------------------------------------------------------ r31666 | kfogel | 2008-06-10 05:13:06 +0200 (Tue, 10 Jun 2008) | 10 lines Changed paths: M /trunk/www/index.html M /trunk/www/project_tools.html Further web site improvements for issue #3000: * www/index.html (help): Move "Contributed Tools" back to project_tools.html. Just link to the general converters section; we don't need a special link for cvs2svn, since it's already at the top of the list once you get to converters. * www/project_tools.html: List "Contributed Tools" here again. ------------------------------------------------------------------------ r31667 | hwright | 2008-06-10 06:01:19 +0200 (Tue, 10 Jun 2008) | 4 lines Changed paths: M /trunk/www/issue-tracker.html M /trunk/www/project_tasks.html * www/project_tasks.html, www/issue_tracker.html: Fix validation errors. ------------------------------------------------------------------------ r31668 | kfogel | 2008-06-10 06:01:55 +0200 (Tue, 10 Jun 2008) | 5 lines Changed paths: M /trunk/www/index.html * www/index.html (help): Remove a repeated word. Found by: bhuvan ------------------------------------------------------------------------ r31669 | hwright | 2008-06-10 07:04:11 +0200 (Tue, 10 Jun 2008) | 3 lines Changed paths: M /trunk/tools/dist/construct-rolling-environment.sh * tools/dist/construct-rolling-environment.sh: Update serf dependency to 0.2.0. ------------------------------------------------------------------------ r31670 | hwright | 2008-06-10 07:05:55 +0200 (Tue, 10 Jun 2008) | 2 lines Changed paths: M /trunk/CHANGES * CHANGES: Update the projected release date for 1.5.0. ------------------------------------------------------------------------ r31671 | hwright | 2008-06-10 07:07:07 +0200 (Tue, 10 Jun 2008) | 3 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/subversion/bindings/swig * CHANGES: Merge r31670 from trunk. ------------------------------------------------------------------------ r31672 | hwright | 2008-06-10 08:30:19 +0200 (Tue, 10 Jun 2008) | 1 line Changed paths: A /tags/1.5.0-rc10 (from /branches/1.5.x:31671) M /tags/1.5.0-rc10/subversion/include/svn_version.h Tagging 1.5.0-rc10 with svn_version.h matching tarball. ------------------------------------------------------------------------ r31673 | stsp | 2008-06-10 13:02:48 +0200 (Tue, 10 Jun 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_repos/hooks.c * subversion/libsvn_repos/hooks.c (svn_repos__hooks_start_commit): Fix a compiler warning, 'assignment discards qualifiers from pointer target type'. Patch by: stylesen kameshj ------------------------------------------------------------------------ r31674 | stsp | 2008-06-10 13:14:48 +0200 (Tue, 10 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31673. ------------------------------------------------------------------------ r31675 | kameshj | 2008-06-10 13:38:29 +0200 (Tue, 10 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS STATUS: Vote for r31673. ------------------------------------------------------------------------ r31676 | markphip | 2008-06-10 14:46:38 +0200 (Tue, 10 Jun 2008) | 7 lines Changed paths: M /trunk/www/index.html Add AnkhSVN to list of Subversion client. * www/index.html Added link to AnkhSVN in list of clients. Also changed VS.NET to Visual Studio, which is more common name. ------------------------------------------------------------------------ r31677 | markphip | 2008-06-10 14:50:09 +0200 (Tue, 10 Jun 2008) | 5 lines Changed paths: M /trunk/www/links.html Updated URL and description for AnkhSVN. * www/links.html Updated AnkhSVN to current project URL. ------------------------------------------------------------------------ r31678 | cmpilato | 2008-06-10 15:12:42 +0200 (Tue, 10 Jun 2008) | 1 line Changed paths: M /trunk/contrib/client-side/diffwrap.bat Minor comment tweak. ------------------------------------------------------------------------ r31679 | blair | 2008-06-10 16:28:18 +0200 (Tue, 10 Jun 2008) | 5 lines Changed paths: M /branches/file-externals M /branches/file-externals/CHANGES M /branches/file-externals/contrib/client-side/diffwrap.bat M /branches/file-externals/subversion/libsvn_auth_kwallet/kwallet.cpp M /branches/file-externals/subversion/libsvn_client/merge.c M /branches/file-externals/subversion/libsvn_repos/hooks.c M /branches/file-externals/tools/dist/construct-rolling-environment.sh M /branches/file-externals/tools/server-side/svn_server_log_parse.py M /branches/file-externals/tools/server-side/test_svn_server_log_parse.py M /branches/file-externals/www/bugs.html A /branches/file-externals/www/development.html (from /trunk/www/development.html:31678) A /branches/file-externals/www/features.html (from /trunk/www/features.html:31678) A /branches/file-externals/www/getting.html (from /trunk/www/getting.html:31678) D /branches/file-externals/www/getting_subversion.html M /branches/file-externals/www/hacking.html M /branches/file-externals/www/index.html A /branches/file-externals/www/issue-tracker.html (from /trunk/www/issue-tracker.html:31678) M /branches/file-externals/www/links.html M /branches/file-externals/www/mailing-list-guidelines.html A /branches/file-externals/www/mailing-lists.html (from /trunk/www/mailing-lists.html:31678) M /branches/file-externals/www/project_development.html M /branches/file-externals/www/project_issues.html M /branches/file-externals/www/project_packages.html M /branches/file-externals/www/project_tasks.html M /branches/file-externals/www/project_tools.html M /branches/file-externals/www/release-process.html M /branches/file-externals/www/roadmap.html M /branches/file-externals/www/svn_1.2_releasenotes.html M /branches/file-externals/www/svn_1.3_releasenotes.html M /branches/file-externals/www/svn_1.5_releasenotes.html A /branches/file-externals/www/tasks.html (from /trunk/www/tasks.html:31678) In the file externals branch. * branches/file-externals: Merge r31657 through r31678. ------------------------------------------------------------------------ r31680 | blair | 2008-06-10 17:08:57 +0200 (Tue, 10 Jun 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_wc/entries.c * subversion/libsvn_wc/entries.c: Spelling fix. ------------------------------------------------------------------------ r31681 | sussman | 2008-06-10 17:45:57 +0200 (Tue, 10 Jun 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_subr/prompt.c Stop svnmucc from crashing on the new plaintext prompt warning. * subversion/libsvn_subr/prompt.c (svn_cmdline_auth_plaintext_prompt): Don't blindly dereference the prompt baton; it could be NULL. ------------------------------------------------------------------------ r31682 | danielsh | 2008-06-10 18:27:16 +0200 (Tue, 10 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Vote for r31673, approving. ------------------------------------------------------------------------ r31683 | hwright | 2008-06-10 18:33:54 +0200 (Tue, 10 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Move r31223 to 1.5.1 Approved section. ------------------------------------------------------------------------ r31684 | danielsh | 2008-06-10 18:35:53 +0200 (Tue, 10 Jun 2008) | 12 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/libsvn_repos/hooks.c Merge r31673 from trunk. * r31673 Fix a compiler warning, 'assignment discards qualifiers from pointer target type' in subversion/libsvn_repos/hooks.c. Notes: This is just the compiler complaining about having to implicitly cast away 'const'. We don't write to what the pointer is pointing to though (empty string "" in data segment), so it's just a cosmetic build issue. Votes: +1: stsp, kameshj, danielsh ------------------------------------------------------------------------ r31685 | cmpilato | 2008-06-10 19:04:14 +0200 (Tue, 10 Jun 2008) | 10 lines Changed paths: M /trunk/subversion/include/svn_io.h M /trunk/subversion/libsvn_client/diff.c Fix an API compatibility problem caused by passing an uninitialized variable into svn_io_run_diff(). * subversion/include/svn_io.h (svn_io_run_diff): Clarify that to get the default behavior, you must pass NULL as the 'user_args' parameter. * subversion/libsvn_client/diff.c (set_up_diff_cmd_and_options): Initialize argv to NULL. ------------------------------------------------------------------------ r31686 | cmpilato | 2008-06-10 19:17:59 +0200 (Tue, 10 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS Recommend r31685 for backport. ------------------------------------------------------------------------ r31687 | julianfoad | 2008-06-10 20:14:28 +0200 (Tue, 10 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Cast a vote. ------------------------------------------------------------------------ r31688 | lgo | 2008-06-10 21:07:08 +0200 (Tue, 10 Jun 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/diff_tests.py Add a regression test for the issue fixed in r31685. * subversion/tests/cmdline/diff_tests.py (diff_external_diffcmd): New test. (test_list): Run the new test, should pass. ------------------------------------------------------------------------ r31689 | epg | 2008-06-10 21:11:12 +0200 (Tue, 10 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Vote for r31685, move to Approved. ------------------------------------------------------------------------ r31690 | lgo | 2008-06-10 21:58:27 +0200 (Tue, 10 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31688 for backport. ------------------------------------------------------------------------ r31691 | epg | 2008-06-10 21:59:16 +0200 (Tue, 10 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Vote for r31688. ------------------------------------------------------------------------ r31692 | sussman | 2008-06-10 22:20:28 +0200 (Tue, 10 Jun 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_ra_neon/commit.c Fix issue #2939 over ra_neon: bogus existence check. See reproduction recipe in the issue to verify this fix -- it uses svnmucc. Scenario can't be tested using the normal 'svn' client, since it involves doing a directory replacement within a single transaction. svnmucc and gvn can create the scenario, however, resulting is a revision which (until now) couldn't be svnsync'd over http! * subversion/libsvn_ra_neon/commit.c (commit_add_file): do PROPFIND existence check on the *working* url (i.e. the path within the transaction), not the public url (which the path in HEAD). ------------------------------------------------------------------------ r31693 | epg | 2008-06-10 22:30:31 +0200 (Tue, 10 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Nominate and vote for r31692 for 1.5.1. ------------------------------------------------------------------------ r31694 | julianfoad | 2008-06-10 23:03:18 +0200 (Tue, 10 Jun 2008) | 5 lines Changed paths: A /trunk/notes/tree-conflicts/resolution.txt Add a document about resolving tree conflicts. * notes/tree-conflicts/resolution.txt New file. ------------------------------------------------------------------------ r31695 | lgo | 2008-06-10 23:37:21 +0200 (Tue, 10 Jun 2008) | 15 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/commit.c Fix issue #2939 over ra_serf. While it's possible to delete and add a file in one transaction (Replace), it's not possible in one transaction to (a) delete a branch with a file, (b) resurrect an older version of that branch without that file and (c) re-add that file. ra_serf does a check in HEAD on the file before it tries to add it, unless the file was deleted earlier in the transaction. This fix expands that to check if any of the parent directories were deleted in the transaction. * subversion/libsvn_ra_serf/commit.c (add_file): Check if the file was deleted as part of a delete of one of the parent directories before checking its existence in HEAD. ------------------------------------------------------------------------ r31696 | epg | 2008-06-11 00:32:19 +0200 (Wed, 11 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Nominate r31695 along with r31692. ------------------------------------------------------------------------ r31697 | epg | 2008-06-11 02:37:26 +0200 (Wed, 11 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS Move r31688 to Approved; two votes is enough for a test. ------------------------------------------------------------------------ r31698 | hwright | 2008-06-11 07:26:41 +0200 (Wed, 11 Jun 2008) | 7 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/svn_io.h M /branches/1.5.x/subversion/libsvn_client/diff.c Merge r31685 from trunk: * r31685 Fix an API compatibility violation caused by an uninitialized variable. Votes: +1: cmpilato, julianfoad, epg ------------------------------------------------------------------------ r31699 | hwright | 2008-06-11 07:49:51 +0200 (Wed, 11 Jun 2008) | 7 lines Changed paths: M /branches/1.5.x M /branches/1.5.x/CHANGES M /branches/1.5.x/COMMITTERS M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/tests/cmdline/diff_tests.py Merge r31688 from trunk: * r31688 Regression test for - the already approved - r31685. Votes: +1: lgo, epg ------------------------------------------------------------------------ r31700 | lgo | 2008-06-11 08:05:30 +0200 (Wed, 11 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r31692, 31695. ------------------------------------------------------------------------ r31701 | hwright | 2008-06-11 08:20:26 +0200 (Wed, 11 Jun 2008) | 1 line Changed paths: A /tags/1.5.0-rc11 (from /branches/1.5.x:31699) M /tags/1.5.0-rc11/subversion/include/svn_version.h Tagging 1.5.0-rc11 with svn_version.h matching tarball. ------------------------------------------------------------------------ r31702 | firemeteor | 2008-06-11 09:25:15 +0200 (Wed, 11 Jun 2008) | 10 lines Changed paths: M /branches/issue-2843-dev/subversion/tests/cmdline/depth_tests.py On issue-2843-dev branch: Remove the test case which expects svn_depth_empty to bring away the root of the target tree. A new test that uses svn_depth_exclude instead will be introduced later. * subversion/tests/cmdline/depth_tests.py (depth_fold_clean_trees_2): Comment out the last test in this suite. (test_list): The above test suite is no longer XFail(). ------------------------------------------------------------------------ r31703 | julianfoad | 2008-06-11 12:22:40 +0200 (Wed, 11 Jun 2008) | 8 lines Changed paths: M /trunk/notes/tree-conflicts/design-overview.txt Update some tree-conflicts design notes. * notes/tree-conflicts/design-overview.txt Reflect that APIs for getting the textual description of a conflict have been moved to a higher level. Combine the "resolving" and "resolved" sections into one. Some other updates. ------------------------------------------------------------------------ r31704 | firemeteor | 2008-06-11 17:01:14 +0200 (Wed, 11 Jun 2008) | 26 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_client/update.c M /branches/issue-2843-dev/subversion/libsvn_wc/README M /branches/issue-2843-dev/subversion/libsvn_wc/adm_ops.c M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c M /branches/issue-2843-dev/subversion/libsvn_wc/entries.c M /branches/issue-2843-dev/subversion/libsvn_wc/lock.c On the issue-2843-dev branch: Handle svn_depth_exclude in the cropping logic. However, other parts of the libsvn_wc code still don't honor the svn_depth_exclude flag. * subversion/libsvn_wc/entries.c (write_entry): Store svn_depth_exclude for subdir entries. * subversion/libsvn_wc/README (depth): Document the change in entries.c. * subversion/libsvn_wc/lock.c (do_open): Skip entry with svn_depth_exclude depth. * subversion/libsvn_wc/adm_ops.c (svn_wc_remove_from_revision): Skip excluded subdir entries and preserve excluded entry in parent dir. * subversion/libsvn_wc/crop.c (svn_wc_crop_tree): Handle svn_depth_exclude properly, mark target as svn_depth_exclude if the parent expects it. (crop_children): Same. Also fold the notify branches. * subversion/libsvn_client/update.c (svn_client__update_internal): Skip update totally on svn_depth_exclude. ------------------------------------------------------------------------ r31705 | blair | 2008-06-11 17:32:28 +0200 (Wed, 11 Jun 2008) | 7 lines Changed paths: R /branches/file-externals (from /trunk:31704) In the file externals branch. * branches/file-externals: Replace with a new copy of trunk; this branch has no original commits and merge-tracking is preventing a merge from trunk. See http://svn.haxx.se/dev/archive-2008-06/0460.shtml ------------------------------------------------------------------------ r31706 | hwright | 2008-06-12 01:10:01 +0200 (Thu, 12 Jun 2008) | 6 lines Changed paths: M /trunk/tools/dist/getsigs.pl M /trunk/www/index.html * www/index.html: (want): For the *really* eager, include a direct like to the distribution tarballs. [Note: Accidental changes to tools/dist/getsigs.pl were reverted in r31707.] ------------------------------------------------------------------------ r31707 | hwright | 2008-06-12 01:11:03 +0200 (Thu, 12 Jun 2008) | 2 lines Changed paths: M /trunk/tools/dist/getsigs.pl Revert changes to tools/dist/getsigs.pl, accidentally included in r31706. ------------------------------------------------------------------------ r31708 | hwright | 2008-06-12 08:39:56 +0200 (Thu, 12 Jun 2008) | 16 lines Changed paths: M /trunk/www/getting.html D /trunk/www/images/aix.gif A /trunk/www/images/aix.png D /trunk/www/images/bsddaemon.png D /trunk/www/images/debian.jpg A /trunk/www/images/debian.png A /trunk/www/images/fedora.png A /trunk/www/images/freebsd.png D /trunk/www/images/hp.jpg A /trunk/www/images/hp.png D /trunk/www/images/i5os.png A /trunk/www/images/mac.png A /trunk/www/images/netbsd.png D /trunk/www/images/openbsd-puffy.gif A /trunk/www/images/openbsd.png D /trunk/www/images/osx.gif D /trunk/www/images/sol7logo.gif A /trunk/www/images/solaris.png D /trunk/www/images/src-pkg.png M /trunk/www/images/ubuntu.png D /trunk/www/images/win32.png A /trunk/www/images/windows.png Update the binary packages section of the website, using the mockup presented here: http://svnpages.tigris.org/project_packages3.html There's still some CSS work that can be done, but this is a much more compact and easier to read version of the material. Let the bikeshedding commence! Suggested by: markphip * www/getting.html: (binary-packages): Redo this section. * www/images: Update, add or remove various operating system and distribution logos. ------------------------------------------------------------------------ r31709 | stylesen | 2008-06-12 08:40:31 +0200 (Thu, 12 Jun 2008) | 6 lines Changed paths: M /trunk/tools/server-side/svn_server_log_parse.py Obvious fix. * tools/server-side/svn_server_log_parse.py (): Fix comment doc string. This script is now generic to both dav and svnserve. ------------------------------------------------------------------------ r31710 | julianfoad | 2008-06-12 15:11:54 +0200 (Thu, 12 Jun 2008) | 9 lines Changed paths: M /trunk/www/links.html On the web site "links" page, remove links to IDEs. (See email thread .) * www/links.html (clients): Remove entries for "Eric" and "NetBeans" as they are merely IDEs that include Subversion support and that is no longer unusual; and "JDevelop" as the page reached through the plug-in link no longer mentions a Subversion plug-in. ------------------------------------------------------------------------ r31711 | julianfoad | 2008-06-12 15:24:46 +0200 (Thu, 12 Jun 2008) | 8 lines Changed paths: M /trunk/www/links.html On the web site, separate the links to Subversion "clients and plug-ins" into four separate sections as there were too many for clarity. * www/links.html (clients): Make this section be for stand-alone clients only. (desktop-integrations, ide-plugins, other-plugins): New sections extracted from "clients" section. ------------------------------------------------------------------------ r31712 | markphip | 2008-06-12 16:44:48 +0200 (Thu, 12 Jun 2008) | 6 lines Changed paths: M /trunk/www/getting.html Update links for CollabNet Subversion. Site has been modified recently. * www/getting.html: (binary-packages): Point to updated CollabNet links. ------------------------------------------------------------------------ r31713 | firemeteor | 2008-06-12 17:15:08 +0200 (Thu, 12 Jun 2008) | 34 lines Changed paths: M /branches/issue-2843-dev/subversion/include/svn_wc.h M /branches/issue-2843-dev/subversion/libsvn_wc/adm_ops.c M /branches/issue-2843-dev/subversion/libsvn_wc/ambient_depth_filter_editor.c M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c M /branches/issue-2843-dev/subversion/libsvn_wc/entries.c M /branches/issue-2843-dev/subversion/libsvn_wc/lock.c M /branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c M /branches/issue-2843-dev/subversion/svn/main.c On issue-2843-dev branch: Make 'svn update' honor the svn_depth_exclude flag. It works for clean wc now. And all existing test suites remained working. However, the crawler has not been updated yet. So filtering modification in the excluded branch will not work now. The svn_wc_entry() and svn_wc_entries_read() now filter out excluded item when show_hidden is FALSE. * subversion/include/svn_wc.h (svn_wc_entry, svn_wc_entries_read, svn_wc_walk_entries3): Document the new filter behavior. * subversion/libsvn_wc/adm_ops.c (tweak_entries, svn_wc__do_update_cleanup): Properly tweak excluded entry. * subversion/libsvn_wc/ambient_depth_filter_editor.c (make_dir_baton): Update the filter logic. * subversion/libsvn_wc/crop.c (svn_wc_crop_tree): Remove the defensive check against excluded target. * subversion/libsvn_wc/entries.c (read_entries): * subversion/libsvn_wc/lock.c (prune_deleted): Update behavior to take svn_depth_exclude into account. * subversion/libsvn_wc/update_editor.c (complete_directory): Clear the exclude flag properly when needed. * subversion/svn/main.c (main): Accept value 'exclude' for the --set-depth option. ------------------------------------------------------------------------ r31714 | julianfoad | 2008-06-12 17:50:23 +0200 (Thu, 12 Jun 2008) | 16 lines Changed paths: M /trunk/subversion/libsvn_client/info.c M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/libsvn_wc/adm_ops.c Simplify some code paths that walk a WC, by removing the special case processing of a single file or non-recursive directory. The generic walker function svn_wc_walk_entries3() can already handle those non-recursive cases itself. No functional change. * subversion/libsvn_client/info.c (crawl_entries): Don't special-case a single file. * subversion/libsvn_client/merge.c (get_mergeinfo_paths): Don't special-case a single file. * subversion/libsvn_wc/adm_ops.c (svn_wc_resolved_conflict3): Don't special-case depth=empty. ------------------------------------------------------------------------ r31715 | julianfoad | 2008-06-12 18:50:20 +0200 (Thu, 12 Jun 2008) | 6 lines Changed paths: M /trunk/subversion/svn/main.c Update a help string to reflect the required syntax. * subversion/svn/main.c (svn_cl__cmd_table): Include "--accept" in the usage string for "svn resolve" as this "option" is required. ------------------------------------------------------------------------ r31716 | julianfoad | 2008-06-12 22:51:23 +0200 (Thu, 12 Jun 2008) | 1 line Changed paths: M /branches/tree-conflicts M /branches/tree-conflicts/CHANGES M /branches/tree-conflicts/COMMITTERS M /branches/tree-conflicts/Makefile.in M /branches/tree-conflicts/build.conf M /branches/tree-conflicts/configure.ac M /branches/tree-conflicts/contrib/client-side/diffwrap.bat M /branches/tree-conflicts/notes/EuroOSCON-2005-vc-bof.txt M /branches/tree-conflicts/notes/cli-repo-root-relative-support.txt M /branches/tree-conflicts/notes/commit-access-templates/contrib-committer.tmpl M /branches/tree-conflicts/notes/commit-access-templates/full-committer.tmpl M /branches/tree-conflicts/notes/commit-access-templates/partial-committer.tmpl M /branches/tree-conflicts/notes/dump-load-format.txt M /branches/tree-conflicts/notes/fsfs M /branches/tree-conflicts/notes/interactive-conflict-resolution.txt M /branches/tree-conflicts/notes/l10n-problems M /branches/tree-conflicts/notes/obliterate/obliterate-functional-spec.txt M /branches/tree-conflicts/notes/skip-deltas M /branches/tree-conflicts/notes/sql-backend M /branches/tree-conflicts/notes/ssh-tricks M /branches/tree-conflicts/notes/svnsync.txt M /branches/tree-conflicts/notes/test-writing M /branches/tree-conflicts/notes/tree-conflicts/design-overview.txt M /branches/tree-conflicts/notes/tree-conflicts/detection.txt M /branches/tree-conflicts/notes/tree-conflicts/requirements.txt A /branches/tree-conflicts/notes/tree-conflicts/resolution.txt (from /trunk/notes/tree-conflicts/resolution.txt:31715) M /branches/tree-conflicts/notes/wc-improvements M /branches/tree-conflicts/subversion/bindings/javahl/native/SVNClient.cpp M /branches/tree-conflicts/subversion/bindings/swig/core.i M /branches/tree-conflicts/subversion/bindings/swig/perl/native/t/6ra.t A /branches/tree-conflicts/subversion/include/private/svn_utf_private.h (from /trunk/subversion/include/private/svn_utf_private.h:31715) M /branches/tree-conflicts/subversion/include/svn_cache.h M /branches/tree-conflicts/subversion/include/svn_io.h M /branches/tree-conflicts/subversion/include/svn_ra.h M /branches/tree-conflicts/subversion/include/svn_repos.h M /branches/tree-conflicts/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c M /branches/tree-conflicts/subversion/libsvn_auth_kwallet/kwallet.cpp M /branches/tree-conflicts/subversion/libsvn_client/changelist.c M /branches/tree-conflicts/subversion/libsvn_client/diff.c M /branches/tree-conflicts/subversion/libsvn_client/info.c M /branches/tree-conflicts/subversion/libsvn_client/merge.c M /branches/tree-conflicts/subversion/libsvn_client/resolved.c M /branches/tree-conflicts/subversion/libsvn_client/revert.c M /branches/tree-conflicts/subversion/libsvn_delta/depth_filter_editor.c M /branches/tree-conflicts/subversion/libsvn_ra_neon/commit.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/auth.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/blame.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/commit.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/getlocations.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/getlocationsegments.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/locks.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/log.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/mergeinfo.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/property.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/ra_serf.h M /branches/tree-conflicts/subversion/libsvn_ra_serf/serf.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/update.c M /branches/tree-conflicts/subversion/libsvn_ra_serf/util.c M /branches/tree-conflicts/subversion/libsvn_ra_svn/client.c M /branches/tree-conflicts/subversion/libsvn_repos/commit.c M /branches/tree-conflicts/subversion/libsvn_repos/fs-wrap.c M /branches/tree-conflicts/subversion/libsvn_repos/hooks.c M /branches/tree-conflicts/subversion/libsvn_subr/cache-memcache.c M /branches/tree-conflicts/subversion/libsvn_subr/cmdline.c M /branches/tree-conflicts/subversion/libsvn_subr/config_file.c M /branches/tree-conflicts/subversion/libsvn_subr/prompt.c M /branches/tree-conflicts/subversion/libsvn_subr/utf_impl.h M /branches/tree-conflicts/subversion/libsvn_wc/adm_ops.c M /branches/tree-conflicts/subversion/libsvn_wc/entries.c M /branches/tree-conflicts/subversion/po/es.po M /branches/tree-conflicts/subversion/po/ja.po M /branches/tree-conflicts/subversion/po/pl.po M /branches/tree-conflicts/subversion/svn/main.c M /branches/tree-conflicts/subversion/svn_private_config.hw M /branches/tree-conflicts/subversion/svnserve/serve.c M /branches/tree-conflicts/subversion/tests/cmdline/depth_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/diff_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout M /branches/tree-conflicts/subversion/tests/cmdline/merge_tests.py M /branches/tree-conflicts/subversion/tests/cmdline/svntest/main.py M /branches/tree-conflicts/subversion/tests/cmdline/switch_tests.py M /branches/tree-conflicts/subversion/tests/libsvn_repos/repos-test.c M /branches/tree-conflicts/subversion/tests/libsvn_subr/path-test.c M /branches/tree-conflicts/subversion/tests/libsvn_subr/target-test.c M /branches/tree-conflicts/tools/dev/graph-dav-servers.py M /branches/tree-conflicts/tools/dist/construct-rolling-environment.sh A /branches/tree-conflicts/tools/dist/getsigs.py (from /trunk/tools/dist/getsigs.py:31715) M /branches/tree-conflicts/tools/dist/write-announcement.py M /branches/tree-conflicts/tools/po/po-update.sh M /branches/tree-conflicts/tools/server-side/svn_server_log_parse.py M /branches/tree-conflicts/tools/server-side/test_svn_server_log_parse.py M /branches/tree-conflicts/www/bugs.html A /branches/tree-conflicts/www/development.html (from /trunk/www/development.html:31715) A /branches/tree-conflicts/www/features.html (from /trunk/www/features.html:31715) A /branches/tree-conflicts/www/getting.html (from /trunk/www/getting.html:31715) D /branches/tree-conflicts/www/getting_subversion.html M /branches/tree-conflicts/www/hacking.html D /branches/tree-conflicts/www/images/aix.gif A /branches/tree-conflicts/www/images/aix.png (from /trunk/www/images/aix.png:31715) D /branches/tree-conflicts/www/images/bsddaemon.png D /branches/tree-conflicts/www/images/debian.jpg A /branches/tree-conflicts/www/images/debian.png (from /trunk/www/images/debian.png:31715) A /branches/tree-conflicts/www/images/fedora.png (from /trunk/www/images/fedora.png:31715) A /branches/tree-conflicts/www/images/freebsd.png (from /trunk/www/images/freebsd.png:31715) D /branches/tree-conflicts/www/images/hp.jpg A /branches/tree-conflicts/www/images/hp.png (from /trunk/www/images/hp.png:31715) D /branches/tree-conflicts/www/images/i5os.png A /branches/tree-conflicts/www/images/mac.png (from /trunk/www/images/mac.png:31715) A /branches/tree-conflicts/www/images/netbsd.png (from /trunk/www/images/netbsd.png:31715) D /branches/tree-conflicts/www/images/openbsd-puffy.gif A /branches/tree-conflicts/www/images/openbsd.png (from /trunk/www/images/openbsd.png:31715) D /branches/tree-conflicts/www/images/osx.gif D /branches/tree-conflicts/www/images/sol7logo.gif A /branches/tree-conflicts/www/images/solaris.png (from /trunk/www/images/solaris.png:31715) D /branches/tree-conflicts/www/images/src-pkg.png M /branches/tree-conflicts/www/images/svn-dav-securityspace-survey.png M /branches/tree-conflicts/www/images/ubuntu.png D /branches/tree-conflicts/www/images/win32.png A /branches/tree-conflicts/www/images/windows.png (from /trunk/www/images/windows.png:31715) M /branches/tree-conflicts/www/index.html A /branches/tree-conflicts/www/issue-tracker.html (from /trunk/www/issue-tracker.html:31715) M /branches/tree-conflicts/www/links.html M /branches/tree-conflicts/www/mailing-list-guidelines.html A /branches/tree-conflicts/www/mailing-lists.html (from /trunk/www/mailing-lists.html:31715) M /branches/tree-conflicts/www/project_development.html M /branches/tree-conflicts/www/project_issues.html M /branches/tree-conflicts/www/project_packages.html M /branches/tree-conflicts/www/project_tasks.html M /branches/tree-conflicts/www/project_tools.html M /branches/tree-conflicts/www/release-process.html M /branches/tree-conflicts/www/roadmap.html M /branches/tree-conflicts/www/svn-dav-securityspace-survey.html M /branches/tree-conflicts/www/svn_1.2_releasenotes.html M /branches/tree-conflicts/www/svn_1.3_releasenotes.html M /branches/tree-conflicts/www/svn_1.5_releasenotes.html A /branches/tree-conflicts/www/tasks.html (from /trunk/www/tasks.html:31715) On the tree-conflicts branch, merge outstanding changes from trunk. ------------------------------------------------------------------------ r31717 | arfrever | 2008-06-12 23:43:54 +0200 (Thu, 12 Jun 2008) | 15 lines Changed paths: M /trunk/build/ac-macros/apache.m4 M /trunk/build/ac-macros/apr.m4 M /trunk/build/ac-macros/aprutil.m4 M /trunk/configure.ac Fix Issue #2671. Make `configure` prefer APR 1.* instead of APR 0.* if both are present. * configure.ac: Move the check for Apache after the check for APR. * build/ac-macros/apr.m4 (SVN_LIB_APR): Prefer APR 1.* instead of APR 0.* if both are present. * build/ac-macros/aprutil.m4 (SVN_LIB_APRUTIL): Prefer APR-Util 1.* instead of APR-Util 0.* if both are present. * build/ac-macros/apache.m4 (SVN_FIND_APACHE): Check if Apache version is compatible with APR version. ------------------------------------------------------------------------ r31718 | arfrever | 2008-06-13 00:25:03 +0200 (Fri, 13 Jun 2008) | 4 lines Changed paths: M /trunk/subversion/po/pl.po Polish translation update. * subversion/po/pl.po: Polish translation update. ------------------------------------------------------------------------ r31719 | markphip | 2008-06-13 02:06:34 +0200 (Fri, 13 Jun 2008) | 14 lines Changed paths: M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java M /trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java JavaHL: Fix potential ArrayIndexOutOfBoundsException in singleStatus method. Happens when method is called on a non-existent path within the working copy. [ in subversion/bindings/javahl/ ] * tests/org/tigris/subversion/javahl/BasicTests.java (testBasicStatus): Added test for non-existent file. * src/org/tigris/subversion/javahl/SVNClient.java (singleStatus): Check array length before referencing an element from the array. Found by: Tomas Stupka ------------------------------------------------------------------------ r31720 | markphip | 2008-06-13 02:08:12 +0200 (Fri, 13 Jun 2008) | 1 line Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate and vote for r31719. ------------------------------------------------------------------------ r31721 | blair | 2008-06-13 02:21:20 +0200 (Fri, 13 Jun 2008) | 3 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Vote for r31719. ------------------------------------------------------------------------ r31722 | arfrever | 2008-06-13 04:35:38 +0200 (Fri, 13 Jun 2008) | 8 lines Changed paths: M /trunk/build/generator/gen_win.py Follow-up to r31425: Define some definitions also on Windows. * build/generator/gen_win.py (WinGeneratorBase.get_win_defines): Define SVN_HAVE_NEON when support for Neon is enabled. Define SVN_HAVE_SERF when support for Serf is enabled. ------------------------------------------------------------------------ r31723 | arfrever | 2008-06-13 04:48:28 +0200 (Fri, 13 Jun 2008) | 2 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Add r31722 to the r31425 group and vote for some revisions. ------------------------------------------------------------------------ r31724 | firemeteor | 2008-06-13 10:23:11 +0200 (Fri, 13 Jun 2008) | 14 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_wc/adm_crawler.c M /branches/issue-2843-dev/subversion/libsvn_wc/ambient_depth_filter_editor.c M /branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c On the issue-2843-dev branch: Make 'svn update' totally work for svn_depth_exclude. The next step will be a test suite for this. * subversion/libsvn_wc/ambient_depth_filter_editor.c (make_dir_baton): Permit to explicitly pull in excluded target. * subversion/libsvn_wc/update_editor.c (complete_directory): Similarly, clear the exclude flag in this situation. * subversion/libsvn_wc/adm_crawler.c (report_revision_and_depths): Explicitly report exclude. (svn_wc_crawl_revisions3): Document update. ------------------------------------------------------------------------ r31725 | stsp | 2008-06-13 12:43:20 +0200 (Fri, 13 Jun 2008) | 24 lines Changed paths: M /trunk/subversion/libsvn_ra_local/split_url.c M /trunk/subversion/libsvn_subr/path.c M /trunk/subversion/tests/libsvn_subr/path-test.c Canonicalise URIs which have an empty hostname part correctly. This fixes the crash described in #2116 ('svn log file:///' results in a failed assertion). * subversion/libsvn_subr/path.c (svn_path_canonicalize): We used to strip the trailing slash of URIs with no hostname, e.g. http:// got canonicalised to http:/ Don't do that! * subversion/tests/libsvn_subr/path-test.c (test_canonicalize): Add some test cases for the above. * subversion/libsvn_ra_local/split_url.c (svn_ra_local__split_URL): Treat file:// equivalent to file:///. This function used to complain about a missing hostname when just passed "file://". But "file://" is the canonical version of "file:///", which is equivalent to "file://localhost/". skip_uri_scheme() (in subversion/libsvn_subr/path.c) and therefore svn_path_is_url() have been considering "file://" a valid URL since r14445. Review by: danielsh ------------------------------------------------------------------------ r31726 | cmpilato | 2008-06-13 14:49:34 +0200 (Fri, 13 Jun 2008) | 8 lines Changed paths: M /trunk/Makefile.in Make install-javahl depend on javahl. * Makefile.in (install-javahl): Add javahl as a dependency for installing javahl. This ensures building javahl before we install. Patch by: stylesen ------------------------------------------------------------------------ r31727 | cmpilato | 2008-06-13 15:07:36 +0200 (Fri, 13 Jun 2008) | 10 lines Changed paths: M /trunk/contrib/client-side/svnmerge/svnmerge.py Add support for --config-dir to svnmerge.py. * contrib/client-side/svnmerge/svnmerge.py (launchsvn): Rework this function a bit, and while here, handle the config-dir options dictionary item. (global_opts): Add handling for new --config-dir/-c option. Patch by: Nicolas PAYART (Tweaked heavily by me.) ------------------------------------------------------------------------ r31728 | blair | 2008-06-13 16:28:08 +0200 (Fri, 13 Jun 2008) | 3 lines Changed paths: M /branches/1.5.x/STATUS * STATUS: Nominate r31727. ------------------------------------------------------------------------ r31729 | blair | 2008-06-13 17:12:13 +0200 (Fri, 13 Jun 2008) | 10 lines Changed paths: M /branches/file-externals/subversion/libsvn_wc/entries.c In the file externals branch. Preparing to allow file externals to generate an error when generating the output for the entries file in case the internal data is invalid. * subversion/libsvn_wc/entries.c (write_entry): Return an svn_error_t * instead of void. Change all callers to wrap the write_entry() call in SVN_ERR(). ------------------------------------------------------------------------ r31730 | blair | 2008-06-13 17:24:25 +0200 (Fri, 13 Jun 2008) | 7 lines Changed paths: M /branches/file-externals/subversion/libsvn_wc/entries.c In the file externals branch. * subversion/libsvn_wc/entries.c (write_entry): Now that write_entry() can return an error, do not assert() that name is non-NULL, just return a SVN_ERR_INCORRECT_PARAMS error. ------------------------------------------------------------------------ r31731 | kfogel | 2008-06-13 19:23:34 +0200 (Fri, 13 Jun 2008) | 6 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c On the issue-2843-dev branch: * subversion/libsvn_wc/crop.c (IGNORE_LOCAL_MOD): New name for SVN_ERR_IGNORE_LOCAL_MOD, and document. All callers changed. ------------------------------------------------------------------------ r31732 | danielsh | 2008-06-14 15:50:20 +0200 (Sat, 14 Jun 2008) | 5 lines Changed paths: M /trunk/COPYING M /trunk/subversion/LICENSE Happy new year! * COPYING, * subversion/LICENSE: Update copyright year. ------------------------------------------------------------------------ r31733 | danielsh | 2008-06-14 18:54:39 +0200 (Sat, 14 Jun 2008) | 7 lines Changed paths: M /trunk/build/generator/gen_win.py Follow up to r31121: declare NDEBUG when building in release mode on Windows. * build/generator/gen_win.py (get_win_defines): Define NDEBUG when configuration is 'Release'. Patch by: Bert Huijben ------------------------------------------------------------------------ r31734 | djames | 2008-06-14 23:14:03 +0200 (Sat, 14 Jun 2008) | 7 lines Changed paths: M /branches/ctypes-python-bindings/test/localrepos.py M /branches/ctypes-python-bindings/test/remoterepos.py M /branches/ctypes-python-bindings/test/run_all.py A /branches/ctypes-python-bindings/test/setup_path.py M /branches/ctypes-python-bindings/test/svntypes.py M /branches/ctypes-python-bindings/test/wc.py On the ctypes-python-bindings branch: Add module for setting up path, and make sure that all of the test scripts use it. Also convert eol-style to native. Branch: ctypes-python-bindings ------------------------------------------------------------------------ r31735 | djames | 2008-06-14 23:25:23 +0200 (Sat, 14 Jun 2008) | 4 lines Changed paths: M /branches/ctypes-python-bindings/csvn/wc.py In the ctypes-python-bindings branch: * wc.py: Make sure all functions clear the iterpool before returning ------------------------------------------------------------------------ r31736 | djames | 2008-06-14 23:28:06 +0200 (Sat, 14 Jun 2008) | 5 lines Changed paths: M /branches/ctypes-python-bindings/csvn/auth.py In the ctypes-python-bindings branch: * csvn/auth.py (User.setup_auth_baton): Pass in NULL pointer using different method to keep ctypes happy. (Not sure why this is necessary.) ------------------------------------------------------------------------ r31737 | kfogel | 2008-06-15 03:46:58 +0200 (Sun, 15 Jun 2008) | 8 lines Changed paths: M /trunk/subversion/bindings/javahl/native/JNIUtil.cpp Fix a compile error when building javahl with nls support for Windows x64. Patch by: Jens Peters * subversion/bindings/javahl/native/JNIUtil.cpp (JNIUtil::JNIGlobalInit): Change the type of 'inwords' and 'outbytes' to apr_size_t. ------------------------------------------------------------------------ r31738 | djames | 2008-06-15 04:21:17 +0200 (Sun, 15 Jun 2008) | 15 lines Changed paths: M /branches/ctypes-python-bindings/csvn/repos.py M /branches/ctypes-python-bindings/csvn/wc.py In the ctypes-python-bindings branch: Sweep through bindings cleaning up our usage of pools and pointers to make sure it is consistent throughout. * repos.py (RemoteRepository.list, RemoteRepository.cat, RemoteRepository.info, RemoteRepository.proplist, RemoteRepository.revprop_list, RemoteRepository.revprop_list, RemoteRepository.svnimport, LocalRepository.check_path, LocalRepository.get_rev_prop, LocalRepository.load): Clear iteration pools. Cleanup pool and pointer handling. * wc.py (WC.export, WC.mkdir, WC.proplist, WC.propget, WC.status, WC.info, WC.commit, WC.update, WC.switch, WC.lock, WC.unlock): Ditto. ------------------------------------------------------------------------ r31739 | kfogel | 2008-06-15 05:37:37 +0200 (Sun, 15 Jun 2008) | 11 lines Changed paths: M /trunk/subversion/include/svn_error_codes.h M /trunk/subversion/libsvn_ra/ra_loader.c M /trunk/subversion/libsvn_ra_neon/session.c M /trunk/subversion/libsvn_ra_serf/util.c M /trunk/subversion/libsvn_subr/config.c M /trunk/subversion/libsvn_subr/simple_providers.c Use a non-DAV-specific error code for invalid configuration values. * subversion/include/svn_error_codes.h (SVN_ERR_BAD_CONFIG_VALUE): New error code. (SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE): Deprecate. * everwhere: Use the new error code in place of the old one. No doc strings explicitly promised the old error code, and it's just config stuff, not server errors or something, so there shouldn't be a compatibility issue here. ------------------------------------------------------------------------ r31740 | djames | 2008-06-15 07:48:46 +0200 (Sun, 15 Jun 2008) | 9 lines Changed paths: M /branches/ctypes-python-bindings/test/localrepos.py M /branches/ctypes-python-bindings/test/remoterepos.py M /branches/ctypes-python-bindings/test/wc.py In ctypes-python-bindings branch: Update test suite to work better on Windows. * test/wc.py, test/localrepos.py, test/remoterepos.py (tearDown): Use svn_repos_delete and svn_io_remove_dir instead of shutil.remove_tree to remove repositories and working copies, for compatibility with Windows. (repos_url): Don't add extra slashes that are already present on Windows. ------------------------------------------------------------------------ r31741 | firemeteor | 2008-06-15 10:24:37 +0200 (Sun, 15 Jun 2008) | 20 lines Changed paths: M /branches/issue-2843-dev/subversion/libsvn_wc/adm_crawler.c M /branches/issue-2843-dev/subversion/libsvn_wc/adm_ops.c M /branches/issue-2843-dev/subversion/libsvn_wc/ambient_depth_filter_editor.c M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c On the issue-2843-dev branch. Some tweaks according to Karl's review. * subversion/libsvn_wc/crop.c (svn_wc_crop_tree): Use a specialized TODO mask. (crop_children): The same, also add some documents. * subversion/libsvn_wc/ambient_depth_filter_editor.c (make_dir_baton): enclose boolean expression with parens. * subversion/libsvn_wc/adm_crawler.c (report_revisions_and_depths): Update comment. * subversion/libsvn_wc/adm_ops.c (tweak_entries): Update comment. (svn_wc_remove_from_revision_control): Use a block-local variable for readability.