[[[[ crazycat ]]]] ------------------------------------------------------------------------ r34404 | julianfoad | 2008-11-25 15:35:56 +0100 (Tue, 25 Nov 2008) | 5 lines Changed paths: M /branches/tc_url_rev/subversion/libsvn_client/merge.c Fix a breakage from r34401. * subversion/libsvn_client/merge.c (tree_conflict): Initialise 'src_repos_url' before using it. ------------------------------------------------------------------------ r34406 | julianfoad | 2008-11-25 16:26:20 +0100 (Tue, 25 Nov 2008) | 7 lines Changed paths: M /branches/tc_url_rev/subversion/tests/cmdline/stat_tests.py On the 'tc_url_rev' branch: Fix a test expectation. * subversion/tests/cmdline/stat_tests.py (status_with_tree_conflicts): Update the format of conflict report lines in 'status' output. ------------------------------------------------------------------------ r34415 | hwright | 2008-11-25 17:13:59 +0100 (Tue, 25 Nov 2008) | 10 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c On the fsfs-pack branch: Enable reading of the revision root in a packed file. * subversion/libsvn_fs_fs/fs_fs.c (get_packed_offset): New. (get_root_changes_offset): Seek to the correct location in a packed revision file. (svn_fs_fs__rev_get_root, svn_fs_fs__paths_changed, recover_body): Update parameters to get_root_changes_offset(). ------------------------------------------------------------------------ r34426 | lgo | 2008-11-25 23:27:03 +0100 (Tue, 25 Nov 2008) | 5 lines Changed paths: M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Test for filenames with spaces. * subversion/tests/libsvn_subr/dirent_uri.c (test_dirent_is_canonical): add test for file name with spaces. ------------------------------------------------------------------------ r34428 | neels | 2008-11-26 03:36:58 +0100 (Wed, 26 Nov 2008) | 8 lines Changed paths: M /trunk/subversion/tests/cmdline/depth_tests.py * subversion/tests/cmdline/depth_tests.py (verify_lines, tree_conflicts_resolved_depth_immediates, tree_conflicts_resolved_depth_infinity): Reinstate a simpler way to pass four depth_tests.py that had been committed as part of the reverted r34235. Replacing the more complex alternative committed in r34345, but keep some tiny bits. In effect also reverting r34381 (which imported sys for verify_lines()). ------------------------------------------------------------------------ r34429 | julianfoad | 2008-11-26 12:43:03 +0100 (Wed, 26 Nov 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_fs_base/util/skel.h * subversion/libsvn_fs_base/util/skel.h Correct an inconsistency in the list of white-space characters in a doc string. ------------------------------------------------------------------------ r34432 | pburba | 2008-11-26 18:02:47 +0100 (Wed, 26 Nov 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Follow-up to r32975, fix bug with handling of paths which get explicit mergeinfo added during a merge when the merge is a --dry-run. See http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=145757. Found by: Michael Susser * subversion/libsvn_client/merge.c (merge_cmd_baton_t): Update comment for paths_with_new_mergeinfo member. (merge_props_changed): Don't create/populate paths_with_new_mergeinfo if this is a dry-run. (process_children_with_new_mergeinfo): Do nothing if the merge is a dry-run. ------------------------------------------------------------------------ r34434 | hwright | 2008-11-26 18:54:57 +0100 (Wed, 26 Nov 2008) | 14 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/tests/cmdline/svnadmin_tests.py Fix a misplaced conditional in r34378, and remove the hack in r34398. Patch by: Marc Haesen me * subversion/tests/cmdline/svnadmin_tests.py (verify_incremental_fsfs): Update expected error output. * subversion/libsvn_fs_fs/fs_fs.c (representation_string): Output the sha1 if our format is greater or equal to the supported one, not vice versa. (write_final_rev): Remove conditional added in r34398, since the bug is no longer present. ------------------------------------------------------------------------ r34435 | julianfoad | 2008-11-26 19:42:11 +0100 (Wed, 26 Nov 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c * subversion/libsvn_client/merge.c (tree_conflict): Fix the doc string which was out of date. ------------------------------------------------------------------------ r34436 | julianfoad | 2008-11-26 19:43:09 +0100 (Wed, 26 Nov 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Fix the tree conflict URL information stored by a merge: the URLs of the root of the merge were stored instead of the URLs of the conflict victim. Found by: neels * subversion/libsvn_client/merge.c (tree_conflict): Construct and store the source URLs of the victim. ------------------------------------------------------------------------ r34437 | julianfoad | 2008-11-26 20:03:25 +0100 (Wed, 26 Nov 2008) | 17 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Don't raise a tree conflict when a to-be-added file is obstructed by an unversioned file. (Part of issue #3161.) Patch by: neels me (I adjusted tree_conflicts_and_obstructions().) * subversion/libsvn_client/merge.c (merge_file_added): If there is an unversioned obstruction, just skip, don't raise a tree conflict. * subversion/tests/cmdline/merge_tests.py (merge_skips_obstructions): Adjust expectations accordingly. (verify_lines, verify_tree_conflict_info): Delete, as no longer needed. (tree_conflicts_and_obstructions): Expect the obstruction to be skipped rather than conflicted. ------------------------------------------------------------------------ r34438 | hwright | 2008-11-26 21:03:03 +0100 (Wed, 26 Nov 2008) | 12 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c M /branches/fsfs-pack/subversion/libsvn_fs_fs/tree.c On the fsfs-pack branch: When opening a packed file, seek to the correct offset for a given revision. Note: the diff is rather large, primarily due to come code shuffling. * subversion/libsvn_fs_fs/fs_fs.c (open_and_seek_revision): Use the open_pack_or_rev_file() API to actually open the file, and if using a pack file, obtain and apply the correct offset. [Accidental changes to subversion/libsvn_fs_fs/tree.c were reverted in r34439.] ------------------------------------------------------------------------ r34439 | hwright | 2008-11-26 21:04:24 +0100 (Wed, 26 Nov 2008) | 4 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/tree.c On the fsfs-pack branch: * subversion/libsvn_fs_fs/tree.c: Gah! Revert accidental changes made in r34438. ------------------------------------------------------------------------ r34440 | xsteve | 2008-11-26 21:15:46 +0100 (Wed, 26 Nov 2008) | 6 lines Changed paths: M /trunk/contrib/client-side/emacs/psvn.el Fixed an emacs21.3 compatibility bug * trunk/contrib/client-side/emacs/psvn.el: (svn-substring-no-properties): Ensure that the from parameter is given when calling substring ------------------------------------------------------------------------ r34441 | hwright | 2008-11-26 21:17:40 +0100 (Wed, 26 Nov 2008) | 6 lines Changed paths: M /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c On the fsfs-pack branch: Update fs-pack-test 2 to look for iota starting in revision 1, not 0. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (read_packed_fs): Fix off-by-one error. ------------------------------------------------------------------------ r34442 | hwright | 2008-11-26 23:10:22 +0100 (Wed, 26 Nov 2008) | 9 lines Changed paths: M /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c On the fsfs-pack branch: Fix a couple of tests, their generation and expectations. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (create_packed_filesystem): Correct another off-by-one error and generate the file contents for the correct revision. (read_packed_fs): Expect the proper contents for the first revision of 'iota', which is just the vanilla text populated in the standard greek tree. ------------------------------------------------------------------------ r34443 | hwright | 2008-11-26 23:13:24 +0100 (Wed, 26 Nov 2008) | 8 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c On the fsfs-pack branch: Fix another instance of packed file offset calculation. * subversion/libsvn_fs_fs/fs_fs.c (get_fs_id_at_offset): If looking at a packed file, seek the correct offset. (svn_fs_fs__rev_get_root): Pass additional parameters to get_fs_id_at_offset(). ------------------------------------------------------------------------ r34444 | hwright | 2008-11-26 23:54:03 +0100 (Wed, 26 Nov 2008) | 13 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c M /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c On the fsfs-pack branch: Handle the corner case of looking for the root revision for a rev which is a multiple of the shard size plus one. Although it sounds scary, this just means searching for the end of the pack file just as we always do, instead of getting a revision offset when looking for the revision root information. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (test_funcs): Update read_packed_fs to be Pass. * subversion/libsvn_fs_fs/fs_fs.c (get_root_changes_offset): Update the conditional to ensure every revision sets the seek location and offset. ------------------------------------------------------------------------ r34445 | hwright | 2008-11-26 23:59:18 +0100 (Wed, 26 Nov 2008) | 7 lines Changed paths: M /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c On the fsfs-pack branch: Fix the last failing test by updating the anchor revision for the commit. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (commit_packed_fs): Update anchor revision for the test commit. (test_funcs): Mark commit_packed_fs as Pass. ------------------------------------------------------------------------ r34447 | hwright | 2008-11-27 06:09:19 +0100 (Thu, 27 Nov 2008) | 5 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c On the fsfs-pack branch: * subversion/libsvn_fs_fs/fs_fs.c (open_pack_or_rev_file): Only attempt to open the packed file if the filesystem format is suitably modern. ------------------------------------------------------------------------ r34448 | lgo | 2008-11-27 10:53:55 +0100 (Thu, 27 Nov 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/commit.c ra_serf: Fix commit test 26. * subversion/libsvn_ra_serf/commit.c (return_response_err): Try to create a more specific error message for the status code, so that the error output is consistent with ra_neon. ------------------------------------------------------------------------ r34449 | hwright | 2008-11-27 22:13:00 +0100 (Thu, 27 Nov 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c A bit of tryptophan-induced hacking: Use a string buf when writing the FSFS format file, to enable easy addition of additional options in that file. * subversion/libsvn_fs_fs/fs_fs.c (write_format): Simplify format file content generation. ------------------------------------------------------------------------ r34452 | neels | 2008-11-28 00:05:03 +0100 (Fri, 28 Nov 2008) | 28 lines Changed paths: M /branches/merge-skips-obstructions/subversion/libsvn_client/merge.c M /branches/merge-skips-obstructions/subversion/tests/cmdline/merge_tests.py On branch merge-skips-obstructions: Check in first patch version by julianf. Make "merge" check for obstructions and skip them, before looking for tree conflicts. Adjust tests accordingly. Note: This patch makes a bunch of code redundant in each of the merge callbacks, but does not remove or tidy up that code. ### Tests failing: XPASS: merge_tests.py 19: merge should skip over unversioned obstructions FAIL: merge_tests.py 27: merge between branches (Issue #2222) FAIL: merge_tests.py 32: merge a replacement of a file FAIL: merge_tests.py 35: merge a replacement of a file to mixed rev wc FAIL: revert_tests.py 6: revert a merge replacement of file with history FAIL: revert_tests.py 15: revert a committed replace-with-history == no-op * subversion/libsvn_client/merge.c (dry_run_deleted_p): Tweak the signature: accept a 'const' baton. (node_kind_working, node_kind_on_disk, obstructed_or_missing): New functions. (merge_props_changed, merge_file_changed, merge_file_added, merge_file_deleted, merge_dir_added, merge_dir_deleted): Use obstructed_or_missing() to check for obstructions early on. * subversion/tests/cmdline/merge_tests.py (merge_skips_obstructions): Adjust accordingly. (test_list): Remove the 'XFail' expectation from that test. ------------------------------------------------------------------------ r34453 | neels | 2008-11-28 01:29:15 +0100 (Fri, 28 Nov 2008) | 14 lines Changed paths: M /branches/merge-skips-obstructions/subversion/libsvn_client/merge.c On branch merge-skips-obstructions: Fix false positive in missing-node detection in dry_run merge. This fixes the test runs merge_tests.py 32 35 revert_tests.py 6 15 * subversion/libsvn_client/merge.c (node_kind_working): Add MERGE_B argument. Use this to make assumptions about the working kind in case of a MERGE_B->dry_run. (obstructed_or_missing): Pass MERGE_B. ------------------------------------------------------------------------ r34454 | neels | 2008-11-28 03:42:49 +0100 (Fri, 28 Nov 2008) | 41 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py M /trunk/subversion/tests/cmdline/switch_tests.py M /trunk/subversion/tests/cmdline/update_tests.py Visit tree-conflicts cmdline tests for update, switch and merge. Really expect all the desired behaviour, not accepting those known errors that we passed to aid the ongoing development on tree-conflicts, anymore. That adds a few XFails. Streamline the composition of expected output, so that it is much shorter and easier to read, as was still not done in some places. * subversion/tests/cmdline/merge_tests.py (deep_trees_conflict_output): New global ref. (tree_conflicts_on_merge_local_ci_4_1, tree_conflicts_on_merge_local_ci_4_2, tree_conflicts_on_merge_local_ci_6, tree_conflicts_on_merge_no_local_ci_4_1, tree_conflicts_on_merge_no_local_ci_4_2, tree_conflicts_on_merge_no_local_ci_6): Streamline. (tree_conflicts_on_merge_local_ci_5_1, tree_conflicts_on_merge_local_ci_5_2, tree_conflicts_on_merge_no_local_ci_5_1, tree_conflicts_on_merge_no_local_ci_5_2): Streamline, modify and XFail. * subversion/tests/cmdline/switch_tests.py (state_empty_dirs): Rename global ref... (disk_empty_dirs): ...to this. (tree_conflicts_on_switch_1_1, tree_conflicts_on_switch_1_2, tree_conflicts_on_switch_3): Apply rename. (tree_conflicts_on_switch_2_2): Streamline, modify and XFail. * subversion/tests/cmdline/update_tests.py (state_empty_dirs): Rename global ref... (disk_empty_dirs): ...to this. (tree_conflicts_on_update_1_1, tree_conflicts_on_update_1_2, tree_conflicts_on_update_3): Apply rename. (tree_conflicts_on_update_2_2): Streamline, modify and XFail. ------------------------------------------------------------------------ r34455 | neels | 2008-11-28 04:05:06 +0100 (Fri, 28 Nov 2008) | 16 lines Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c M /trunk/subversion/tests/cmdline/switch_tests.py M /trunk/subversion/tests/cmdline/update_tests.py Fix tree-conflicts use case 2.2 (in update and switch). * subversion/libsvn_wc/update_editor.c (entry_has_local_mods): Add parameter SCHEDULE. Mark MODIFIED as true when anything is scheduled on the entry. (modcheck_found_entry): Pass SCHEDULE parameter. (check_tree_conflict): Pass SCHEDULE parameter. * subversion/tests/cmdline/update_tests.py (test_list): Unmark XFail on tree_conflicts_on_update_2_2. It passes now. * subversion/tests/cmdline/switch_tests.py (test_list): Unmark XFail on tree_conflicts_on_switch_2_2. It passes now. ------------------------------------------------------------------------ r34458 | hwright | 2008-11-28 07:23:35 +0100 (Fri, 28 Nov 2008) | 19 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs.h M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c M /branches/fsfs-pack/subversion/libsvn_fs_fs/structure On the fsfs-pack branch: Add a new file to the FSFS filesystem: max-packed-rev, which tracks the youngest revision currently in a packed file. * subversion/libsvn_fs_fs/fs_fs.c (path_max_packed_rev): New. (svn_fs_fs__open): Read the max-packed-rev file. (upgrade_body): Create the max-packed-rev file if needed. (svn_fs_fs__hotcopy): Copy the new file. (svn_fs_fs__create): Create the new file. * subversion/libsvn_fs_fs/fs.h (PATH_MAX_PACKED_REV): New. (fs_fs_data_t): New data member to keep track of the max packed rev in the filesystem. * subversion/libsvn_fs_fs/structure: Add a note about the max-packed-rev file. ------------------------------------------------------------------------ r34459 | rhuijben | 2008-11-28 09:44:28 +0100 (Fri, 28 Nov 2008) | 2 lines Changed paths: M /trunk/subversion/include/svn_subst.h * subversion/include/svn_subst.h (svn_subst_create_translated): Fix typo in documentation. ------------------------------------------------------------------------ r34460 | hwright | 2008-11-28 15:21:18 +0100 (Fri, 28 Nov 2008) | 16 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c M /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c On the fsfs-pack branch: Update max-packed-rev after packing a shard, and don't attempt to pack shards which have already been packed. This also simplifies the consistency checking operation and atomicity properties of packing a shard. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (pack_filesystem): Check for a correct value in max-packed-rev. * subversion/libsvn_fs_fs/fs_fs.c (read_max_packed_rev): New. (svn_fs_fs__open): Use the new helper function. (pack_shard): Update max-packed-rev when done packing a revision, and simplify the consistency checking using in packing a shard. (svn_fs_fs__pack): Read max-packed-rev, and only pack shard which haven't been packed yet. Add an early out if no shards need to be packed. ------------------------------------------------------------------------ r34461 | hwright | 2008-11-28 15:23:48 +0100 (Fri, 28 Nov 2008) | 6 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c On the fsfs-pack branch: * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__pack): When packing, move the check for a suitably new filesystem format to be sooner. We'd like this to be the first error returned when a user attempts to pack a repository. ------------------------------------------------------------------------ r34462 | hwright | 2008-11-28 15:28:58 +0100 (Fri, 28 Nov 2008) | 5 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c On the fsfs-pack branch: * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__pack): Followup to r34461: Make sure we check the format only *after* reading it. Sheesh. ------------------------------------------------------------------------ r34465 | arfrever | 2008-11-28 22:39:39 +0100 (Fri, 28 Nov 2008) | 34 lines Changed paths: M /trunk/build/generator/ezt.py M /trunk/build/generator/gen_base.py M /trunk/build/generator/gen_vcnet_vcproj.py M /trunk/build/generator/gen_win.py M /trunk/build/win32/make_dist.py M /trunk/gen-make.py M /trunk/subversion/bindings/ctypes-python/csvn/types.py M /trunk/subversion/bindings/ctypes-python/examples/log.py M /trunk/subversion/bindings/ctypes-python/examples/trunkify.py M /trunk/subversion/bindings/swig/python/tests/mergeinfo.py M /trunk/subversion/bindings/swig/python/tests/ra.py M /trunk/subversion/bindings/swig/python/tests/wc.py M /trunk/subversion/tests/cmdline/externals_tests.py M /trunk/subversion/tests/cmdline/svntest/actions.py M /trunk/tools/bdb/svn-bdb-view.py M /trunk/tools/dev/contribulyze.py M /trunk/tools/dev/gen-javahl-errors.py M /trunk/tools/dev/normalize-dump.py M /trunk/tools/dev/trails.py M /trunk/tools/dev/which-error.py M /trunk/tools/examples/svnshell.py M /trunk/tools/hook-scripts/mailer/mailer.py M /trunk/tools/hook-scripts/svnperms.py Python 3 compatibility: Use dict.keys(), dict.values() and dict.items() instead of dict.iterkeys(), dict.itervalues() and dict.iteritems(). Use list(dict.keys()), list(dict.values()) and list(dict.items()) instead of dict.keys(), dict.values() and dict.items(). Function calls with 'for', 'in' or len() weren't updated. * build/generator/ezt.py: * build/generator/gen_base.py: * build/generator/gen_vcnet_vcproj.py: * build/generator/gen_win.py: * build/win32/make_dist.py: * gen-make.py: * subversion/bindings/ctypes-python/csvn/types.py: * subversion/bindings/ctypes-python/examples/log.py: * subversion/bindings/ctypes-python/examples/trunkify.py: * subversion/bindings/swig/python/tests/mergeinfo.py: * subversion/bindings/swig/python/tests/ra.py: * subversion/bindings/swig/python/tests/wc.py: * subversion/tests/cmdline/externals_tests.py: * subversion/tests/cmdline/svntest/actions.py: * tools/bdb/svn-bdb-view.py: * tools/dev/contribulyze.py: * tools/dev/gen-javahl-errors.py: * tools/dev/normalize-dump.py: * tools/dev/trails.py: * tools/dev/which-error.py: * tools/examples/svnshell.py: * tools/hook-scripts/mailer/mailer.py: * tools/hook-scripts/svnperms.py: Use dict.keys(), dict.values() and dict.items() instead of dict.iterkeys(), dict.itervalues() and dict.iteritems(). Use list(dict.keys()), list(dict.values()) and list(dict.items()) instead of dict.keys(), dict.values() and dict.items(). ------------------------------------------------------------------------ r34466 | hwright | 2008-11-28 23:10:13 +0100 (Fri, 28 Nov 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (write_format): Followup to r34449: Add a newline at the end of a format option line for consistency. Suggested by: glasser ------------------------------------------------------------------------ r34467 | hwright | 2008-11-28 23:12:21 +0100 (Fri, 28 Nov 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__rev_get_root): Whitespace fix. ------------------------------------------------------------------------ r34468 | arfrever | 2008-11-28 23:27:13 +0100 (Fri, 28 Nov 2008) | 15 lines Changed paths: M /trunk/build/generator/gen_win.py M /trunk/subversion/bindings/ctypes-python/csvn/types.py Follow-up to r34465: * build/generator/gen_win.py (WinGeneratorBase.create_dll_target): Use dict.keys() instead of dict.iterkeys() for compatibility with Python 3. Fix 'RuntimeError: maximum recursion depth exceeded' in CSVN. The fix isn't compatible with Python 3, because Python 3 doesn't contain UserDict module. * subversion/bindings/ctypes-python/csvn/types.py (Hash._keys): New. (Hash.keys): Use Hash._keys(). (Hash.items): Renamed from ... (Hash.iteritems): ... this. ------------------------------------------------------------------------ r34469 | arfrever | 2008-11-29 00:54:06 +0100 (Sat, 29 Nov 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/swig/python/tests/trac/test.py Follow-up to r34359: * subversion/bindings/swig/python/tests/trac/test.py: Explicitly declare UTF-8 encoding for compatibility with Python 2. Found by: jwhitlock ------------------------------------------------------------------------ r34471 | arfrever | 2008-11-29 17:31:28 +0100 (Sat, 29 Nov 2008) | 25 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp M /trunk/subversion/include/svn_auth.h M /trunk/subversion/libsvn_subr/auth.c M /trunk/subversion/libsvn_subr/cmdline.c M /trunk/subversion/tests/libsvn_subr/auth-test.c Follow-up to r34399: Support the 'password-stores' configuration option in svn_auth_get_platform_specific_client_providers(). * subversion/include/svn_auth.h (svn_auth_get_platform_specific_client_providers): Add 'config' argument. (svn_auth_get_platform_specific_provider, svn_auth_get_platform_specific_client_providers): Delete partially misleading information from doc string. * subversion/libsvn_subr/auth.c (svn_auth_get_platform_specific_client_providers): Add 'config' argument. Use the 'password-stores' configuration option from 'config' to determine order of the platform-specific authentication providers. * subversion/libsvn_subr/cmdline.c (svn_cmdline_create_auth_baton): Update call to svn_auth_get_platform_specific_client_providers(). * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::getContext): Update call to svn_auth_get_platform_specific_client_providers(). * subversion/tests/libsvn_subr/auth-test.c (test_platform_specific_auth_providers): Update call to svn_auth_get_platform_specific_client_providers(). ------------------------------------------------------------------------ r34472 | arfrever | 2008-11-29 17:50:14 +0100 (Sat, 29 Nov 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_subr/auth.c Follow-up to r34471: * subversion/libsvn_subr/auth.c (svn_auth_get_platform_specific_client_providers): Fix copy/paste typo. ------------------------------------------------------------------------ r34473 | arfrever | 2008-11-29 17:59:52 +0100 (Sat, 29 Nov 2008) | 16 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/util.c Fix some compiler warnings: subversion/libsvn_ra_serf/util.c: In function ‘svn_ra_serf__conn_closed’: subversion/libsvn_ra_serf/util.c:339: warning: ‘return’ with a value, in \ function returning void subversion/libsvn_ra_serf/util.c: In function ‘svn_ra_serf__handle_xml_parser’: subversion/libsvn_ra_serf/util.c:1021: warning: return makes integer from \ pointer without a cast subversion/libsvn_ra_serf/util.c:1062: warning: return makes integer from \ pointer without a cast * subversion/libsvn_ra_serf/util.c (svn_ra_serf__conn_closed): Use SVN_ERR_MALFUNCTION_NO_RETURN() instead of SVN_ERR_MALFUNCTION(). (svn_ra_serf__handle_xml_parser): Use SVN_ERR_ASSERT_NO_RETURN() instead of SVN_ERR_ASSERT(). ------------------------------------------------------------------------ r34474 | hwright | 2008-11-29 19:49:25 +0100 (Sat, 29 Nov 2008) | 16 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/caching.c M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs.h M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c On the fsfs-pack branch: Cache revision offsets in the pack file, which prevents repeated opening and reading of the corresponding manifest file. I believe this change may also create performance parity with non-packed repositories, in terms of number of files opened and seeks performed, in the common case. * subversion/libsvn_fs_fs/fs_fs.c (get_packed_offset): Set and get the cache of revision->offset mappings. * subversion/libsvn_fs_fs/fs.h (fs_fs_data_t): Add the packed offset cache. * subversio/libsvn_fs_fs/caching.c (offset_serialize, offset_deserialize, dup_pack_offset): New. (svn_fs_fs__initialize_caches): Initialize the offset cache. ------------------------------------------------------------------------ r34475 | hwright | 2008-11-29 20:25:41 +0100 (Sat, 29 Nov 2008) | 4 lines Changed paths: M /branches/fsfs-pack/subversion/libsvn_fs_fs/structure On the fsfs-pack branch: * subversion/libsvn_fs_fs/structure: Update with some notes about packing. ------------------------------------------------------------------------ r34476 | arfrever | 2008-11-30 01:59:40 +0100 (Sun, 30 Nov 2008) | 4 lines Changed paths: M /trunk/subversion/po/pl.po Polish translation update. * subversion/po/pl.po: Polish translation update. ------------------------------------------------------------------------ r34477 | arfrever | 2008-11-30 03:54:56 +0100 (Sun, 30 Nov 2008) | 5 lines Changed paths: M /trunk/tools/dev/po-merge.py Follow-up to r34141: * tools/dev/po-merge.py (parse_translation, main): Support msgid_plural and msgstr[\d+]. ------------------------------------------------------------------------ r34478 | arfrever | 2008-11-30 16:08:24 +0100 (Sun, 30 Nov 2008) | 7 lines Changed paths: M /branches/svnpatch-diff/subversion/libsvn_client/deprecated.c On the 'svnpatch-diff' branch: Follow-up to r33978: Restore definitions of svn_client_diff4() and svn_client_diff_peg4(). * subversion/libsvn_client/deprecated.c (svn_client_diff4, svn_client_diff_peg4): Restore definitions. ------------------------------------------------------------------------ r34480 | sbutler | 2008-11-30 18:00:55 +0100 (Sun, 30 Nov 2008) | 25 lines Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c The tree-conflict detection code is now safe for serf (in update and switch, which weren't safe before). Instead of setting and unsetting a "global" current-conflict path, the update editor simply checks if the current path being deleted, added or opened is within an already-encountered conflict (tree or property). * subversion/libsvn_wc/update_editor.c (edit_baton): Rename skipped_paths field to skipped_trees, because we now skip all descendants of a conflicted directory. Remove the current_conflict field. (remember_skipped_path): Rename to... (remember_skipped_tree): ...this. (in_skipped_tree): New function. (complete_directory, do_entry_deletion, add_directory, open_directory, add_file, open_file, close_edit, make_editor): Track renames. Use in_skipped_tree() instead of checking the edit_baton->current_conflict field. Don't add redundant paths (i.e., descendants of already-visited conflicts) to the skipped_tree set. ------------------------------------------------------------------------ r34481 | arfrever | 2008-11-30 18:12:20 +0100 (Sun, 30 Nov 2008) | 3 lines Changed paths: M /branches/svnpatch-diff M /branches/svnpatch-diff/COMMITTERS M /branches/svnpatch-diff/TODO-1.6 M /branches/svnpatch-diff/build/generator/extractor.py M /branches/svnpatch-diff/build/generator/gen_vcnet_vcproj.py M /branches/svnpatch-diff/build/generator/gen_win.py M /branches/svnpatch-diff/build.conf M /branches/svnpatch-diff/configure.ac M /branches/svnpatch-diff/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py M /branches/svnpatch-diff/contrib/client-side/svnmucc/svnmucc-test.py M /branches/svnpatch-diff/contrib/client-side/svnmucc/svnmucc.c M /branches/svnpatch-diff/contrib/hook-scripts/commit-email.pl.in M /branches/svnpatch-diff/notes/http-protocol-v2.txt M /branches/svnpatch-diff/notes/tree-conflicts/all-tests.sh M /branches/svnpatch-diff/notes/tree-conflicts/design-overview.txt M /branches/svnpatch-diff/notes/tree-conflicts/requirements.txt M /branches/svnpatch-diff/notes/tree-conflicts/resolution.txt M /branches/svnpatch-diff/subversion/bindings/ctypes-python/csvn/repos.py M /branches/svnpatch-diff/subversion/bindings/ctypes-python/csvn/wc.py M /branches/svnpatch-diff/subversion/bindings/ctypes-python/examples/mucc.py M /branches/svnpatch-diff/subversion/bindings/ctypes-python/setup.py M /branches/svnpatch-diff/subversion/bindings/ctypes-python/test/localrepos.py M /branches/svnpatch-diff/subversion/bindings/ctypes-python/test/remoterepos.py M /branches/svnpatch-diff/subversion/bindings/ctypes-python/test/run_all.py M /branches/svnpatch-diff/subversion/bindings/ctypes-python/test/svntypes.py M /branches/svnpatch-diff/subversion/bindings/ctypes-python/test/wc.py M /branches/svnpatch-diff/subversion/bindings/javahl/native/EnumMapper.cpp M /branches/svnpatch-diff/subversion/bindings/javahl/native/Notify2.cpp M /branches/svnpatch-diff/subversion/bindings/javahl/native/SVNClient.cpp M /branches/svnpatch-diff/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java M /branches/svnpatch-diff/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java M /branches/svnpatch-diff/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java M /branches/svnpatch-diff/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/svnpatch-diff/subversion/bindings/swig/core.i M /branches/svnpatch-diff/subversion/bindings/swig/include/svn_global.swg M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/auth.py M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/client.py M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_client.rb M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_delta.rb M /branches/svnpatch-diff/subversion/bindings/swig/svn_client.i M /branches/svnpatch-diff/subversion/include M /branches/svnpatch-diff/subversion/include/private/svn_auth_private.h M /branches/svnpatch-diff/subversion/include/private/svn_cache.h M /branches/svnpatch-diff/subversion/include/private/svn_fs_util.h M /branches/svnpatch-diff/subversion/include/private/svn_mergeinfo_private.h M /branches/svnpatch-diff/subversion/include/private/svn_sqlite.h M /branches/svnpatch-diff/subversion/include/private/svn_wc_private.h M /branches/svnpatch-diff/subversion/include/svn_auth.h M /branches/svnpatch-diff/subversion/include/svn_checksum.h M /branches/svnpatch-diff/subversion/include/svn_client.h M /branches/svnpatch-diff/subversion/include/svn_cmdline.h M /branches/svnpatch-diff/subversion/include/svn_config.h M /branches/svnpatch-diff/subversion/include/svn_dirent_uri.h M /branches/svnpatch-diff/subversion/include/svn_fs.h M /branches/svnpatch-diff/subversion/include/svn_io.h M /branches/svnpatch-diff/subversion/include/svn_mergeinfo.h M /branches/svnpatch-diff/subversion/include/svn_opt.h M /branches/svnpatch-diff/subversion/include/svn_path.h M /branches/svnpatch-diff/subversion/include/svn_props.h M /branches/svnpatch-diff/subversion/include/svn_ra.h M /branches/svnpatch-diff/subversion/include/svn_wc.h M /branches/svnpatch-diff/subversion/include/svn_xml.h M /branches/svnpatch-diff/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c M /branches/svnpatch-diff/subversion/libsvn_auth_kwallet/kwallet.cpp M /branches/svnpatch-diff/subversion/libsvn_client/blame.c M /branches/svnpatch-diff/subversion/libsvn_client/commit.c M /branches/svnpatch-diff/subversion/libsvn_client/commit_util.c M /branches/svnpatch-diff/subversion/libsvn_client/copy.c M /branches/svnpatch-diff/subversion/libsvn_client/ctx.c M /branches/svnpatch-diff/subversion/libsvn_client/deprecated.c M /branches/svnpatch-diff/subversion/libsvn_client/diff.c M /branches/svnpatch-diff/subversion/libsvn_client/export.c M /branches/svnpatch-diff/subversion/libsvn_client/externals.c M /branches/svnpatch-diff/subversion/libsvn_client/info.c M /branches/svnpatch-diff/subversion/libsvn_client/merge.c M /branches/svnpatch-diff/subversion/libsvn_client/mergeinfo.h M /branches/svnpatch-diff/subversion/libsvn_client/ra.c M /branches/svnpatch-diff/subversion/libsvn_client/repos_diff.c M /branches/svnpatch-diff/subversion/libsvn_client/resolved.c M /branches/svnpatch-diff/subversion/libsvn_client/status.c M /branches/svnpatch-diff/subversion/libsvn_client/switch.c M /branches/svnpatch-diff/subversion/libsvn_client/update.c M /branches/svnpatch-diff/subversion/libsvn_diff/diff_file.c M /branches/svnpatch-diff/subversion/libsvn_fs/fs-loader.c M /branches/svnpatch-diff/subversion/libsvn_fs/fs-loader.h M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/checksum-reps-table.c M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/checksum-reps-table.h M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/miscellaneous-table.c M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/reps-table.c M /branches/svnpatch-diff/subversion/libsvn_fs_base/dag.c M /branches/svnpatch-diff/subversion/libsvn_fs_base/dag.h M /branches/svnpatch-diff/subversion/libsvn_fs_base/err.h M /branches/svnpatch-diff/subversion/libsvn_fs_base/fs.c M /branches/svnpatch-diff/subversion/libsvn_fs_base/reps-strings.c M /branches/svnpatch-diff/subversion/libsvn_fs_base/tree.c M /branches/svnpatch-diff/subversion/libsvn_fs_base/tree.h M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/fs_skels.c M /branches/svnpatch-diff/subversion/libsvn_fs_fs/caching.c M /branches/svnpatch-diff/subversion/libsvn_fs_fs/dag.h M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs.h M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs_fs.c M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs_fs.h M /branches/svnpatch-diff/subversion/libsvn_fs_fs/rep-cache.c M /branches/svnpatch-diff/subversion/libsvn_fs_fs/rep-cache.h M /branches/svnpatch-diff/subversion/libsvn_fs_fs/tree.c M /branches/svnpatch-diff/subversion/libsvn_ra/compat.c M /branches/svnpatch-diff/subversion/libsvn_ra/ra_loader.c M /branches/svnpatch-diff/subversion/libsvn_ra/ra_loader.h M /branches/svnpatch-diff/subversion/libsvn_ra_local/ra_plugin.c M /branches/svnpatch-diff/subversion/libsvn_ra_neon/commit.c M /branches/svnpatch-diff/subversion/libsvn_ra_neon/fetch.c A /branches/svnpatch-diff/subversion/libsvn_ra_neon/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_neon/get_deleted_rev.c:34200) M /branches/svnpatch-diff/subversion/libsvn_ra_neon/log.c M /branches/svnpatch-diff/subversion/libsvn_ra_neon/ra_neon.h M /branches/svnpatch-diff/subversion/libsvn_ra_neon/session.c M /branches/svnpatch-diff/subversion/libsvn_ra_neon/util.c M /branches/svnpatch-diff/subversion/libsvn_ra_serf/commit.c A /branches/svnpatch-diff/subversion/libsvn_ra_serf/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_serf/get_deleted_rev.c:34200) M /branches/svnpatch-diff/subversion/libsvn_ra_serf/log.c M /branches/svnpatch-diff/subversion/libsvn_ra_serf/ra_serf.h M /branches/svnpatch-diff/subversion/libsvn_ra_serf/serf.c M /branches/svnpatch-diff/subversion/libsvn_ra_serf/update.c M /branches/svnpatch-diff/subversion/libsvn_ra_serf/util.c M /branches/svnpatch-diff/subversion/libsvn_ra_serf/win32_auth_sspi.c M /branches/svnpatch-diff/subversion/libsvn_ra_svn/client.c M /branches/svnpatch-diff/subversion/libsvn_ra_svn/protocol M /branches/svnpatch-diff/subversion/libsvn_repos/commit.c M /branches/svnpatch-diff/subversion/libsvn_repos/dump.c M /branches/svnpatch-diff/subversion/libsvn_repos/fs-wrap.c M /branches/svnpatch-diff/subversion/libsvn_repos/hooks.c M /branches/svnpatch-diff/subversion/libsvn_repos/log.c M /branches/svnpatch-diff/subversion/libsvn_repos/reporter.c M /branches/svnpatch-diff/subversion/libsvn_repos/repos.h M /branches/svnpatch-diff/subversion/libsvn_subr M /branches/svnpatch-diff/subversion/libsvn_subr/auth.c M /branches/svnpatch-diff/subversion/libsvn_subr/checksum.c M /branches/svnpatch-diff/subversion/libsvn_subr/cmdline.c M /branches/svnpatch-diff/subversion/libsvn_subr/config_file.c M /branches/svnpatch-diff/subversion/libsvn_subr/config_win.c M /branches/svnpatch-diff/subversion/libsvn_subr/deprecated.c M /branches/svnpatch-diff/subversion/libsvn_subr/dirent_uri.c M /branches/svnpatch-diff/subversion/libsvn_subr/dso.c M /branches/svnpatch-diff/subversion/libsvn_subr/io.c M /branches/svnpatch-diff/subversion/libsvn_subr/macos_keychain.c M /branches/svnpatch-diff/subversion/libsvn_subr/mergeinfo.c M /branches/svnpatch-diff/subversion/libsvn_subr/nls.c M /branches/svnpatch-diff/subversion/libsvn_subr/simple_providers.c M /branches/svnpatch-diff/subversion/libsvn_subr/sqlite.c M /branches/svnpatch-diff/subversion/libsvn_subr/ssl_client_cert_providers.c M /branches/svnpatch-diff/subversion/libsvn_subr/ssl_client_cert_pw_providers.c M /branches/svnpatch-diff/subversion/libsvn_subr/stream.c M /branches/svnpatch-diff/subversion/libsvn_subr/subst.c M /branches/svnpatch-diff/subversion/libsvn_subr/win32_crypto.c M /branches/svnpatch-diff/subversion/libsvn_subr/xml.c M /branches/svnpatch-diff/subversion/libsvn_wc/README M /branches/svnpatch-diff/subversion/libsvn_wc/adm_crawler.c M /branches/svnpatch-diff/subversion/libsvn_wc/adm_files.c M /branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.c M /branches/svnpatch-diff/subversion/libsvn_wc/ambient_depth_filter_editor.c M /branches/svnpatch-diff/subversion/libsvn_wc/copy.c A /branches/svnpatch-diff/subversion/libsvn_wc/crop.c (from /trunk/subversion/libsvn_wc/crop.c:34200) M /branches/svnpatch-diff/subversion/libsvn_wc/deprecated.c M /branches/svnpatch-diff/subversion/libsvn_wc/diff.c M /branches/svnpatch-diff/subversion/libsvn_wc/entries.c M /branches/svnpatch-diff/subversion/libsvn_wc/lock.c M /branches/svnpatch-diff/subversion/libsvn_wc/log.c M /branches/svnpatch-diff/subversion/libsvn_wc/log.h M /branches/svnpatch-diff/subversion/libsvn_wc/merge.c M /branches/svnpatch-diff/subversion/libsvn_wc/props.c M /branches/svnpatch-diff/subversion/libsvn_wc/questions.c M /branches/svnpatch-diff/subversion/libsvn_wc/relocate.c M /branches/svnpatch-diff/subversion/libsvn_wc/status.c M /branches/svnpatch-diff/subversion/libsvn_wc/translate.c M /branches/svnpatch-diff/subversion/libsvn_wc/tree_conflicts.c M /branches/svnpatch-diff/subversion/libsvn_wc/tree_conflicts.h M /branches/svnpatch-diff/subversion/libsvn_wc/update_editor.c M /branches/svnpatch-diff/subversion/libsvn_wc/util.c M /branches/svnpatch-diff/subversion/libsvn_wc/wc.h M /branches/svnpatch-diff/subversion/libsvn_wc/wc_db.h M /branches/svnpatch-diff/subversion/mod_dav_svn/activity.c M /branches/svnpatch-diff/subversion/mod_dav_svn/dav_svn.h M /branches/svnpatch-diff/subversion/mod_dav_svn/mirror.c A /branches/svnpatch-diff/subversion/mod_dav_svn/reports/deleted-rev.c (from /trunk/subversion/mod_dav_svn/reports/deleted-rev.c:34200) M /branches/svnpatch-diff/subversion/mod_dav_svn/repos.c M /branches/svnpatch-diff/subversion/mod_dav_svn/util.c M /branches/svnpatch-diff/subversion/mod_dav_svn/version.c M /branches/svnpatch-diff/subversion/po/fr.po M /branches/svnpatch-diff/subversion/po/ko.po M /branches/svnpatch-diff/subversion/po/pl.po M /branches/svnpatch-diff/subversion/po/zh_CN.po M /branches/svnpatch-diff/subversion/svn/cl.h M /branches/svnpatch-diff/subversion/svn/info-cmd.c M /branches/svnpatch-diff/subversion/svn/log-cmd.c M /branches/svnpatch-diff/subversion/svn/main.c M /branches/svnpatch-diff/subversion/svn/notify.c M /branches/svnpatch-diff/subversion/svn/propedit-cmd.c M /branches/svnpatch-diff/subversion/svn/propget-cmd.c M /branches/svnpatch-diff/subversion/svn/status-cmd.c M /branches/svnpatch-diff/subversion/svn/tree-conflicts.c M /branches/svnpatch-diff/subversion/svn/util.c M /branches/svnpatch-diff/subversion/svn_private_config.hw M /branches/svnpatch-diff/subversion/svnadmin/main.c M /branches/svnpatch-diff/subversion/svndumpfilter/main.c M /branches/svnpatch-diff/subversion/svnlook/main.c M /branches/svnpatch-diff/subversion/svnserve/main.c M /branches/svnpatch-diff/subversion/svnserve/serve.c M /branches/svnpatch-diff/subversion/svnsync/main.c M /branches/svnpatch-diff/subversion/tests/cmdline/autoprop_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/basic_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/checkout_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/commit_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/copy_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/depth_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/diff_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/getopt_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/info_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/lock_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/log_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/merge_authz_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/merge_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/prop_tests.py A /branches/svnpatch-diff/subversion/tests/cmdline/resolved_tests.py (from /trunk/subversion/tests/cmdline/resolved_tests.py:34200) M /branches/svnpatch-diff/subversion/tests/cmdline/revert_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/schedule_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/stat_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/svnadmin_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/svneditor.py M /branches/svnpatch-diff/subversion/tests/cmdline/svnlook_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/entry.py M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/main.py M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/testcase.py M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/tree.py M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/verify.py M /branches/svnpatch-diff/subversion/tests/cmdline/switch_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/trans_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/tree_conflict_tests.py M /branches/svnpatch-diff/subversion/tests/cmdline/tree_conflict_tests.txt M /branches/svnpatch-diff/subversion/tests/cmdline/update_tests.py M /branches/svnpatch-diff/subversion/tests/libsvn_fs/fs-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_fs_base/changes-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_fs_base/fs-base-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_fs_base/strings-reps-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_repos/repos-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_subr A /branches/svnpatch-diff/subversion/tests/libsvn_subr/auth-test.c (from /trunk/subversion/tests/libsvn_subr/auth-test.c:34200) M /branches/svnpatch-diff/subversion/tests/libsvn_subr/checksum-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_subr/dirent_uri-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_subr/path-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_subr/target-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_subr/translate-test.c M /branches/svnpatch-diff/subversion/tests/libsvn_wc/tree-conflict-data-test.c M /branches/svnpatch-diff/subversion/tests/svn_test.h M /branches/svnpatch-diff/subversion/tests/svn_test_fs.c M /branches/svnpatch-diff/subversion/tests/svn_test_fs.h M /branches/svnpatch-diff/subversion/tests/svn_test_main.c M /branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005 M /branches/svnpatch-diff/tools/dist/dist.sh M /branches/svnpatch-diff/tools/examples/svnlook.py M /branches/svnpatch-diff/tools/po/po-update.sh M /branches/svnpatch-diff/tools/server-side/svn_server_log_parse.py M /branches/svnpatch-diff/tools/server-side/test_svn_server_log_parse.py M /branches/svnpatch-diff/win-tests.py M /branches/svnpatch-diff/www/development.html M /branches/svnpatch-diff/www/faq.html M /branches/svnpatch-diff/www/hacking.html M /branches/svnpatch-diff/www/issue-tracker.html M /branches/svnpatch-diff/www/links.html M /branches/svnpatch-diff/www/svn_1.6_releasenotes.html M /branches/svnpatch-diff/www/tasks.html On the 'svnpatch-diff' branch: Merge r33977:34200 from trunk. ------------------------------------------------------------------------ r34482 | arfrever | 2008-11-30 18:13:51 +0100 (Sun, 30 Nov 2008) | 5 lines Changed paths: M /branches/svnpatch-diff/subversion/libsvn_client/patch.c On the 'svnpatch-diff' branch: Follow-up to r34481: * subversion/libsvn_client/patch.c: Fix compilation. ------------------------------------------------------------------------ r34483 | arfrever | 2008-11-30 19:06:20 +0100 (Sun, 30 Nov 2008) | 4 lines Changed paths: M /branches/svnpatch-diff M /branches/svnpatch-diff/build.conf M /branches/svnpatch-diff/subversion/include M /branches/svnpatch-diff/subversion/libsvn_subr M /branches/svnpatch-diff/subversion/tests/libsvn_subr On the 'svnpatch-diff' branch: Follow-up to r34481: Record '/trunk:r28217-28961' in svn:mergeinfo. ------------------------------------------------------------------------ r34486 | arfrever | 2008-11-30 21:16:03 +0100 (Sun, 30 Nov 2008) | 7 lines Changed paths: M /branches/svnpatch-diff/subversion/tests/cmdline/diff_tests.py On the 'svnpatch-diff' branch: Improve comparison of svnpatches in diff_tests.py. * subversion/tests/cmdline/diff_tests.py (diff_svnpatch.svnpatch_decode, diff_svnpatch.compare_svnpatch): New. (diff_svnpatch): Use diff_svnpatch.compare_svnpatch(). ------------------------------------------------------------------------ r34492 | rhuijben | 2008-11-30 23:40:01 +0100 (Sun, 30 Nov 2008) | 4 lines Changed paths: M /trunk/subversion/include/svn_client.h * subversion/include/svn_client.h (svn_client_commit3): Following up on r34487, document new recurse behavior. (svn_depth_empty instead of svn_depth_files) ------------------------------------------------------------------------ r34494 | rhuijben | 2008-12-01 11:29:12 +0100 (Mon, 01 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/tests/cmdline/depth_tests.py * subversion/tests/cmdline/depth_tests.py (commit_propmods_with_depth_empty): Following up on 34487, don't try to copy the workingcopy while cloning (there is no workingcopy at this time). ------------------------------------------------------------------------ r34498 | julianfoad | 2008-12-01 12:29:20 +0100 (Mon, 01 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_wc/log.c Remove a redundant memory allocation, and cosmetic fixes. A follow-up to r34345. Found by: neels * subversion/libsvn_wc/log.c (log_do_add_tree_conflict): Remove a redundant memory allocation, and cosmetic fixes. ------------------------------------------------------------------------ r34499 | sbutler | 2008-12-01 15:30:31 +0100 (Mon, 01 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c Avoid a redundant string duplication in an update helper function. * subversion/libsvn_wc/update_editor.c (in_skipped_tree): Don't dup the string arg. Suggested by: gstein ------------------------------------------------------------------------ r34502 | hwright | 2008-12-01 17:59:39 +0100 (Mon, 01 Dec 2008) | 4 lines Changed paths: M /trunk M /trunk/build.conf M /trunk/subversion/include/svn_fs.h M /trunk/subversion/include/svn_repos.h M /trunk/subversion/libsvn_fs/fs-loader.c M /trunk/subversion/libsvn_fs/fs-loader.h M /trunk/subversion/libsvn_fs_base/fs.c M /trunk/subversion/libsvn_fs_fs/caching.c 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_repos/fs-wrap.c M /trunk/subversion/svnadmin/main.c A /trunk/subversion/tests/libsvn_fs_fs (from /branches/fsfs-pack/subversion/tests/libsvn_fs_fs:34501) R /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c (from /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c:34501) Merge the fsfs-pack branch to trunk. For a complete log, please see log messages on the branch. ------------------------------------------------------------------------ r34510 | hwright | 2008-12-01 19:43:20 +0100 (Mon, 01 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/caching.c * subversion/libsvn_fs_fs/caching.c (svn_fs_fs__initialize_caches): Followup to r34502: Make the pack offset cache use 8K pages. Suggested by: glasser ------------------------------------------------------------------------ r34511 | hwright | 2008-12-01 20:30:27 +0100 (Mon, 01 Dec 2008) | 7 lines Changed paths: M /trunk/build.conf * build.conf (__ALL_TESTS__): Followup to r34502: Add fs-pack-test to the list of windows tests. Note: I have no way of actually testing this, I'm just copying what appears to be correct based upon the rest of the file. ------------------------------------------------------------------------ r34514 | pburba | 2008-12-02 00:40:38 +0100 (Tue, 02 Dec 2008) | 2 lines Changed paths: M /branches/1.5.x-reintegrate-improvements M /branches/1.5.x-reintegrate-improvements/CHANGES M /branches/1.5.x-reintegrate-improvements/COMMITTERS M /branches/1.5.x-reintegrate-improvements/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-reintegrate-improvements/subversion/bindings/swig M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png On the 1.5.x-reintegrate-improvements branch, merge r34094 and r34244 from trunk. Merges cleanly. ------------------------------------------------------------------------ r34515 | pburba | 2008-12-02 01:07:46 +0100 (Tue, 02 Dec 2008) | 3 lines Changed paths: M /branches/1.5.x-reintegrate-improvements M /branches/1.5.x-reintegrate-improvements/CHANGES M /branches/1.5.x-reintegrate-improvements/COMMITTERS M /branches/1.5.x-reintegrate-improvements/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-reintegrate-improvements/subversion/bindings/swig M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png On the 1.5.x-reintegrate-improvements branch, merge r34256 from trunk. Resolve minor conflict on merge_tests.py due to order difference of 'XFail' and 'SkipUnless' on the merge_tests.py test list. ------------------------------------------------------------------------ r34516 | hwright | 2008-12-02 03:59:42 +0100 (Tue, 02 Dec 2008) | 11 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c When packing fsfs rev files, ensure that we pack them in the correct order. It turns out that svn_io_walk_dirs() doesn't guarantee any ordering of the files it walks, which in turn causes problems when wanting to pack revisions in the right order. Instead, we just inline the packing code, and use a loop to go through the rev files in order. * subversion/libsvn_fs_fs/fs_fs.c (packer_baton, packer_func): Remove. (pack_shard): Inline the actual revision packing to ensure we pack revisions in the proper order. ------------------------------------------------------------------------ r34517 | hwright | 2008-12-02 05:00:03 +0100 (Tue, 02 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__hotcopy): Don't attempt to copy the max-packed-rev file unless the format of the filesystem actually ensures it's there. Suggested by: glasser ------------------------------------------------------------------------ r34518 | julianfoad | 2008-12-02 13:41:33 +0100 (Tue, 02 Dec 2008) | 7 lines Changed paths: M /branches/merge-skips-obstructions/subversion/libsvn_client/merge.c Remove some code for detecting obstructions that is now redundant because of r34452. * subversion/libsvn_client/merge.c (merge_file_changed, merge_file_deleted, merge_dir_deleted): Cosmetic tweaks. (merge_file_added, merge_dir_added): Remove redundant code. ------------------------------------------------------------------------ r34519 | julianfoad | 2008-12-02 13:42:08 +0100 (Tue, 02 Dec 2008) | 5 lines Changed paths: M /branches/merge-skips-obstructions/subversion/libsvn_client/merge.c Update a doc string, following r34453. * subversion/libsvn_client/merge.c (node_kind_working): Describe the 'merge_b' parameter. ------------------------------------------------------------------------ r34520 | dkagedal | 2008-12-02 15:46:43 +0100 (Tue, 02 Dec 2008) | 2 lines Changed paths: M /trunk/contrib/client-side/emacs/dsvn.el contrib/client-side/emacs/dsvn.el: Use --non-interactive and bump version to 1.7 ------------------------------------------------------------------------ r34521 | pburba | 2008-12-02 16:07:21 +0100 (Tue, 02 Dec 2008) | 23 lines Changed paths: M /branches/1.5.x-reintegrate-improvements M /branches/1.5.x-reintegrate-improvements/CHANGES M /branches/1.5.x-reintegrate-improvements/COMMITTERS M /branches/1.5.x-reintegrate-improvements/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-reintegrate-improvements/subversion/bindings/swig M /branches/1.5.x-reintegrate-improvements/subversion/include/private/svn_mergeinfo_private.h M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_subr/mergeinfo.c M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png On the 1.5.x-reintegrate-improvements branch, merge r34306 from trunk. * subversion/include/private/svn_mergeinfo_private.h Fix minor conflict because svn_mergeinfo__catalog_dup is now declared here. * subversion/libsvn_client/merge.c Fix a slew of minor text conflicts and replace SVN_ERR_ASSERT() with assert() as the former is not present on 1.5.x * subversion/libsvn_subr/mergeinfo.c * subversion/tests/cmdline/merge_tests.py Clean merge. * src-branch-1.5.x-reintegrate-improvements * CHANGES * COMMITTERS * notes/tree-conflicts/scratch-pad.txt * subversion/bindings/swig * www/images/subversion-diagram.png * www/images/subversion_logo-200x173.png * www/images/subversion_logo-384x332.png * www/images/subversion_logo_hor-468x64.png Mergeinfo changes only. ------------------------------------------------------------------------ r34522 | hwright | 2008-12-02 17:38:13 +0100 (Tue, 02 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (pack_shard): Postpone destroying iterpool so that we can use it for a few temporary values. Suggested by: gstein ------------------------------------------------------------------------ r34523 | hwright | 2008-12-02 17:51:00 +0100 (Tue, 02 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/structure * subversion/libsvn_fs_fs/structure (Packing): Make mention of the format of the manifest file. Suggested by: glasser ------------------------------------------------------------------------ r34524 | julianfoad | 2008-12-02 18:28:59 +0100 (Tue, 02 Dec 2008) | 9 lines Changed paths: M /branches/merge-skips-obstructions/subversion/libsvn_client/merge.c Restore the old behaviour of allowing merge to add a directory that already exists on disk unversioned. This is a historical exception to the uniform skipping of inconsistent WC state introduced in r34452. This makes merge_tests.py 27 pass. * subversion/libsvn_client/merge.c (merge_dir_added): Allow an unversioned directory to be on disk already. ------------------------------------------------------------------------ r34527 | hwright | 2008-12-02 19:13:50 +0100 (Tue, 02 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/caching.c * subversion/libsvn_fs_fs/caching.c (svn_fs_fs__initialize_caches): Followup to r34510: Improve comment. Suggested by: julianfoad ------------------------------------------------------------------------ r34529 | cmpilato | 2008-12-02 19:36:19 +0100 (Tue, 02 Dec 2008) | 16 lines Changed paths: M /trunk/subversion/tests/libsvn_fs/fs-test.c M /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c M /trunk/subversion/tests/svn_test_fs.c Minor test old-repos-format-compatibility tweaks. * subversion/tests/svn_test_fs.c (make_fs_config): Handle --server-minor-version=3 by creating repositories in pre-1.4-compatible fashion. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (pack_filesystem, read_packed_fs, commit_packed_fs): Bail (with success) when asked to test an untestable scenario. * subversion/tests/libsvn_fs/fs-test.c (txn_names_are_not_reused, node_origin_rev): Fix the bail-on-untestable-scenarios condition in include pre-1.4-compatible filesystems, too. ------------------------------------------------------------------------ r34530 | hwright | 2008-12-02 19:42:08 +0100 (Tue, 02 Dec 2008) | 18 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs.h M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Change the max-packed-rev file to the min-unpacked-rev file in FSFS. We could leave it as is, but this change just makes things much more simpler. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (pack_filesystem): Update test. * subversion/libsvn_fs_fs/fs_fs.c (path_max_unpacked_rev): Rename. (readmin_unpacked_rev): Rename. (svn_fs_fs__open, upgrade_body, svn_fs_fs__hotcopy, open_pack_or_rev_file, open_and_seek_revision, get_fs_id_at_offset, get_root_changes_offset, svn_fs_fs__create, pack_shard, svn_fs_fs__pack): Update function and variable name references. * subversion/libsvn_fs_fs/fs.h (PATH_MIN_UNPACKED_REV): Rename. (fs_fs_data_t): Rename min_unpacked_rev. ------------------------------------------------------------------------ r34531 | cmpilato | 2008-12-02 20:00:59 +0100 (Tue, 02 Dec 2008) | 13 lines Changed paths: M /trunk/subversion/libsvn_fs_base/tree.c M /trunk/subversion/tests/libsvn_fs/fs-test.c For BDB-backed repositories, answer the "What's the node origin revision?" question even if there's no node-origins cache to consult. This matches the behavior of FSFS in this respect. * subversion/libsvn_fs_base/tree.c (base_node_origin_rev): Allow this function to operate even for repositories that lack the `node-origins' table support. It might not be snappy, but at least the fallback logic won't have to live in a higher layer that really wants the answer. * subversion/tests/libsvn_fs/fs-test.c (node_origin_rev): No longer claim any scenarios as untestable. ------------------------------------------------------------------------ r34537 | hwright | 2008-12-02 21:11:22 +0100 (Tue, 02 Dec 2008) | 11 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c If we're going to spend the time to open a manifest file once, chances are we're going to need additional information from that manifest file, so just read the entire manifest file in, and cache it. (I know there are more effecient ways to cache it now, we'll leave that for Future Work.) * subversion/libsvn_fs_fs/fs_fs.c (get_packed_offset): Read the entire manifest file into the cache, not just the one rev we're interested in. ------------------------------------------------------------------------ r34538 | hwright | 2008-12-02 21:48:22 +0100 (Tue, 02 Dec 2008) | 11 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/libsvn_fs_fs/structure Followup to r34537: Because we're now reading the entire manifest file into the cache at once, we don't need fixed-width fields. So, we can eliminate the need to pad the offsets in the manifest file. * subversion/libsvn_fs_fs/fs_fs.c (PACK_MANIFEST_ENTRY_LEN): Remove. (pack_shard): Don't right-pad the offsets in the manifest file. * subversion/libsvn_fs_fs/structure (Packing): Update manifest file format. ------------------------------------------------------------------------ r34539 | cmpilato | 2008-12-02 22:12:13 +0100 (Tue, 02 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/tests/libsvn_fs/fs-test.c Tweak a regression test a little bit to demonstrate that without glasser's r34506 fix, it is possible to not just error out of a requested node-origin calculation, but to silently return and cache the wrong value. I first made these tweaks just to prove it to myself, but I might as well commit them. * subversion/tests/libsvn_fs/fs-test.c (node_origin_rev): Throw another wrench into the test scenario. ------------------------------------------------------------------------ r34540 | blair | 2008-12-03 00:56:56 +0100 (Wed, 03 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_fs_base/bdb/env.c [This was reverted in r34561.] * subversion/libsvn_fs_base/bdb/env.c (create_env): Instead of relying upon the layout order of a bdb_env_t with the errpfx_string as the first field so that casting a (bdb_env_t *) to a (char *) works, refer to the errpfx_string field by name. ------------------------------------------------------------------------ r34541 | julianfoad | 2008-12-03 11:53:54 +0100 (Wed, 03 Dec 2008) | 2 lines Changed paths: M /branches/merge-skips-obstructions M /branches/merge-skips-obstructions/subversion/libsvn_fs_base/bdb/env.c M /branches/merge-skips-obstructions/subversion/libsvn_fs_base/tree.c M /branches/merge-skips-obstructions/subversion/libsvn_fs_fs/caching.c M /branches/merge-skips-obstructions/subversion/libsvn_fs_fs/fs.h M /branches/merge-skips-obstructions/subversion/libsvn_fs_fs/fs_fs.c M /branches/merge-skips-obstructions/subversion/libsvn_fs_fs/structure M /branches/merge-skips-obstructions/subversion/tests/libsvn_fs/fs-test.c M /branches/merge-skips-obstructions/subversion/tests/libsvn_fs_fs/fs-pack-test.c M /branches/merge-skips-obstructions/subversion/tests/svn_test_fs.c M /branches/merge-skips-obstructions/www/links.html On the merge-skips-obstructions branch: Merge changes from trunk up to r34540. ------------------------------------------------------------------------ r34542 | julianfoad | 2008-12-03 12:27:39 +0100 (Wed, 03 Dec 2008) | 20 lines Changed paths: M /trunk M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Merge the merge-skips-obstructions branch back to trunk. Make "merge" check for obstructions and skip them, before looking for tree conflicts. Adjust tests accordingly. Keep the old behaviour of allowing merge to add a directory that already exists on disk unversioned. This is a historical exception to the uniform skipping of inconsistent WC state that this branch otherwise applies. * subversion/libsvn_client/merge.c (dry_run_deleted_p): Tweak the signature: accept a 'const' baton. (node_kind_working, node_kind_on_disk, obstructed_or_missing): New functions. (merge_props_changed, merge_file_changed, merge_file_added, merge_file_deleted, merge_dir_added, merge_dir_deleted): Use obstructed_or_missing() to check for obstructions early on. * subversion/tests/cmdline/merge_tests.py (merge_skips_obstructions): Adjust accordingly. (test_list): Remove the 'XFail' expectation from that test. ------------------------------------------------------------------------ r34544 | julianfoad | 2008-12-03 15:53:05 +0100 (Wed, 03 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_authz_tests.py Fix merge_authz_tests.py 1. A follow-up to r34542 which broke it. * subversion/tests/cmdline/merge_authz_tests.py (mergeinfo_and_skipped_paths): Adjust to expect skipping rather than a tree conflict on the unversioned obstructing file 'omega'. ------------------------------------------------------------------------ r34550 | hwright | 2008-12-03 22:14:21 +0100 (Wed, 03 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (get_packed_offset): Just save the offset when we find it, instead of attempting to get it from the cache. ------------------------------------------------------------------------ r34553 | cauchy | 2008-12-04 03:07:33 +0100 (Thu, 04 Dec 2008) | 4 lines Changed paths: M /branches/1.5.x/subversion/po/zh_CN.po Simplified chinese translation update on the '1.5.x' branch: * subversion/po/zh_CN.po: translate new backport strings. ------------------------------------------------------------------------ r34554 | cauchy | 2008-12-04 03:10:26 +0100 (Thu, 04 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/po/zh_CN.po Simplified chinese translation update. * subversion/po/zh_CN.po: Update to r34552, translate some new strings. ------------------------------------------------------------------------ r34555 | hwright | 2008-12-04 06:20:18 +0100 (Thu, 04 Dec 2008) | 18 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/caching.c M /trunk/subversion/libsvn_fs_fs/fs_fs.c Instead of storing revision->offset mappings for the pack offset cache, just store shard->offset_array mappings. This should reduce the amount of space used in the cache by about half. * subversion/libsvn_fs_fs/fs_fs.c (get_packed_offset): Cache the entire manifest array as one blob, instead of caching each individual revision. * subversion/libsvn_fs_fs/caching.c (offset_serialize): Rename... (manifest_serialize): ...to this, and make it work for the manifest array. (offset_deserialize): Rename... (manifest_deserialize): ... to this, and fix for the manifest array. (dup_pack_offset): Rename... (dup_pack_manifest): ...to this, and duplicate an array, not a offset. (svn_fs_fs__initialize_caches): Update function name parameters, and magic numbers. ------------------------------------------------------------------------ r34557 | julianfoad | 2008-12-04 18:28:13 +0100 (Thu, 04 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c Fix a crash (endless loop) introduced in r34480. A reproduction recipe is in . Found by: Marc Haesen * subversion/libsvn_wc/update_editor.c (in_skipped_tree): Stop traversing the path upwards when it reaches the root directory, as well as when it reaches an empty path. ------------------------------------------------------------------------ r34558 | hwright | 2008-12-04 19:02:22 +0100 (Thu, 04 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (recover_body): Close the rev file. ------------------------------------------------------------------------ r34559 | julianfoad | 2008-12-04 19:36:25 +0100 (Thu, 04 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c Remove duplicated code that was introduced in r34158. * subversion/libsvn_wc/update_editor.c (do_entry_deletion): Remove duplicated code. ------------------------------------------------------------------------ r34561 | blair | 2008-12-04 19:50:50 +0100 (Thu, 04 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_fs_base/bdb/env.c Revert r34540, the code as it was is correct. I'm going to add some additional comments in a successive commit to make this part of the code clearer to people unfamiliar with its design. * subversion/libsvn_fs_base/bdb/env.c (create_env): Put the cast from a (char *) to a (bdb_env_t *) back. ------------------------------------------------------------------------ r34562 | pburba | 2008-12-04 20:13:37 +0100 (Thu, 04 Dec 2008) | 15 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c M /trunk/subversion/tests/cmdline/merge_tests.py Fix a bug which occurs when a merge adds a subtree as an immediate child of the merge target when the merge target has non-inheritable mergeinfo and is also the current working directory. See http://svn.haxx.se/dev/archive-2008-12/0133.shtml. Found by: Mark Eichin * subversion/libsvn_client/merge.c (do_directory_merge): Be more careful about constructing valid mergeinfo. * subversion/tests/cmdline/merge_tests.py (merge_away_subtrees_noninheritable_ranges): Remove comment about XFail. (test_list): Remove XFail from merge_away_subtrees_noninheritable_ranges. ------------------------------------------------------------------------ r34566 | danielsh | 2008-12-04 22:25:48 +0100 (Thu, 04 Dec 2008) | 4 lines Changed paths: M /branches/1.5.x-r34050-followups M /branches/1.5.x-r34050-followups/CHANGES M /branches/1.5.x-r34050-followups/COMMITTERS M /branches/1.5.x-r34050-followups/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-r34050-followups/subversion/bindings/swig M /branches/1.5.x-r34050-followups/subversion/include/svn_client.h M /branches/1.5.x-r34050-followups/subversion/libsvn_client/copy.c M /branches/1.5.x-r34050-followups/subversion/libsvn_client/merge.c M /branches/1.5.x-r34050-followups/subversion/libsvn_client/ra.c M /branches/1.5.x-r34050-followups/www/images/subversion-diagram.png M /branches/1.5.x-r34050-followups/www/images/subversion_logo-200x173.png M /branches/1.5.x-r34050-followups/www/images/subversion_logo-384x332.png M /branches/1.5.x-r34050-followups/www/images/subversion_logo_hor-468x64.png On the 1.5.x-r34050-followups branch: Merge r33775 and r33782 from trunk, replacing a call to svn_wc_adm_close2() by a call to svn_wc_adm_close(). ------------------------------------------------------------------------ r34567 | markphip | 2008-12-04 22:29:30 +0100 (Thu, 04 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java JavaHL: Extend the copy tests to include a WC to URL copy that also has to create parent folders. In this case the test exposes a bug that currently exists in the notifications sent during this action. This commit makes the JavaHL tests fail. [ in subversion/bindings/javahl/ ] * tests/org/tigris/subversion/javahl/BasicTests.java (testCopy): Add test for WC to URL copy with parent creation. ------------------------------------------------------------------------ r34569 | blair | 2008-12-05 01:47:06 +0100 (Fri, 05 Dec 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_fs_base/bdb/env.c Follow up to r34561, add more documentation on the casts between (char *) and (bdb_env_t *). * subversion/libsvn_fs_base/bdb/env.c (bdb_env_t): Add more documentation on how this structure is used and why it is layed out the way it is. (bdb_error_gatherer), (create_env): Add a note referring to the bdb_env_t documentation on the cast that is done. ------------------------------------------------------------------------ r34570 | danielsh | 2008-12-05 07:04:19 +0100 (Fri, 05 Dec 2008) | 3 lines Changed paths: M /branches/1.5.x-r34050-followups/subversion/libsvn_wc/adm_ops.c On the 1.5.x-r34050-followups branch: Merge the adm_ops.c part of r33786, resolving a conflict. ------------------------------------------------------------------------ r34571 | danielsh | 2008-12-05 07:08:59 +0100 (Fri, 05 Dec 2008) | 4 lines Changed paths: M /branches/1.5.x-r34050-followups M /branches/1.5.x-r34050-followups/CHANGES M /branches/1.5.x-r34050-followups/COMMITTERS M /branches/1.5.x-r34050-followups/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-r34050-followups/subversion/bindings/swig M /branches/1.5.x-r34050-followups/subversion/libsvn_client/merge.c M /branches/1.5.x-r34050-followups/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x-r34050-followups/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x-r34050-followups/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x-r34050-followups/www/images/subversion-diagram.png M /branches/1.5.x-r34050-followups/www/images/subversion_logo-200x173.png M /branches/1.5.x-r34050-followups/www/images/subversion_logo-384x332.png M /branches/1.5.x-r34050-followups/www/images/subversion_logo_hor-468x64.png On the 1.5.x-r34050-followups branch: Merge r33788 and the actions.py part of r33974 from trunk, updating calls to run_svn(). ------------------------------------------------------------------------ r34572 | danielsh | 2008-12-05 12:04:49 +0100 (Fri, 05 Dec 2008) | 8 lines Changed paths: M /branches/1.5.x-r34050-followups/subversion/tests/cmdline/merge_tests.py On the 1.5.x-r34050-followups branch: Fix merge_tests 27. * subversion/tests/cmdline/merge_tests.py (merge_dir_branches): Following up to the merge of r33788 in r34571, don't use regular expressions in expected_output. ------------------------------------------------------------------------ r34574 | julianfoad | 2008-12-05 14:01:39 +0100 (Fri, 05 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_wc/log.h * subversion/libsvn_wc/log.h (svn_wc__loggy_append): Mark as deprecated, reflecting its doc string. ------------------------------------------------------------------------ r34575 | hwright | 2008-12-05 15:23:33 +0100 (Fri, 05 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/structure * subversion/libsvn_fs_fs/structure (Layout): Describe the rep-cache.db file used by rep-sharing. ------------------------------------------------------------------------ r34579 | julianfoad | 2008-12-05 18:12:05 +0100 (Fri, 05 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c * subversion/libsvn_wc/update_editor.c (do_entry_deletion): Rename "adm_access" to "parent_adm_access" for clarity. ------------------------------------------------------------------------ r34580 | arfrever | 2008-12-05 19:02:12 +0100 (Fri, 05 Dec 2008) | 14 lines Changed paths: M /branches/svnpatch-diff/subversion/tests/cmdline/diff_tests.py On the 'svnpatch-diff' branch: * subversion/tests/cmdline/diff_tests.py (diff_svnpatch.re_svnpatch): Moved here from ... (diff_svnpatch.extract_svnpatch.re_svnpatch): ... here. (diff_svnpatch.append_newline): Delete. (diff_svnpatch.svnpatch_encode): Simplify and use list comprehension instead of map() for compatibility with Python 3. (diff_svnpatch.svnpatch_decode): Simplify. (diff_svnpatch.compare_svnpatch): Rename to ... (diff_svnpatch.verify_svnpatch): ... this and don't print svnpatches without the '--verbose' option. (diff_svnpatch): Use verify_svnpatch() instead of compare_svnpatch(). ------------------------------------------------------------------------ r34581 | arfrever | 2008-12-05 19:04:22 +0100 (Fri, 05 Dec 2008) | 6 lines Changed paths: M /branches/svnpatch-diff/subversion/tests/cmdline/diff_tests.py On the 'svnpatch-diff' branch: Fix diff_tests.py 51. * subversion/tests/cmdline/diff_tests.py (diff_svnpatch): Update expected output. ------------------------------------------------------------------------ r34582 | blair | 2008-12-05 19:10:41 +0100 (Fri, 05 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_fs_base/bdb/env.c Fix the documentation that refers to a non-existent function. * subversion/libsvn_fs_base/bdb/env.c (cleanup_error_info): There is no svn_fs_base__close(), refer to svn_fs_bdb__close() instead. ------------------------------------------------------------------------ r34584 | wsanchez | 2008-12-05 19:55:54 +0100 (Fri, 05 Dec 2008) | 5 lines Changed paths: M /trunk/contrib/hook-scripts/enforcer/enforcer * contrib/hook-scripts/enforcer/enforcer: Add proper handling for multiple simultaneous property changes. Found by: Ken MacInnis ------------------------------------------------------------------------ r34588 | hwright | 2008-12-05 20:23:26 +0100 (Fri, 05 Dec 2008) | 27 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs.h M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/libsvn_fs_fs/rep-cache.c M /trunk/subversion/libsvn_fs_fs/rep-cache.h Remove the rep-reuse count from FSFS, and instead use the original txn id as a uniquifier for node revisions. This removes a potential race condition with the reuse count, which was just a uniquifier, not a true reference count. [Note: this will probably break existing 1.6-era filesystems. Them's the breaks of running trunk!] * subversion/libsvn_fs_fs/fs_fs.c (read_rep_offsets): Parse the original txn id. (representation_string): Replace the reuse count with the orignal txn id. (svn_fs_fs__noderev_same_rep_key): Use the original txn id as a uniquifier when comparing representations. (svn_fs_fs__rep_copy): Copy the original txn id. (svn_fs_fs__set_entry, rep_write_contents_close): Set the original txn id. * subversion/libsvn_fs_fs/fs.h (representation_t): Remove reuse count member, and replace with the original txn id field. * subversion/libsvn_fs_fs/rep-cache.c (upgrade_sql): Remove reuse_count column from the rep_cache. (svn_fs_fs__set_rep_reference): Don't insert the reuse_count column. (svn_fs_fs__inc_rep_reuse): Remove. * subversion/libsvn_fs_fs/rep-cache.h (svn_fs_fs__inc_rep_reuse): Remove. ------------------------------------------------------------------------ r34590 | pburba | 2008-12-05 20:49:11 +0100 (Fri, 05 Dec 2008) | 8 lines Changed paths: M /branches/1.5.x-34184/subversion/tests/cmdline/merge_tests.py On the 1.5.x-34184 branch: * subversion/tests/cmdline/merge_tests.py: (test_list): Remove XFail from reintegrate_branch_never_merged_to. That test was failing because there was subtree mergeinfo. r34184 stops this subtree mergeinfo from being created in the first place so the test now passes. ------------------------------------------------------------------------ r34592 | jrepenning | 2008-12-05 21:15:59 +0100 (Fri, 05 Dec 2008) | 8 lines Changed paths: M /trunk/www/mailing-lists.html Fix up the links to the mail list search pages (which changed in the CEE 5.x "new Discussion Services") * www/mailing-lists.html (Searching the Archives): Link to servlets/CTSearch, vice servlets/ SearchList, to track new (5.0) platform Approved by: hwright ------------------------------------------------------------------------ r34596 | hwright | 2008-12-05 23:21:44 +0100 (Fri, 05 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__set_revision_proplist): Whitespace fix. ------------------------------------------------------------------------ r34598 | hwright | 2008-12-05 23:34:14 +0100 (Fri, 05 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__set_revision_proplist): Use either the pack file or the rev file to get the proper permissions. ------------------------------------------------------------------------ r34599 | arfrever | 2008-12-06 14:42:13 +0100 (Sat, 06 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/bindings/javahl/native/SVNClient.cpp Support the 'password-stores' configuration option in JavaHL. * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::getContext): Pass configuration to svn_auth_get_platform_specific_client_providers(). ------------------------------------------------------------------------ r34600 | arfrever | 2008-12-06 19:52:32 +0100 (Sat, 06 Dec 2008) | 3 lines Changed paths: M /trunk/Makefile.in * Makefile.in (ctypes-python): Add missing dependency. ------------------------------------------------------------------------ r34601 | arfrever | 2008-12-06 21:17:10 +0100 (Sat, 06 Dec 2008) | 13 lines Changed paths: M /trunk/subversion/bindings/ctypes-python M /trunk/subversion/bindings/ctypes-python/setup.py CSVN: Strip build path from header paths in csvn/core/functions.py. * subversion/bindings/ctypes-python/setup.py (clean.run): Additionally clean 'svn_all.py' and 'svn_all2.py'. (build.get_build_config): Append "-Isubversion/include" to flags when using headers from Subversion build directory. (build.build_functions_py): Store 'svn_all.py' and 'svn_all2.py' in '$(abs_builddir)/subversion/bindings/ctypes-python' directory and pass the '--strip-build-path' option to ctypesgen. * subversion/bindings/ctypes-python (svn:ignore): Update. ------------------------------------------------------------------------ r34602 | arfrever | 2008-12-06 21:27:29 +0100 (Sat, 06 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/svnadmin/main.c * subversion/svnadmin/main.c (subcommand_pack, cmd_table."pack"): Move definitions to restore alphabetic order. ------------------------------------------------------------------------ r34603 | xsteve | 2008-12-07 20:52:24 +0100 (Sun, 07 Dec 2008) | 10 lines Changed paths: M /trunk/contrib/client-side/emacs/psvn.el Improved the shown error message when a call to the svn client fails * trunk/contrib/client-side/emacs/psvn.el: (svn-status-1): Fixed a problem in a let binding (svn-process-sentinel): Collect multi line error strings (svn-handle-error-function): New variable to allow to customize the error handling process (svn-process-handle-error): Call svn-handle-error-function when it is defined ------------------------------------------------------------------------ r34604 | arfrever | 2008-12-08 00:56:43 +0100 (Mon, 08 Dec 2008) | 6 lines Changed paths: M /trunk/www/svn_1.6_releasenotes.html * www/svn_1.6_releasenotes.html (): Delete explanation of '[BRANCH]' tag. (wc-and-fs-format-change): Update. (svn-status): Add description and example. (deps): Delete. ------------------------------------------------------------------------ r34605 | arfrever | 2008-12-08 02:03:23 +0100 (Mon, 08 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs.h M /trunk/subversion/libsvn_fs_fs/structure * subversion/libsvn_fs_fs/fs.h (representation_t): Fix a typo. * subversion/libsvn_fs_fs/structure: Fix some typos. ------------------------------------------------------------------------ r34607 | julianfoad | 2008-12-08 14:35:10 +0100 (Mon, 08 Dec 2008) | 8 lines Changed paths: M /trunk/build/generator/gen_make.py Fix building Swig bindings where the build directory is not the source directory. A follow-up to r33640. * build/generator/gen_make.py (Generator.write): Adjust SWIG_INCLUDES so that the generated "svn_private_config.h" is found in the build dir rather than the source dir. ------------------------------------------------------------------------ r34611 | hwright | 2008-12-08 20:23:22 +0100 (Mon, 08 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Since we default to TRUE for rep-sharing, make the commented-out option listed in the FSFS config file FALSE. * subversion/libsvn_fs_fs/fs_fs.c (write_config): Write the CONFIG_OPTION_ENABLE_REP_SHARING as false, since the default is true, and the line is commented out by default. ------------------------------------------------------------------------ r34613 | hwright | 2008-12-08 20:27:59 +0100 (Mon, 08 Dec 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/notes/tree-conflicts/scratch-pad.txt 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/copy.c M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_client/ra.c M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge the 1.5.x-r34050-followups branch to 1.5.x: * r33775, r33782, r33786 (adm_ops.c), r33788, r33974 (actions.py) Various changes that r34050 (which has been backported already) depends on. Justification: Fix merge_tests 89. Branch: 1.5.x-r34050-followups Votes: +1: danielsh, pburba, cmpilato ------------------------------------------------------------------------ r34616 | hwright | 2008-12-08 22:43:25 +0100 (Mon, 08 Dec 2008) | 13 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs.h M /trunk/subversion/libsvn_fs_fs/fs_fs.c Followup to r34588: Really uniquify representation strings by including the next_node_id as part of the uniquifier, and rename a structure member appropriately. * subversion/libsvn_fs_fs/fs_fs.c (read_rep_offsets, representation_string, svn_fs_fs__noderev_same_rep_key, rep_write_contents_close, svn_fs_fs__rep_copy): Update variable name. (svn_fs_fs__set_entry, rep_write_contents_close): Use the next node id to further uniquify the rep string within a txn. * subversion/libsvn_fs_fs/fs.h (representation_t): Rename orig_txn_id to uniquifier. ------------------------------------------------------------------------ r34617 | gstein | 2008-12-09 04:28:07 +0100 (Tue, 09 Dec 2008) | 18 lines Changed paths: M /trunk/TODO-1.6 M /trunk/subversion/libsvn_wc/lock.c M /trunk/subversion/libsvn_wc/lock.h Remove svn_wc__adm_{get,save}_pristine_path functions and cover a TODO item for SVN 1.6 release. Patch by: bhuvan (slightly modified by gstein) * subversion/libsvn_wc/lock.h: (svn_wc__adm_get_pristine_path, svn_wc__adm_save_pristine_path): Remove these functions. * subversion/libsvn_wc/lock.c: (struct svn_wc__adm_shared_t): remove NEW_PRISTINES field (svn_wc__adm_get_pristine_path, svn_wc__adm_save_pristine_path): Remove these functions. * TODO-1.6: Remove the TODO item corresponding to this back-out task. ------------------------------------------------------------------------ r34618 | gstein | 2008-12-09 12:34:32 +0100 (Tue, 09 Dec 2008) | 33 lines Changed paths: M /trunk/subversion/include/svn_checksum.h M /trunk/subversion/include/svn_wc.h 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_subr/checksum.c M /trunk/subversion/libsvn_wc/adm_ops.c Implement svn_wc_queue_committed2(). Introduces new (internal) svn_checksum__from_md5_digest() to help with creating checksum types from old-style digests. This change doesn't propagate its use, however. * subversion/include/svn_checksum.h: (svn_checksum__from_md5_digest): new function declaration * subversion/include/svn_wc.h: (svn_wc_queue_committed2): update doc, rename pool param * subversion/libsvn_subr/checksum.c: (svn_checksum__from_md5_digest): implement * subversion/libsvn_wc/adm_ops.c: (svn_wc_queue_committed2): implement (svn_wc_queue_committed): rewrite in terms of committed2 * subversion/libsvn_client/client.h: (svn_client__do_commit): rename/redefine DIGESTS to CHECKSUMS as a hash from paths to checksums (rather than digests) * subversion/libsvn_client/commit_util.c: (svn_client__do_commit): DIGESTS becomes CHECKSUMS. construct a checksum from the old-style digest, and stash in hash. * subversion/libsvn_client/commit.c: (struct post_commit_baton): rename DIGESTS to CHECKSUMS (post_process_commit_item): call svn_wc_queue_committed2() instead of the older committed(), and pass new params (svn_client_commit4): rename DIGESTS to CHECKSUMS ------------------------------------------------------------------------ r34619 | julianfoad | 2008-12-09 13:55:50 +0100 (Tue, 09 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py * subversion/tests/cmdline/merge_tests.py (tree_conflicts_on_merge_local_ci_5_1): Correct a reference to a nonexistent variable. The test XFails, but now for a genuine reason. ------------------------------------------------------------------------ r34621 | julianfoad | 2008-12-09 14:26:20 +0100 (Tue, 09 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/actions.py Include property changes in the deep trees conflict tests. This doesn't by itself make for better testing of conflict detection, because the prop changes and the other changes are on the same nodes. The purpose is to move towards being able to check that the changes are preserved when the conflict is resolved. * subversion/tests/cmdline/svntest/actions.py (deep_trees_leaf_edit): Make property changes as well as other changes. (deep_trees_status_local_leaf_edit): Expect property changes. ------------------------------------------------------------------------ r34622 | julianfoad | 2008-12-09 14:52:39 +0100 (Tue, 09 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_wc/entries.c M /trunk/subversion/libsvn_wc/log.c Document and simplify some WC code. * subversion/libsvn_wc/entries.c (fold_entry): Add a note in the doc string. (fold_scheduling): Simplify a bit. (svn_wc__entry_modify): Add an explanatory comment. * subversion/libsvn_wc/log.c (log_do_delete_entry): Add a doc string. Fix a typo. ------------------------------------------------------------------------ r34623 | julianfoad | 2008-12-09 16:12:51 +0100 (Tue, 09 Dec 2008) | 9 lines Changed paths: A /branches/tc-issue-3334 (from /trunk:34622) Create a branch from trunk for issue #3334 "Tree conflict merry-go-round on update/switch". The first case to be implemented will be: When "update" or "switch" deletes something that is locally edited, as well as raising a tree conflict, the local node should be scheduled for re-addition as a copy of the previously existing version, so the user can keep their version simply by issuing an "svn resolved" command. ------------------------------------------------------------------------ r34624 | julianfoad | 2008-12-09 16:27:16 +0100 (Tue, 09 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/wc.py * subversion/tests/cmdline/svntest/wc.py (State.tweak): Tweak the doc string. ------------------------------------------------------------------------ r34626 | hwright | 2008-12-09 17:49:57 +0100 (Tue, 09 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/include/svn_wc.h * subversion/include/svn_wc.h (svn_wc_conflict_version_t): Improve doxygen markup. ------------------------------------------------------------------------ r34627 | hwright | 2008-12-09 19:01:12 +0100 (Tue, 09 Dec 2008) | 21 lines Changed paths: M /trunk/subversion/include/svn_checksum.h M /trunk/subversion/libsvn_client/commit.c M /trunk/subversion/libsvn_client/commit_util.c M /trunk/subversion/libsvn_client/export.c M /trunk/subversion/libsvn_fs_base/util/fs_skels.c M /trunk/subversion/libsvn_subr/checksum.c M /trunk/subversion/libsvn_wc/adm_ops.c M /trunk/subversion/libsvn_wc/update_editor.c Followup and cleanup for r34618. * subversion/include/svn_checksum.h * subversion/libsvn_subr/checksum.c (svn_checksum__from_md5_digest): Generalize and rename to... (svn_checksum__from_digest): ...this. * subversion/libsvn_fs_base/util/fs_skels.c (svn_fs_base__parse_representation_skel) * subversion/libsvn_wc/adm_ops.c (svn_wc_queue_committed, svn_wc_process_committed4) * subversion/libsvn_wc/update_editor.c (window_handler) * subversion/libsvn_client/export.c (close_file) * subversion/libsvn_client/commit_util.c (svn_client__do_commit) * subversion/libsvn_client/commit.c (import_file): Use the API. ------------------------------------------------------------------------ r34628 | hwright | 2008-12-09 21:26:11 +0100 (Tue, 09 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c Make the temporary property reject file creation streamy. * subversion/libsvn_wc/props.c (open_reject_tmp_file): Rename from this... (open_reject_tmp_stream): ...to this, and return a stream instead of a file. (append_prop_conflict): Use a stream instead of a file. (svn_wc__merge_props): Use a stream for creating the temporary reject file contents. ------------------------------------------------------------------------ r34629 | hwright | 2008-12-09 23:39:35 +0100 (Tue, 09 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_wc/questions.c * subversion/libsvn_wc/questions.c (svn_wc__timestamps_equal_p): Remove some code which has been commented out since r2308. ------------------------------------------------------------------------ r34630 | hwright | 2008-12-10 00:25:59 +0100 (Wed, 10 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c Centralize some wc property fetching. * subversion/libsvn_wc/props.c (load_prop_file): Rename from this... (load_props): ...to this, and modify to accept a path in the working copy, not a property file path. (svn_wc__load_props, svn_wc__wcprop_list, modified_props): Adjust callers. ------------------------------------------------------------------------ r34631 | hwright | 2008-12-10 00:28:28 +0100 (Wed, 10 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c * subversion/libsvn_wc/props.c (modified_props): Fix typo. ------------------------------------------------------------------------ r34632 | hwright | 2008-12-10 00:53:49 +0100 (Wed, 10 Dec 2008) | 14 lines Changed paths: M /trunk/subversion/libsvn_wc/adm_files.c M /trunk/subversion/libsvn_wc/adm_files.h M /trunk/subversion/libsvn_wc/props.c Remove code used for writing old-style wcprops. We support backwards compat for wc formats insofar as reading goes, but when we write, it should be the most recent version. * subversion/libsvn_wc/props.c (svn_wc__wcprop_set): Unconditionally write the lastest version of the wcprops file. * subversion/libsvn_wc/adm_files.h * subversion/libsvn_wc/adm_files.c (svn_wc__write_old_wcprops): Remove. [Note: Reverted in r34647.] ------------------------------------------------------------------------ r34633 | hwright | 2008-12-10 00:55:35 +0100 (Wed, 10 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_subr/checksum.c * subversion/libsvn_subr/checksum.c (svn_checksum__from_digest): Restore a memcpy() lost in r34627. ------------------------------------------------------------------------ r34634 | neels | 2008-12-10 04:09:43 +0100 (Wed, 10 Dec 2008) | 11 lines Changed paths: A /branches/svnraisetc (from /trunk:34633) Creating branch svnraisetc: This branch adds a new commandline tool that can externally raise a tree-conflict in a working copy. Since we are not going to be able to catch all possible tree-conflicts in Subversion 1.6 yet, the request has been made to have a tool that can raise a tree-conflict explicitly, so that external logic can account for raising the missing cases of tree-conflicts while subversion still blocks upon and resolves the conflicts as usual. ------------------------------------------------------------------------ r34635 | neels | 2008-12-10 04:13:47 +0100 (Wed, 10 Dec 2008) | 13 lines Changed paths: M /branches/svnraisetc/build.conf A /branches/svnraisetc/subversion/svnraisetreeconflict A /branches/svnraisetc/subversion/svnraisetreeconflict/main.c On branch svnraisetc: *** Checking in julianf's initial patch version as from the dev@ *** *** mailing list, which was called raise-tree-conflict-1.patch *** Add a command-line program that raises a tree conflict. * subversion/svnraisetreeconflict/main.c New file. * build.conf Add a build configuration for the new file. ------------------------------------------------------------------------ r34636 | neels | 2008-12-10 04:55:14 +0100 (Wed, 10 Dec 2008) | 18 lines Changed paths: M /branches/svnraisetc/subversion/svnraisetreeconflict/main.c On branch svnraisetc: Console output improvements. * subversion/svnraisetreeconflict/main.c (SVNRAISETC_INT_ERR): New macro to use instead of SVN_INT_ERR, to say "svnraisetreeconflict:" instead of "svn:". (version): Properly state "svnraisetreeconflict" as program name. (get_enum_str): New function for reverse mapping the enum maps. (print_enum_map): New function that prints all possible enum map strings. (help): Also print all possible argument values for each enum arg. Also print an example of a possible commandline invocation. (main): Replace use of SVN_INT_ERR with SVNRAISETC_INT_ERR. Add a check that hints at the "--help" option when no arguments are supplied. ------------------------------------------------------------------------ r34637 | stylesen | 2008-12-10 08:00:51 +0100 (Wed, 10 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/svnadmin/main.c Fix svnadmin dump help message to bind --incremental switch to -r option. * subversion/svnadmin/main.c (cmd_table): Group --incremental switch with the -r option in the dump subcommand help message. Patch by: Miha Vitorovic ------------------------------------------------------------------------ r34638 | gstein | 2008-12-10 12:00:31 +0100 (Wed, 10 Dec 2008) | 39 lines Changed paths: A /trunk/subversion/include/private/svn_skel.h (from /trunk/subversion/libsvn_fs_base/util/skel.h:34618) M /trunk/subversion/libsvn_fs_base/bdb/copies-table.c M /trunk/subversion/libsvn_fs_base/bdb/dbt.h M /trunk/subversion/libsvn_fs_base/bdb/lock-tokens-table.c M /trunk/subversion/libsvn_fs_base/bdb/locks-table.c M /trunk/subversion/libsvn_fs_base/bdb/nodes-table.c M /trunk/subversion/libsvn_fs_base/bdb/rev-table.c M /trunk/subversion/libsvn_fs_base/bdb/txn-table.c M /trunk/subversion/libsvn_fs_base/key-gen.c M /trunk/subversion/libsvn_fs_base/key-gen.h M /trunk/subversion/libsvn_fs_base/util/fs_skels.c M /trunk/subversion/libsvn_fs_base/util/fs_skels.h D /trunk/subversion/libsvn_fs_base/util/skel.c D /trunk/subversion/libsvn_fs_base/util/skel.h A /trunk/subversion/libsvn_subr/skel.c (from /trunk/subversion/libsvn_fs_base/util/skel.c:34618) M /trunk/subversion/tests/libsvn_fs_base/changes-test.c M /trunk/subversion/tests/libsvn_fs_base/skel-test.c M /trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c Move the skel code to libsvn_subr for private use by other libs. - Renamed functions into svn_skel__* namespace - Created #defines for old names, mapping to new. This keeps this change to a small, manageable size. - Adjusted #include lines for location of new header - Applied const to some skel function params - Switched some 0 values to NULL in the skel code (old -> new style) * subversion/libsvn_fs_base/util/skel.h: renamed to ... * subversion/include/private/svn_skel.h: here. - renamed functions, add const to params (svn_skel__getsize, svn_skel__putsize): moved from key-gen.h * subversion/libsvn_fs_base/util/skel.c: renamed to ... * subversion/libsvn_subr/skel.c: here. - renamed functions, add const to params (svn_skel__getsize, svn_skel__putsize): moved from key-gen.c * subversion/libsvn_fs_base/key-gen.h: (svn_fs_base__getsize, svn_fs_base__putsize): moved to svn_skel.h * subversion/libsvn_fs_base/key-gen.c: (svn_fs_base__getsize, svn_fs_base__putsize): moved to skel.c * subversion/libsvn_fs_base/bdb/dbt.h: * subversion/libsvn_fs_base/bdb/copies-table.c: * subversion/libsvn_fs_base/bdb/lock-tokens-table.c: * subversion/libsvn_fs_base/bdb/nodes-table.c: * subversion/libsvn_fs_base/bdb/txn-table.c: * subversion/libsvn_fs_base/bdb/locks-table.c: * subversion/libsvn_fs_base/bdb/rev-table.c: * subversion/libsvn_fs_base/util/fs_skels.h: * subversion/libsvn_fs_base/util/fs_skels.c: * subversion/tests/libsvn_fs_base/changes-test.c: * subversion/tests/libsvn_fs_base/skel-test.c: * subversion/tests/libsvn_fs_base/strings-reps-test.c: - adjust includes ------------------------------------------------------------------------ r34640 | gstein | 2008-12-10 13:08:58 +0100 (Wed, 10 Dec 2008) | 13 lines Changed paths: M /trunk/subversion/include/private/svn_skel.h M /trunk/subversion/libsvn_subr/skel.c Make the getsize/putsize private. They were shared across some files in fs_base, but not actually used outside the skels code. * subversion/include/private/svn_skel.h: (svn_skel__getsize, svn_skel__putsize): remove declarations (svn_fs_base__getsize, svn_fs_base__putsize): remove #defines * subversion/libsvn_subr/skel.c: (svn_skel__getsize): renamed to ... (getsize): ... this. move to top of file. change single caller. (svn_skel__putsize): renamed to ... (putsize): ... this. move to top of file. change single caller. ------------------------------------------------------------------------ r34642 | julianfoad | 2008-12-10 13:23:24 +0100 (Wed, 10 Dec 2008) | 34 lines Changed paths: M /branches/tc-issue-3334/subversion/libsvn_wc/update_editor.c M /branches/tc-issue-3334/subversion/tests/cmdline/update_tests.py When raising a tree conflict, make "update" update the base version and re-schedule the working version to preserve the user's version. Issue #3334, Initially, this is just for the case of incoming delete onto a local modification (UC2). ### Currently this only works for a file. ### When in a conflicted state (status "A + C") a plain "svn diff" shows up in the diff header as being a diff from r(deleted revision) and (working revision), whereas the diff body correctly shows the diff between r(previous existing revision) and (working version). ### Tests failing: FAIL: commit_tests.py 60: tree conflicts resolved FAIL: update_tests.py 7: update that deletes modified files FAIL: update_tests.py 48: tree conflicts on update 2.1 FAIL: update_tests.py 50: tree conflicts on update 2.3 FAIL: switch_tests.py 12: anchor=target that fails due to local mods FAIL: switch_tests.py 33: tree conflicts on switch 2.1 FAIL: revert_tests.py 19: revert tree conflicts in updated files FAIL: stat_tests.py 31: status with tree conflicts * subversion/libsvn_wc/update_editor.c (do_entry_deletion): When raising a delete-onto-modified tree conflict, update the base revision number and re-schedule the working version for addition. * subversion/tests/cmdline/update_tests.py (tree_conflicts_on_update_2_1): Expect 'Added' status. ------------------------------------------------------------------------ r34644 | rhuijben | 2008-12-10 13:44:50 +0100 (Wed, 10 Dec 2008) | 3 lines Changed paths: M /trunk/build.conf * build.conf (libsvn_subr): Following up on r34638, fix the 'stoopid windows build' issue. ------------------------------------------------------------------------ r34646 | julianfoad | 2008-12-10 14:09:22 +0100 (Wed, 10 Dec 2008) | 15 lines Changed paths: M /branches/tc-issue-3334/subversion/tests/cmdline/commit_tests.py M /branches/tc-issue-3334/subversion/tests/cmdline/revert_tests.py M /branches/tc-issue-3334/subversion/tests/cmdline/stat_tests.py M /branches/tc-issue-3334/subversion/tests/cmdline/switch_tests.py M /branches/tc-issue-3334/subversion/tests/cmdline/update_tests.py On the tc-issue-3334 branch: Adjust test expectations to account for progress so far. This solves 6 of the 8 test failures, leaving these 2: FAIL: update_tests.py 48: tree conflicts on update 2.1 FAIL: update_tests.py 50: tree conflicts on update 2.3 * tests/cmdline/revert_tests.py, tests/cmdline/switch_tests.py, tests/cmdline/stat_tests.py, tests/cmdline/update_tests.py, tests/cmdline/commit_tests.py: Adjust expectations. ------------------------------------------------------------------------ r34648 | hwright | 2008-12-10 18:25:14 +0100 (Wed, 10 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c Followup to r34630: Make the prop hash an output parameter, and create as well as populate it in load_props(). * subversion/libsvn_wc/props.c (load_props): Make HASH and output param, and create it. (svn_wc__load_props, svn_wc__wcprop_list, modified_props): Let load_props() create the prop hash. ------------------------------------------------------------------------ r34649 | hwright | 2008-12-10 19:03:25 +0100 (Wed, 10 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_fs_base/fs.c Simplify the format checking code in libsvn_fs_base. Instead of having three separate conditionals, just use one simpler conditional. Only one of the original conditionals was being executed due to the compile-time knowledge of macro values. * subversion/libsvn_fs_base/fs.c (check_format): Since we currently support all formats <= the current format, just check for that, and exit. ------------------------------------------------------------------------ r34651 | julianfoad | 2008-12-10 19:22:49 +0100 (Wed, 10 Dec 2008) | 8 lines Changed paths: M /branches/tc-issue-3334/subversion/tests/cmdline/update_tests.py Adjust test expectations to account for progress so far. This solves 1 of the 2 remaining test failures, leaving this one: FAIL: update_tests.py 50: tree conflicts on update 2.3 * subversion/tests/cmdline/update_tests.py (tree_conflicts_on_update_2_1): Tweak expectations. ------------------------------------------------------------------------ r34652 | cmpilato | 2008-12-10 19:25:54 +0100 (Wed, 10 Dec 2008) | 3 lines Changed paths: M /trunk/build.conf * build.conf Move [skel-test] down with the rest of the libsvn_subr tests. ------------------------------------------------------------------------ r34654 | pburba | 2008-12-10 19:35:28 +0100 (Wed, 10 Dec 2008) | 18 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Fix merge test XFailing since the tree-conflicts branch was merged to trunk. The behavior here was correct, it was just the test expectations that were wrong. * subversion/tests/cmdline/merge_tests.py (mergeinfo_recording_in_skipped_merge): Follow-up to r31326 on the tree-conflicts branch, we expect a *tree* conflict to be reported on the locally deleted subtree, not a regular conflict that subtree's parent - see http://svn.collab.net/repos/svn/trunk/notes/tree-conflicts/detection.txt, where it always the locally deleted subtree, not its parent, that is the tree conflict victim. Also, since this test now produces a tree conflict, we don't expect any skip notification, but we do expect the tree conflict in the status. This test covers now covers a use case quite similar to tree_conflicts_on_merge_local_ci_4_1, but there is no harm in leaving it in. (test_list): Remove XFail from mergeinfo_recording_in_skipped_merge. ------------------------------------------------------------------------ r34656 | hwright | 2008-12-10 19:44:09 +0100 (Wed, 10 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_fs_base/fs.c Followup to r34653: we should only autoupgrade to 1.3-era formats, not 1.4-era formats. * subversion/libsvn_fs_base/fs.c (base_open): Only autoupgrade to format 1 if the format isn't existant. ------------------------------------------------------------------------ r34660 | pburba | 2008-12-10 20:34:44 +0100 (Wed, 10 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Make a merge test fail for the right reason. * subversion/tests/cmdline/merge_tests.py (merge_target_with_non_inheritable_mergeinfo): Don't expect natural history to be present in explicit mergeinfo. ------------------------------------------------------------------------ r34661 | xsteve | 2008-12-10 20:42:22 +0100 (Wed, 10 Dec 2008) | 5 lines Changed paths: M /trunk/contrib/client-side/emacs/psvn.el Added a list of lines per revision for the svn blame statistics * trunk/contrib/client-side/emacs/psvn.el: (svn-blame-show-statistics): Show the lines per revision also ------------------------------------------------------------------------ r34664 | neels | 2008-12-11 04:15:08 +0100 (Thu, 11 Dec 2008) | 15 lines Changed paths: M /trunk/subversion/include/private/svn_wc_private.h M /trunk/subversion/libsvn_client/resolved.c M /trunk/subversion/libsvn_wc/update_editor.c Move strict WC root detection code into a separate function. * subversion/include/private/svn_wc_private.h (svn_wc__strictly_is_wc_root): New function declaration. * subversion/libsvn_wc/update_editor.c (svn_wc__strictly_is_wc_root): New function definition, placed below the related svn_wc_is_wc_root(). * subversion/libsvn_client/resolved.c (svn_client_resolve): Use new function svn_wc__strictly_is_wc_root(), replacing the inline wc root checking code. ------------------------------------------------------------------------ r34667 | kameshj | 2008-12-11 14:50:57 +0100 (Thu, 11 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c svn_wc_diff_callbacks2_t.dir_props_changed's 'original_props' parameter is an hash of 'char *' Vs 'svn_string_t *' *not* 'char *' Vs 'svn_prop_t *'. * subversion/libsvn_client/merge.c (merge_props_changed): change type of 'mergeinfo_prop' to 'svn_string_t *'. ------------------------------------------------------------------------ r34669 | pburba | 2008-12-11 16:26:19 +0100 (Thu, 11 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Tweak an existing merge test to demonstrate the bug fixed in r34432. * subversion/tests/cmdline/merge_tests.py (merge_adds_mergeinfo_correctly): Re-run a merge but this time with some locally added mergeinfo. This triggers the bug described in subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=103945. ------------------------------------------------------------------------ r34673 | pburba | 2008-12-11 16:56:51 +0100 (Thu, 11 Dec 2008) | 2 lines Changed paths: M /branches/1.5.x-34432 M /branches/1.5.x-34432/CHANGES M /branches/1.5.x-34432/COMMITTERS M /branches/1.5.x-34432/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-34432/subversion/bindings/swig M /branches/1.5.x-34432/subversion/libsvn_client/merge.c M /branches/1.5.x-34432/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x-34432/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x-34432/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x-34432/www/images/subversion-diagram.png M /branches/1.5.x-34432/www/images/subversion_logo-200x173.png M /branches/1.5.x-34432/www/images/subversion_logo-384x332.png M /branches/1.5.x-34432/www/images/subversion_logo_hor-468x64.png On the 1.5.x-34432 branch: Merge r34432 and r34669 from trunk, resolving some minor conflicts. ------------------------------------------------------------------------ r34686 | neels | 2008-12-12 04:06:15 +0100 (Fri, 12 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_client/commit_util.c Properly error on a commit attempted anywhere inside a tree-conflicted working copy directory. * subversion/libsvn_client/commit_util.c (bail_on_tree_conflicted_ancestor): New helper function. (svn_client__harvest_committables): Use new function on each explicit target. ------------------------------------------------------------------------ r34687 | stylesen | 2008-12-12 06:28:51 +0100 (Fri, 12 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_fs_base/util/fs_skels.c Fix warning of signedness. * subversion/libsvn_fs_base/util/fs_skels.c (svn_fs_base__parse_representation_skel): Typecast 'const char' to 'const unsigned char' for checksum_skel->children->next->data. Review by: hwright ------------------------------------------------------------------------ r34688 | stylesen | 2008-12-12 07:04:42 +0100 (Fri, 12 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_subr/skel.c Fix compiler warning of 'no previous prototype'. * subversion/libsvn_subr/skel.c (getsize): Mark the function as static. (putsize): Mark the function as static. ------------------------------------------------------------------------ r34689 | gstein | 2008-12-12 07:37:34 +0100 (Fri, 12 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/tests/libsvn_subr/skel-test.c Remove an unneeded include; it's inclusion throws off non-BDB builds. * subversion/tests/libsvn_subr/skel-test.c: - remove include of libsvn_fs_base/fs.h ------------------------------------------------------------------------ r34691 | stylesen | 2008-12-12 08:27:01 +0100 (Fri, 12 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Removes gnome-keyring-result.h to make it compile with old versions of gnome-keyring. * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Removed reference to the header file. Patch by: Alexander Thomas ------------------------------------------------------------------------ r34692 | stylesen | 2008-12-12 08:53:58 +0100 (Fri, 12 Dec 2008) | 29 lines Changed paths: M /trunk/subversion/include/svn_auth.h M /trunk/subversion/include/svn_client.h M /trunk/subversion/libsvn_subr/simple_providers.c M /trunk/subversion/libsvn_subr/ssl_client_cert_providers.c M /trunk/subversion/libsvn_subr/ssl_client_cert_pw_providers.c M /trunk/subversion/libsvn_subr/username_providers.c A negative value to the retry_limit will re-prompt for user credentials infinite times. * subversion/libsvn_subr/ssl_client_cert_pw_providers.c (ssl_client_cert_pw_prompt_next_cred): Modified not to give up if a negative value is given as retry_limit. * subversion/libsvn_subr/ssl_client_cert_providers.c (ssl_client_cert_prompt_next_cred): Modified not to give up if a negative value is given as retry_limit. * subversion/libsvn_subr/username_providers.c (username_prompt_next_creds): Modified not to give up if a negative value is given as retry_limit. * subversion/libsvn_subr/simple_providers.c (simple_prompt_next_creds): Modified not to give up if a negative value is given as retry_limit. * subversion/include/svn_client.h * subversion/include/svn_auth.h Fix doc to reflect above change. Patch by: Alexander Thomas Review by: me cmpilato markphip (Tweaked by me, only the docs) ------------------------------------------------------------------------ r34693 | stylesen | 2008-12-12 10:41:48 +0100 (Fri, 12 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Fix compiler warning. * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (gnome_keyring_init): Pass a void argument in order to supress warning of 'old-style function definition'. ------------------------------------------------------------------------ r34694 | julianfoad | 2008-12-12 13:05:10 +0100 (Fri, 12 Dec 2008) | 6 lines Changed paths: M /branches/tc-issue-3334/subversion/libsvn_wc/update_editor.c Check for an existing tree conflict before checking for other problems with the node, when update adds a directory. * subversion/libsvn_wc/update_editor.c (add_directory): Move code around. ------------------------------------------------------------------------ r34695 | julianfoad | 2008-12-12 13:12:08 +0100 (Fri, 12 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/actions.py Tweak a test function for correctness (though it didn't seem to cause a problem) and improve its doc string. * subversion/tests/cmdline/svntest/actions.py (deep_trees_skipping_on_update): Document and tweak as above. ------------------------------------------------------------------------ r34696 | julianfoad | 2008-12-12 15:04:04 +0100 (Fri, 12 Dec 2008) | 5 lines Changed paths: M /branches/tc-issue-3334/subversion/tests/cmdline/switch_tests.py Correct the expectations of a test, brought to light by r34694. * subversion/tests/cmdline/switch_tests.py (failed_anchor_is_target): Adjust. ------------------------------------------------------------------------ r34698 | julianfoad | 2008-12-12 17:04:41 +0100 (Fri, 12 Dec 2008) | 17 lines Changed paths: M /branches/tc-issue-3334/subversion/tests/cmdline/svntest/actions.py M /branches/tc-issue-3334/subversion/tests/cmdline/update_tests.py On the 'tc-issue-3334' branch: Adjust a failing test's expectation to match the new behaviour. However, it still fails, because the behaviour isn't all there yet. (Skipping when anchor == target still isn't implemented.) The test is update_tests.py 50. This is the only failing test at the moment. * subversion/tests/cmdline/svntest/actions.py (deep_trees_tree_del_repos): New function. (deep_trees_skipping_on_update): Make a further change in the repository so that the update under test has an incoming change that it can attempt to apply. (Previously this was not necessary because the conflict-raising update had left the WC at its old base revision, but now the conflict-raising update updates the base to the latest revision.) * subversion/tests/cmdline/update_tests.py (tree_conflicts_on_update_2_3): Adjust expectations. ------------------------------------------------------------------------ r34699 | julianfoad | 2008-12-12 20:13:54 +0100 (Fri, 12 Dec 2008) | 12 lines Changed paths: M /branches/tc-issue-3334/subversion/libsvn_wc/update_editor.c M /branches/tc-issue-3334/subversion/tests/cmdline/update_tests.py On the 'tc-issue-3334' branch: Mark a test as XFail because the change in to make 'update' re-schedule the tree conflict victim also exposes an unimplemented case where the target should be skipped. Also tweak some comments. * subversion/libsvn_wc/update_editor.c (do_entry_deletion): Tweak some comments. * subversion/tests/cmdline/update_tests.py (test_list): Mark tree_conflicts_on_update_2_3 as XFail because skipping isn't yet implemented where anchor == target, the last part of the test. ------------------------------------------------------------------------ r34700 | julianfoad | 2008-12-12 20:21:58 +0100 (Fri, 12 Dec 2008) | 11 lines Changed paths: M /trunk M /trunk/subversion/libsvn_wc/update_editor.c M /trunk/subversion/tests/cmdline/commit_tests.py M /trunk/subversion/tests/cmdline/revert_tests.py M /trunk/subversion/tests/cmdline/stat_tests.py M /trunk/subversion/tests/cmdline/svntest/actions.py M /trunk/subversion/tests/cmdline/switch_tests.py M /trunk/subversion/tests/cmdline/update_tests.py Merge the tc-issue-3334 branch to trunk: Fix part of issue #3334 "Tree conflict merry-go-round on update/switch". This is the first case to be implemented: When "update" or "switch" deletes something that is locally edited, as well as raising a tree conflict, the local node should be scheduled for re-addition as a copy of the previously existing version, so the user can keep their version simply by issuing an "svn resolved" command. ------------------------------------------------------------------------ r34702 | hwright | 2008-12-13 22:36:40 +0100 (Sat, 13 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c More work to consolidate calls to svn_wc__prop_path(). * subversion/libsvn_wc/props.c (save_prop_file): Rename to... (save_prop_tmp_file): ...this, and use the unique stream APIs to create the tmp file. (install_props_file, svn_wc__loggy_revert_props_create): Use the improved API. ------------------------------------------------------------------------ r34703 | hwright | 2008-12-13 22:45:59 +0100 (Sat, 13 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_wc/wc-metadata.sql3 Tweak wc-ng db schema a bit. * subversion/libsvn_wc/wc-metadata.sql3 (NODE): Add a last_mod_time column. ------------------------------------------------------------------------ r34705 | hwright | 2008-12-13 23:17:49 +0100 (Sat, 13 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c Un-refactor a function in libsvn_wc. In attempting to consolidate accesses to svn_wc__props_path(), this two-line function was adding extra indirection and obfuscating my attempts to find all calls to the offending function. * subversion/libsvn_wc/props.c (get_prop_path): Remove. (svn_wc__props_last_modified, svn_wc__loggy_props_delete, svn_wc__props_delete): Inline the removed function. ------------------------------------------------------------------------ r34706 | hwright | 2008-12-14 00:12:41 +0100 (Sun, 14 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c * subversion/libsvn_wc/props.c (load_props): Don't check for an error twice, just check it once, and clear or return it depending on what the error actually is. ------------------------------------------------------------------------ r34707 | rocksun | 2008-12-14 20:41:21 +0100 (Sun, 14 Dec 2008) | 2 lines Changed paths: M /trunk/www/links.html A /trunk/www/links.zh.html * www/links.html: Add Chinese translation links. * www/links.zh.html: Chinese translation based on English r34536 ------------------------------------------------------------------------ r34708 | joeswatosh | 2008-12-15 06:41:26 +0100 (Mon, 15 Dec 2008) | 69 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/svn/client.rb M /trunk/subversion/bindings/swig/ruby/svn/info.rb M /trunk/subversion/bindings/swig/ruby/svn/ra.rb M /trunk/subversion/bindings/swig/ruby/test/test_client.rb M /trunk/subversion/bindings/swig/ruby/test/test_delta.rb M /trunk/subversion/bindings/swig/ruby/test/test_fs.rb M /trunk/subversion/bindings/swig/ruby/test/test_info.rb M /trunk/subversion/bindings/swig/ruby/test/test_ra.rb M /trunk/subversion/bindings/swig/ruby/test/test_repos.rb M /trunk/subversion/bindings/swig/ruby/test/test_wc.rb M /trunk/subversion/bindings/swig/ruby/test/util.rb M /trunk/subversion/bindings/swig/ruby/test/windows_util.rb Follow on to r33730 "Merge the fs-rep-sharing branch to trunk." This merge exposed several bugs in the management of pool lifetimes in the bindings. So manage pool lifetimes better. Or at least try to. There are 3 errors and 1 failure. Two of the errors and the failure have to do with changes to authentication. The last error has to do with using time to specify a revision. * subversion/bindings/swig/ruby/svn/info.rb (Svn::Info#teardown): Close @repos before nilling it. * subversion/bindings/swig/ruby/svn/ra.rb (Svn::Ra::Session.open): Create and assign a pool to forward to Svn::Ra.open2, assign it to a session member variable. Return the session object as before if no block given, yield the session and ensure it is closed if a block is given. (Svn::Ra::Session#close): Destroy the pool. * subversion/bindings/swig/ruby/svn/client.rb (Svn::Client::Context#initialize): Create and assign a pool and assign it to a member variable. (Svn::Client::Context#close): Destroy the pool. (Svn::Client::Context#commit, Svn::Client::Context#open_ra_session, Svn::Client::Context#ls): Use the pool. * subversion/bindings/swig/ruby/test/util.rb (SvnTestUtil#setup_repository): Remember the repo we create instead of opening it again. (SvnTestUtil#make_context): Return the context object as before if no block given, yield the context and ensure it is closed if a block is given. * subversion/bindings/swig/ruby/test/windows_util.rb (SvnTestUtil::Windows::Svnserve#setup_svnserve): Add libapriconv.dll, sqlite3.dll, libdb44.dll, and libdb44d.dll to the targets needed. (SvnTestUtil::Windows::SetupEnvironment #add_depended_dll_path_to_dll_wrapper_util): Add the bin directory for SQLite to the list of wrapped paths. * subversion/bindings/swig/ruby/test/test_client.rb (SvnClientTest): Use the block version of make_context throughout the tests. * subversion/bindings/swig/ruby/test/test_repos.rb (SvnClientTest): Use the block version of make_context throughout the tests. (SvnClientTest#test_session): Rename the context variables used to store the results of make_context so we can have multiple contexts "live" at the same time and ensure they are each closed. * subversion/bindings/swig/ruby/test/test_delta.rb (SvnDeltaTest): Use the block version of make_context throughout the tests, plus some reorganization to move locals out of blocks. * subversion/bindings/swig/ruby/test/test_info.rb (SvnInfoTest): Use the block version of make_context throughout the tests, plus some reorganization to move locals out of blocks. * subversion/bindings/swig/ruby/test/test_fs.rb (SvnFsTest): Use the block version of make_context throughout the tests, plus some reorganization to move locals out of blocks. * subversion/bindings/swig/ruby/test/test_wc.rb (SvnWcTest): Use the block versions of make_context and Svn::Ra::Session.open throughout the tests. * subversion/bindings/swig/ruby/test/test_ra.rb (SvnRaTest): Use the block versions of make_context and Svn::Ra::Session.open throughout the tests, plus some reorganization to move locals out of blocks. ------------------------------------------------------------------------ r34709 | joeswatosh | 2008-12-15 07:05:45 +0100 (Mon, 15 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/windows_util.rb Handle absolute as well as relative paths when reading the gen-make.opts to create the forwarding files for testing the Ruby bindings on windows. * subversion/bindings/swig/ruby/test/windows_util.rb (SvnTestUtil::Windows::SetupEnvironment #add_depended_dll_path_to_dll_wrapper_util): Use Pathname to figure out if the paths to libs listed in gen-make.opts are absolute or relative then make them relative. ------------------------------------------------------------------------ r34710 | joeswatosh | 2008-12-15 07:09:00 +0100 (Mon, 15 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/windows_util.rb Generate the correct files for the 'Debug' build_type. * subversion/bindings/swig/ruby/test/windows_util.rb (SvnTestUtil::Windows::SetupEnvironment #add_depended_dll_path_to_dll_wrapper_util): Check for a BUILD_TYPE environment variable instead of hard coding to 'Release'. ------------------------------------------------------------------------ r34712 | fabien | 2008-12-15 16:42:20 +0100 (Mon, 15 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/po/fr.po French translation update for r34710. * subversion/po/fr.po: po-update and plenty fixed. ------------------------------------------------------------------------ r34714 | hwright | 2008-12-15 16:53:36 +0100 (Mon, 15 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c * subversion/libsvn_wc/props.c (svn_wc__has_props): Avoid an if-else by directly assigning a boolean value. ------------------------------------------------------------------------ r34715 | hwright | 2008-12-15 16:59:42 +0100 (Mon, 15 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c * subversion/libsvn_wc/props.c (modified_props): Move some variables and their initialization into a tighter scope. No functional change. ------------------------------------------------------------------------ r34717 | hwright | 2008-12-15 17:24:32 +0100 (Mon, 15 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c Further consolidate calls to svn_wc__prop_path(). * subversion/libsvn_wc/props.c (empty_props_p): Take a couple of additional arguments to enable us to call svn_wc__prop_path() internally. Also, do some general code reorganization. (svn_wc__has_props): Use the improved API. (modified_props): Use the improved API, and push some now unused variables and their initializations into yet tighter scope. ------------------------------------------------------------------------ r34718 | hwright | 2008-12-15 18:53:47 +0100 (Mon, 15 Dec 2008) | 18 lines Changed paths: M /trunk/subversion/libsvn_wc/log.c M /trunk/subversion/libsvn_wc/props.c M /trunk/subversion/libsvn_wc/props.h M /trunk/subversion/libsvn_wc/status.c Remove a completely redundant function used to check property modification, and simplify the now-unique implementation. * subversion/libsvn_wc/props.c (modified_props): Remove. (svn_wc_props_modified_p): Reimplement upon the remains of modified_props(). (svn_wc__has_prop_mods): Remove this duplicate function. * subversion/libsvn_wc/props.h (svn_wc__has_prop_mods): Remove. * subversion/libsvn_wc/status.c (assemble_status): Use the public API. * subversion/libsvn_wc/log.c (log_do_committed): Same. ------------------------------------------------------------------------ r34719 | hwright | 2008-12-15 19:20:43 +0100 (Mon, 15 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c * subversion/libsvn_wc/props.c: Add some explanatory comments about the props_path() consolidation work, some notes about it's status, and thought about the sqlite implemention. ------------------------------------------------------------------------ r34720 | hwright | 2008-12-15 19:24:59 +0100 (Mon, 15 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs.h * subversion/libsvn_fs_fs/fs.h (representation_t.uniquifier): Expand docstring to note that this may be NULL. Suggested by: julianfoad ------------------------------------------------------------------------ r34725 | hwright | 2008-12-16 15:31:11 +0100 (Tue, 16 Dec 2008) | 20 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/notes/tree-conflicts/scratch-pad.txt 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_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge r34432, r34669 from /branches/1.5.x-34432: * r34432, r34669 Follow-up to r32975, which is already backported and had a bug, see http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=145757. Notes: r34432 is the fix, r34669 adjusts an existing merge test to demonstrate the bug. There is a very minor whitespace conflict in merge_props_changed() in r34432 and a conflict with r34669 due to the usual problem that not all the merge tests are backported. Branch: ^/branches/1.5.x-34432 Justification: r32975 fixed a bug which occurred when a merge added explicit mergeinfo to a subtree that had no explicit mergeinfo prior to the merge. But this fix itself had a bug which could result in an error during a --dry-run merge, r34432 fixes this. Votes: +1: pburba, kameshj, rhuijben ------------------------------------------------------------------------ r34729 | stsp | 2008-12-16 18:55:02 +0100 (Tue, 16 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/include/private/svn_mergeinfo_private.h * subversion/include/private/svn_mergeinfo_private.h (svn_mergeinfo__catalog_to_formatted_string): Fix typo in docstring. ------------------------------------------------------------------------ r34732 | cmpilato | 2008-12-16 19:02:54 +0100 (Tue, 16 Dec 2008) | 2 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c * subversion/libsvn_client/merge.c (merge_props_changed): Indentation fix. ------------------------------------------------------------------------ r34735 | stsp | 2008-12-16 19:07:46 +0100 (Tue, 16 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py * subversion/tests/cmdline/merge_tests.py (reintegrate_with_subtree_mergeinfo): Fix typo in a comment. ------------------------------------------------------------------------ r34737 | stsp | 2008-12-16 19:45:44 +0100 (Tue, 16 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c * subversion/libsvn_client/merge.c (find_unmerged_mergeinfo): Small whitespace tweak. ------------------------------------------------------------------------ r34738 | cmpilato | 2008-12-16 19:48:20 +0100 (Tue, 16 Dec 2008) | 2 lines Changed paths: M /trunk/subversion/libsvn_subr/dirent_uri.c * subversion/libsvn_subr/dirent_uri.c: Rewraps of long lines only. ------------------------------------------------------------------------ r34739 | hwright | 2008-12-16 20:18:43 +0100 (Tue, 16 Dec 2008) | 2 lines Changed paths: A /branches/1.5.x-build-fixes (from /branches/1.5.x:34738) Create 1.5.x-build-fixes branch, to fix the 1.5.x build. ------------------------------------------------------------------------ r34740 | hwright | 2008-12-16 20:43:56 +0100 (Tue, 16 Dec 2008) | 15 lines Changed paths: M /branches/1.5.x-build-fixes/subversion/include/private M /branches/1.5.x-build-fixes/subversion/include/private/svn_mergeinfo_private.h M /branches/1.5.x-build-fixes/subversion/libsvn_subr M /branches/1.5.x-build-fixes/subversion/libsvn_subr/mergeinfo.c On the 1.5.x-build-fixes branch: Merge the following parts of r34306 from trunk: * subversion/include/private/svn_mergeinfo_private.h, subversion/libsvn_subr/mergeinfo.c (svn_mergeinfo__get_range_endpoints, svn_mergeinfo__filter_mergeinfo_by_ranges, svn_mergeinfo__filter_catalog_by_ranges): New functions. * subversion/libsvn_subr/mergeinfo.c (svn_mergeinfo__catalog_to_formatted_string, svn_mergeinfo__to_formatted_string): New functions. This does not yet build, due to a dependency on bits of r34091. ------------------------------------------------------------------------ r34741 | hwright | 2008-12-16 21:04:03 +0100 (Tue, 16 Dec 2008) | 5 lines Changed paths: M /branches/1.5.x-build-fixes/subversion/libsvn_subr/mergeinfo.c On the 1.5.x-build-fixes branch: Merge bits of r34091, to support two of the functions introduced in r34740. This was done with a manual merge (no mergeinfo recording) since it was just a few hunks from one file. ------------------------------------------------------------------------ r34742 | hwright | 2008-12-16 21:05:01 +0100 (Tue, 16 Dec 2008) | 11 lines Changed paths: M /trunk/subversion/include/private/svn_mergeinfo_private.h M /trunk/subversion/libsvn_subr/mergeinfo.c Fix a typo in a function name. * subversion/libsvn_subr/mergeinfo.c (svn_mergeinfo__filter_catalog_by_ranges): Adjust caller. (svn_mergeinfo__filter_mergefino_by_ranges): Rename to... (svn_mergeinfo__filter_mergeinfo_by_ranges): ...this. * subversion/include/private/svn_mergeinfo_private.h (svn_mergeinfo__filter_mergefino_by_ranges): Rename to... (svn_mergeinfo__filter_mergeinfo_by_ranges): ...this. ------------------------------------------------------------------------ r34748 | hwright | 2008-12-16 22:48:28 +0100 (Tue, 16 Dec 2008) | 16 lines Changed paths: M /branches/1.5.x/STATUS M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py On the 1.5.x branch: * Remove exit_code on merge_test.py 106, follow up to merge in r34393. Justification: Fixes a test failure caused by differences in the test API between 1.5.x and trunk. Notes: This was tested on the 1.5.x-build-fixes branch, since 1.5.x doesn't currently build. Votes: +1: hwright, pburba, stsp * subversion/tests/cmdline/merge_tests.py (dont_merge_gaps_in_history): Remove use of exit_code for svntest.actions.run_and_verify_svn(). ------------------------------------------------------------------------ r34749 | pburba | 2008-12-16 22:52:25 +0100 (Tue, 16 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/tests/cmdline/merge_tests.py Fix a typo from r34306. Found by: stsp * subversion/tests/cmdline/merge_tests.py (reintegrate_with_subtree_mergeinfo): Comment fix. ------------------------------------------------------------------------ r34750 | joeswatosh | 2008-12-17 06:59:04 +0100 (Wed, 17 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/windows_util.rb Fix the default build type (should have been release). * subversion/bindings/swig/ruby/test/windows_util.rb (SvnTestUtil::Windows::SetupEnvironment#setup_test_environment): Make the default build_type 'Release' instead of 'Debug'. ------------------------------------------------------------------------ r34755 | jerenkrantz | 2008-12-17 09:48:26 +0100 (Wed, 17 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: partially revert r34179 but ignore cert chains with serf 0.3.0+. * subversion/libsvn_ra_serf/util.c (ssl_server_cert): If we're using serf 0.3.0+, implicitly approve non-server certs; allow certificate storage to be corrupted again (only with serf <0.3.0). ------------------------------------------------------------------------ r34756 | kameshj | 2008-12-17 10:05:18 +0100 (Wed, 17 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Clarity fix. * subversion/libsvn_client/merge.c (do_directory_merge): 'svn_path_get_longest_ancestor' returns 'empty char *' when unrelated paths are involved, so make use of it rather than explicit call to 'svn_path_is_child'. Suggested by: cmpilato ------------------------------------------------------------------------ r34758 | kou | 2008-12-17 13:52:52 +0100 (Wed, 17 Dec 2008) | 23 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c M /trunk/subversion/bindings/swig/ruby/svn/client.rb M /trunk/subversion/bindings/swig/ruby/test/test_client.rb M /trunk/subversion/bindings/swig/ruby/test/test_repos.rb M /trunk/subversion/bindings/swig/ruby/test/util.rb Improve Svn::Client::Context destroy API. * subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c (swig_type_regex, find_swig_type_object): Move definition poistion. (svn_swig_rb_destroyer_destroy): New method. (svn_swig_rb_initialize): Add Svn::Destroyer. * subversion/bindings/swig/ruby/svn/client.rb (Svn::Client::Context#initialize): Support block. (Svn::Client::Context#close): Rename to ... (Svn::Client::Context#desroy): ... this. (Svn::Client::Context#commit, Svn::Client::Context#open_ra_session, Svn::Client::Context#ls): Use its own pool. * subversion/bindings/swig/ruby/test/test_client.rb (SvnClientTest#test_authentication, SvnClientTest#test_add_providers, SvnClientTest#test_context_mimetypes_map), subversion/bindings/swig/ruby/test/test_repos.rb (SvnReposTest#test_logs), subversion/bindings/swig/ruby/test/util.rb (SvnTestUtil#make_context): Use new improved Svn::Client::Context API. ------------------------------------------------------------------------ r34759 | kou | 2008-12-17 13:57:54 +0100 (Wed, 17 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__noderev_same_rep_key): Add missing NULL check. Review by: hwright ------------------------------------------------------------------------ r34760 | kameshj | 2008-12-17 14:25:49 +0100 (Wed, 17 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Revert r34756 as it is logically incorrect. svn_path_get_longest_ancestor('/a/b/c', '/a/z', pool) returns '/a' which won't cause assertion failure whereas it should. Found-by: julianfoad ------------------------------------------------------------------------ r34762 | kameshj | 2008-12-17 14:32:08 +0100 (Wed, 17 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Clarity fix. * subversion/libsvn_client/merge.c (do_directory_merge): If 'abs_added_path' is a child of 'abs_target_path', then 'abs_target_path' is the longest common ancestor. Suggested by: julianfoad ------------------------------------------------------------------------ r34766 | kameshj | 2008-12-17 16:46:59 +0100 (Wed, 17 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_client/merge.c Clarity fix. * subversion/libsvn_client/merge.c (do_directory_merge): 'svn_path_is_child' itself returns child's path relative to parent's path so make use of it rather than computing it again. Patch by: cmpilato Suggested by: julianfoad ------------------------------------------------------------------------ r34767 | hwright | 2008-12-17 16:49:39 +0100 (Wed, 17 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_wc/props.c Simplify a function by removing code for never-used functionality. Review by: gstein * subversion/libsvn_wc/props.c (svn_wc_props_modified_p): Remove large swaths of code made non-callable by a complete lack of desire for a list of the actual properties modified. ------------------------------------------------------------------------ r34768 | hwright | 2008-12-17 17:04:00 +0100 (Wed, 17 Dec 2008) | 24 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/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/private M /branches/1.5.x/subversion/include/private/svn_mergeinfo_private.h M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_subr M /branches/1.5.x/subversion/libsvn_subr/mergeinfo.c M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge the 1.5.x-build-fixes branch to 1.5.x: * ^/branches/1.5.x-build-fixes Fix the build, which resulted from the merge in r34393. For full analysis, see: http://svn.haxx.se/dev/archive-2008-12/0445.shtml Justification: The build shouldn't be broken. Ever. Notes: The merge in r34393 was dependent on additional APIs. The fixes branch includes code which will (probably) be merged as part of the reintegrate-improvements branch. If that branch gets merged, this item can disappear. This is currently a test failure on the branch, but I think that it's also on 1.5.x, and a result of the r34393 merge. See email thread . Branch: ^/branches/1.5.x-build-fixes@34764 Votes: +1: hwright (@r?????), pburba (@r?????), jerenkrantz (@r?????) +0: julianfoad (@r34764) [ Note: Before merging, I ran the test suite, and everything came up clean. The test failure mentioned above was fixed on 1.5.x. ] ------------------------------------------------------------------------ r34769 | hwright | 2008-12-17 17:05:00 +0100 (Wed, 17 Dec 2008) | 2 lines Changed paths: D /branches/1.5.x-build-fixes Remove 1.5.x-build-fixes branch, merged to 1.5.x in r34768. ------------------------------------------------------------------------ r34771 | hwright | 2008-12-17 17:56:36 +0100 (Wed, 17 Dec 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/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/private M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_subr M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge r34547, r34732 from trunk: * r34547, r34732 Fix issue #3323 'Mergeinfo deleted by a merge should disappear' Notes: Will conflict if r34432 is not applied first. Note that r34547 does not depend on r34432 to function properly, so can be backported by itself if necessary. r34732 is an "obvious fix" indentation tweak. Justification: A merge that should remove subtree mergeinfo doesn't actually do so. The subtree mergeinfo is initially deleted, but then is replaced by mergeinfo describing the merge itself. This isn't a very common situation, see http://subversion.tigris.org/issues/show_bug.cgi?id=3323, but anything that reduces the amount of explicit subtree mergeinfo is a good thing. Votes: +1: pburba, kameshj, cmpilato ------------------------------------------------------------------------ r34783 | stsp | 2008-12-17 19:37:22 +0100 (Wed, 17 Dec 2008) | 13 lines Changed paths: M /branches/1.5.x-r30756 M /branches/1.5.x-r30756/CHANGES M /branches/1.5.x-r30756/COMMITTERS M /branches/1.5.x-r30756/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-r30756/subversion/bindings/swig M /branches/1.5.x-r30756/subversion/include/private M /branches/1.5.x-r30756/subversion/libsvn_client/merge.c M /branches/1.5.x-r30756/subversion/libsvn_subr M /branches/1.5.x-r30756/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x-r30756/subversion/libsvn_wc/merge.c M /branches/1.5.x-r30756/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x-r30756/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x-r30756/www/images/subversion-diagram.png M /branches/1.5.x-r30756/www/images/subversion_logo-200x173.png M /branches/1.5.x-r30756/www/images/subversion_logo-384x332.png M /branches/1.5.x-r30756/www/images/subversion_logo_hor-468x64.png On the 1.5.x-r30756 branch: Backport of r30756, r32907, and r32913 to 1.5.x. Allow 'svn merge' to merge diffs which add 'svn:eol-style' properties to files that used to have inconsistent newlines. As part of conflict resolution, also add some bits from r32405: * subversion/tests/cmdline/merge_tests.py (local_path, svn_commit, svn_merge, svn_propset): New helper functions added in r32405, needed by the test added in r32907. There is no mergeinfo record of this change, because r32405 is too large to be merged entirely. ------------------------------------------------------------------------ r34788 | julianfoad | 2008-12-17 20:13:44 +0100 (Wed, 17 Dec 2008) | 6 lines Changed paths: M /branches/1.5.x-r30756 M /branches/1.5.x-r30756/CHANGES M /branches/1.5.x-r30756/COMMITTERS M /branches/1.5.x-r30756/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-r30756/subversion/bindings/swig M /branches/1.5.x-r30756/subversion/include/private M /branches/1.5.x-r30756/subversion/libsvn_client/merge.c M /branches/1.5.x-r30756/subversion/libsvn_subr M /branches/1.5.x-r30756/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x-r30756/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x-r30756/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x-r30756/www/images/subversion-diagram.png M /branches/1.5.x-r30756/www/images/subversion_logo-200x173.png M /branches/1.5.x-r30756/www/images/subversion_logo-384x332.png M /branches/1.5.x-r30756/www/images/subversion_logo_hor-468x64.png On the '1.5.x-r30756' branch: * subversion/tests/cmdline/merge_tests.py Merge r32930 from /trunk, which is a fix to make the test introduced in r34783 (r32907 on /trunk) work properly on Windows. ------------------------------------------------------------------------ r34790 | pburba | 2008-12-17 20:20:18 +0100 (Wed, 17 Dec 2008) | 4 lines Changed paths: M /branches/1.5.x-reintegrate-improvements M /branches/1.5.x-reintegrate-improvements/CHANGES M /branches/1.5.x-reintegrate-improvements/COMMITTERS M /branches/1.5.x-reintegrate-improvements/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-reintegrate-improvements/subversion/bindings/swig M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png On the 1.5.x-reintegrate-improvements branch, --record-only merge r34766-34768 from 1.5.x. r34766-r34767 are no-ops on 1.5.x and this branch already has the changes made in 1.5.x@34768. ------------------------------------------------------------------------ r34794 | cmpilato | 2008-12-17 20:50:43 +0100 (Wed, 17 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/libsvn_wc/merge.c * subversion/libsvn_wc/merge.c Fix some comment formatting, and remove extra lines so the comments "bind" better with the function call they describe. ------------------------------------------------------------------------ r34797 | pburba | 2008-12-17 21:03:45 +0100 (Wed, 17 Dec 2008) | 3 lines Changed paths: M /branches/1.5.x-reintegrate-improvements M /branches/1.5.x-reintegrate-improvements/CHANGES M /branches/1.5.x-reintegrate-improvements/COMMITTERS M /branches/1.5.x-reintegrate-improvements/STATUS M /branches/1.5.x-reintegrate-improvements/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x-reintegrate-improvements/subversion/bindings/swig M /branches/1.5.x-reintegrate-improvements/subversion/include/private M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_subr M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png M /branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png On the 1.5.x-reintegrate-improvements branch, merge r34771 from 1.5.x. Resolve a minor conflict in merge.c. ------------------------------------------------------------------------ r34802 | pburba | 2008-12-17 22:51:07 +0100 (Wed, 17 Dec 2008) | 101 lines Changed paths: M /branches/1.5.x-reintegrate-improvements/subversion/include/private M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_subr On the 1.5.x-reintegrate-improvements branch, some mergeinfo-fu: In a WC for the 1.5.x-reintegrate-improvements branch I performed these four commands: >svn merge http://svn.collab.net/repos/svn/branches/1.5.x/subversion/include/private subversion\include\private -r34511:34796 --ignore-ancestry --depth empty --- Merging r34512 through r34796 into 'subversion\include\private': G subversion\include\private >svn merge http://svn.collab.net/repos/svn/branches/1.5.x/subversion/include/private subversion\include\private --record-only -r34511:34796 >svn merge http://svn.collab.net/repos/svn/branches/1.5.x/subversion/libsvn_subr subversion\libsvn_subr -r34511:34796 --ignore-ancestry --depth empty --- Merging r34512 through r34796 into 'subversion\libsvn_subr': G subversion\libsvn_subr >svn merge http://svn.collab.net/repos/svn/branches/1.5.x/subversion/libsvn_subr subversion\libsvn_subr -r34511:34796 --record-only Why? So we can use --reintegrate when merging 1.5.x-reintegrate-improvements back to trunk. In r34970 I --record-only merged r34766-34768 from 1.5.x to 1.5.x-reintegrate-improvements. But r34768 in 1.5.x added explicit mergeinfo to subversion\libsvn_subr and subversion\include\private, and since I only did a --record-only merge of that revision those two subtrees never got any explicit mergeinfo until the *next* time I did a "real" merge from of r34769-34770 from 1.5.x to 1.5.x-reintegrate-improvements in r34792 -- In r34792 the two subtrees finally get explict mergeinfo but this mergeinfo only represented the diff between 1.5.x@34768 and 1.5.x@34769: >svn diff --depth empty -r34768:34770 http://svn.collab.net/repos/svn/branches/1.5.x/subversion/include/private Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk/subversion/include/private:r30257,33024,33026 >svn pg svn:mergeinfo -v http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/ \ subversion/include/private@34792 Properties on ' http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/ subversion/include/private': svn:mergeinfo /trunk/subversion/include/private:30257,33024,33026 >svn diff --depth empty -r34768:34770 http://svn.collab.net/repos/svn/branches/1.5.x/subversion/libsvn_subr Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk/subversion/libsvn_subr:r30257,33024,33026 >svn pg svn:mergeinfo -v http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements \ /subversion/libsvn_subr@34792 Properties on ' http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements/ subversion/libsvn_subr': svn:mergeinfo /trunk/subversion/libsvn_subr:30257,33024,33026 This is a problem for reintegrate because it appears that subversion\libsvn_subr and subversion\include\private are missing revisions r34512-34770: >svn merge --reintegrate http://svn.collab.net/repos/svn/branches/1.5.x-reintegrate-improvements . svn: Reintegrate can only be used if revisions 34512 through 34801 were previously merged from http://svn.collab.net/repos/svn/branches/1.5.x to the reintegrate source, but this is not the case: branches/1.5.x-reintegrate-improvements/subversion/include/private Missing ranges: /branches/1.5.x/subversion/include/private:34512-34770 branches/1.5.x-reintegrate-improvements/subversion/libsvn_subr Missing ranges: /branches/1.5.x/subversion/libsvn_subr:34512-34770 Still here? Good for you! Anyway, the --ignore-ancestry merges at depth empty add the "missing" mergeinfo that the --record-only merge would have added. This is not really necessary to get reintegrate to work, but it will prevent the reintegrate merge from removing a whole slew of mergeinfo on the two subtrees in question. The --record-only merges are what allow the reintegrate to actually work, by adding the missing blocks of revisions. For those of you with no lives or who really pay attention to merge tracking bugs (are those different?) you'll notice that this whole problem is a lot like the one solved by r32975 'Fix bug which occurs when a merge adds explicit mergeinfo to a subtree that had no explicit mergeinfo prior to the merge.', but with --record-only merges. I say "problem" because I don't see this particular situation as a bug, more as a warning to be careful what you do with --record-only. ------------------------------------------------------------------------ r34803 | hwright | 2008-12-18 00:21:18 +0100 (Thu, 18 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_client/copy.c Return a better error message when a target of 'cp --parents' exists, but is a file. * subversion/libsvn_client/copy.c (repos_to_repos_copy, wc_to_repos_copy): Toss an error if we reach and existent "to-be-created" parent directory, but isn't not a directory. ------------------------------------------------------------------------ r34804 | kou | 2008-12-18 00:40:25 +0100 (Thu, 18 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Followup to r34759. * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__noderev_same_rep_key): Add missing equality check. Found by julianfoad. ------------------------------------------------------------------------ r34806 | jerenkrantz | 2008-12-18 10:44:18 +0100 (Thu, 18 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: Fix connection lifetime issue that is resolved in newer serfs (r1206) as they cleanup connections properly now. * subversion/libsvn_ra_serf/util.c (svn_ra_serf__cleanup_serf_session): If serf 0.3.0+, don't even attempt to close conns as they should already be destroyed. ------------------------------------------------------------------------ r34813 | hwright | 2008-12-18 18:13:55 +0100 (Thu, 18 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java * subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java (NotifyInformation): If the path is null, pass the empty path instead of null. The underlying EventObject does not like null paths in its constructor. ------------------------------------------------------------------------ r34814 | cmpilato | 2008-12-18 18:34:41 +0100 (Thu, 18 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_subr/mergeinfo.c Fix some memory waste and minor logic oopses. * subversion/libsvn_subr/mergeinfo.c (svn_mergeinfo__catalog_to_formatted_string): Lose a bunch of unnecessary apr_pstrdup()s, and fix the code to not clobber the newline-carrying svn_string_t it creates in the fallback case. (svn_mergeinfo__to_formatted_string): Lose unnecessary apr_pstrdup()s and simplify. ------------------------------------------------------------------------ r34827 | julianfoad | 2008-12-18 23:34:04 +0100 (Thu, 18 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_ra_neon/mergeinfo.c * subversion/libsvn_ra_neon/mergeinfo.c (cdata_handler): Change bug-hiding "if"s into bug-revealing assertions. ------------------------------------------------------------------------ r34828 | cauchy | 2008-12-19 09:06:31 +0100 (Fri, 19 Dec 2008) | 4 lines Changed paths: M /branches/1.5.x/subversion/po/zh_CN.po Simplified chinese translation update on the '1.5.x' branch: * subversion/po/zh_CN.po: translate new backport strings. ------------------------------------------------------------------------ r34830 | kameshj | 2008-12-19 09:26:14 +0100 (Fri, 19 Dec 2008) | 15 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/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/private M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_ra_neon/mergeinfo.c M /branches/1.5.x/subversion/libsvn_subr M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge r34822 from trunk: * r34822 Fix a bogus assumption in the ra-neon mergeinfo REPORT parsing logic. Justification: This bug results in mergeinfo catalogs with incorrect path keys (generally missing their first chunk of bytes) which can result in such confusing user scenarios as seeing errors with successful (200) status codes. Notes: Simple conflict: use of "SVN_ERR_ASSERT(...)" needs to be replaced with "#include " and "assert(...)". Votes: +1: cmpilato, julianfoad, kameshj ------------------------------------------------------------------------ r34831 | cauchy | 2008-12-19 10:19:56 +0100 (Fri, 19 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/po/zh_CN.po Simplified chinese translation update. * subversion/po/zh_CN.po: Update to r34827, translate some new strings. 1915 translated messages, 27 fuzzy translations, 30 untranslated messages. ------------------------------------------------------------------------ r34832 | julianfoad | 2008-12-19 12:31:55 +0100 (Fri, 19 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_ra_neon/mergeinfo.c Remove two null-pointer assertions because they weren't worth their weight. I introduced them in r34827 as improvements over silently ignoring. Suggested by: kameshj * subversion/libsvn_ra_neon/mergeinfo.c (cdata_handler): Remove assertions. [See http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=987361 for background on why it is safe to remove the check completely.] ------------------------------------------------------------------------ r34834 | kameshj | 2008-12-19 14:21:01 +0100 (Fri, 19 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_subr/mergeinfo.c * subversion/libsvn_subr/mergeinfo.c (svn_mergeinfo__to_formatted_string): Avoid unnecessary allocation. ------------------------------------------------------------------------ r34835 | julianfoad | 2008-12-19 15:05:43 +0100 (Fri, 19 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_ra_svn/cyrus_auth.c Fix a crash in Cyrus SASL auth support. From looking at the history it appears that the bug lay dormant until r33866 which started passing strings that are actually unmodifiable. Found by: hwright * subversion/libsvn_ra_svn/cyrus_auth.c (try_auth): Don't try to modify a constant string; allocate a new one. ------------------------------------------------------------------------ r34838 | hwright | 2008-12-19 15:33:36 +0100 (Fri, 19 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/test_wc.rb * subversion/bindings/swig/ruby/test/test_wc.rb (test_relocate): Fix a ruby test expectation, as a result of r33786. Reviewed by: joeswatosh ------------------------------------------------------------------------ r34841 | hwright | 2008-12-19 15:51:10 +0100 (Fri, 19 Dec 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/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/private M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_ra_svn/cyrus_auth.c M /branches/1.5.x/subversion/libsvn_subr M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge r34835 from trunk: * r34835 Fix a crash in Cyrus SASL auth support, introduced by r33866 which was back-ported here in r34610. Justification: Crash. Regression. See . Votes: +1: julianfoad, hwright, cmpilato ------------------------------------------------------------------------ r34846 | hwright | 2008-12-19 16:31:44 +0100 (Fri, 19 Dec 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/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/bindings/swig/ruby/test/test_wc.rb M /branches/1.5.x/subversion/include/private M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_subr M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge r34838 from the 1.5.x-rb-test-fix branch: * r34838 Fix a test expection for the swig ruby tests. Justification: We want the tests to pass. Joe looked at something similar to this on trunk: http://svn.haxx.se/dev/archive-2008-12/0557.shtml Branch: ^/branches/1.5.x-rb-test-fix Votes: +1: hwright, jerenkrantz ------------------------------------------------------------------------ r34851 | markphip | 2008-12-19 18:00:14 +0100 (Fri, 19 Dec 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/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/private M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_subr M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge r34196 * r34196 JavaHL: Update tests to adjust move expectations of creating mergeinfo. Justification: Backport of r34184 changed move/copy behavior and tests needed to be updated. This was done on trunk and was just not included in backport recommendation. Votes: +1: markphip, hwright ------------------------------------------------------------------------ r34853 | pburba | 2008-12-19 18:18:09 +0100 (Fri, 19 Dec 2008) | 34 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/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/private M /branches/1.5.x/subversion/include/private/svn_mergeinfo_private.h M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_subr M /branches/1.5.x/subversion/libsvn_subr/mergeinfo.c M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Reintegrate the 1.5.x-reintegrate-improvements branch back to 1.5.x. * r34091, r34094, r34244, r34256, r34306, r34331, r34742, r34814 Various svn merge --reintegrate improvements. Branch: ^/branches/1.5.x-reintegrate-improvements Justification: Prior to these changes reintegrate would not work if the merge source had any subtree mergeinfo. Since subtree mergeinfo is quite common, this meant reintegrate was largely unuseable. With these changes reintegrate will work as long as the source's subtree mergeinfo and implicit mergeinfo reflect the fact that the reintegrate target was previously merged uniformly to the source for some contiguous revision range starting at the revision the source was branched from the target. These changes also improve the notoriously vague error message which occurred when reintegrate was thwarted by subtree mergeinfo. Notes: This code reintroduces a use of svn_ra_get_mergeinfo with include_descendants=TRUE, which can trigger the bug fixed by r34822 due to the size of the request response. Consider r34822 a prerequisite for this change group. Votes: +1: pburba, kameshj +1: cmpilato (r34331, r34742, r34814 only) +1: jerenkrantz (!r34331, !r34742, !r34814) +0: stsp (With my limited understanding of merge tracking it takes ages for me to review this properly. The change is fairly large. I've read all log messages and most of the diffs, including the history of the branch merged to trunk in r34091. I understand what the change is supposed to be doing, and from that point of view I can say that it actually does improve things a lot.) ------------------------------------------------------------------------ r34854 | julianfoad | 2008-12-19 18:19:26 +0100 (Fri, 19 Dec 2008) | 18 lines Changed paths: M /trunk/subversion/include/private/svn_wc_private.h M /trunk/subversion/libsvn_client/commit_util.c M /trunk/subversion/libsvn_wc/adm_ops.c M /trunk/subversion/libsvn_wc/entries.c M /trunk/subversion/libsvn_wc/log.c M /trunk/subversion/libsvn_wc/status.c M /trunk/subversion/libsvn_wc/tree_conflicts.c Make svn_wc__read_tree_conflicts() allocate its own result array, so the caller doesn't have to. Remove the ability to append to an existing array, as this is not needed. * subversion/libsvn_wc/tree_conflicts.c (svn_wc__read_tree_conflicts): Allocate the array for results. * subversion/include/private/svn_wc_private.h (svn_wc__read_tree_conflicts): Adjust the doc string. * subversion/libsvn_client/commit_util.c * subversion/libsvn_wc/adm_ops.c, subversion/libsvn_wc/entries.c, subversion/libsvn_wc/log.c, subversion/libsvn_wc/status.c, subversion/libsvn_wc/tree_conflicts.c In all callers: don't allocate the array for results. ------------------------------------------------------------------------ r34857 | julianfoad | 2008-12-19 18:40:50 +0100 (Fri, 19 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_wc/update_editor.c Trivial doc string fix. * subversion/libsvn_wc/update_editor.c (make_file_baton): Document a parameter that wasn't mentioned. ------------------------------------------------------------------------ r34858 | sussman | 2008-12-19 18:56:03 +0100 (Fri, 19 Dec 2008) | 20 lines Changed paths: M /branches/http-protocol-v2/subversion/include/svn_dav.h M /branches/http-protocol-v2/subversion/mod_dav_svn/dav_svn.h M /branches/http-protocol-v2/subversion/mod_dav_svn/mod_dav_svn.c M /branches/http-protocol-v2/subversion/mod_dav_svn/version.c On the 'http-protocol-v2' branch: Followup to r34386 (http protocol v2 OPTIONS stubs), based on gstein's review. * subversion/include/svn_dav.h (SVN_DAV_ROOT_STUB_HEADER, SVN_DAV_PEGREV_STUB_HEADER, SVN_DAV_REV_STUB_HEADER, SVN_DAV_YOUNGEST_REV_HEADER): remove the "X-" prefix on these headers. * subversion/mod_dav_svn/dav_svn.h (DAV_SVN__*_STUB): delete these constants... (dav_svn__get_*_stub): create these five accessor functions instead. * subversion/mod_dav_svn/mod_dav_svn.c (dav_svn__get_*_stub): implement the five accessor functions here, in terms of the configurable 'special' uri. * subversion/mod_dav_svn/version.c (get_option): use %ld instead of deprecated SVN_REVNUM_T_FMT. update calls to new accessors. ------------------------------------------------------------------------ r34859 | julianfoad | 2008-12-19 19:14:58 +0100 (Fri, 19 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_client/copy.c Rearrange a bit of code to avoid casting away "const" and to keep data in tighter scope. * subversion/libsvn_client/copy.c (wc_to_repos_copy): Rearrange. ------------------------------------------------------------------------ r34860 | julianfoad | 2008-12-19 19:16:07 +0100 (Fri, 19 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_wc/log.c M /trunk/subversion/libsvn_wc/tree_conflicts.c Fix idempotency of loggy tree conflict operations. * subversion/libsvn_wc/log.c (log_do_add_tree_conflict): Ignore attempts to add the same conflict again. (run_log): Move the tree conflicts code inside the RERUN_LOG_FILES loop. (However, the RERUN_LOG_FILES test mode currently fails anyway.) * subversion/libsvn_wc/tree_conflicts.c (svn_wc__add_tree_conflict): Check for duplicates here instead. ------------------------------------------------------------------------ r34863 | arfrever | 2008-12-19 20:54:13 +0100 (Fri, 19 Dec 2008) | 14 lines Changed paths: M /trunk/subversion/bindings/swig/python/svn/fs.py M /trunk/subversion/tests/cmdline/svntest/main.py M /trunk/subversion/tests/cmdline/update_tests.py Python 3 compatibility: Try to use subprocess module in 'subversion' directory. * subversion/bindings/swig/python/svn/fs.py (FileDiff.get_pipe): * subversion/tests/cmdline/svntest/main.py (open_pipe): * subversion/tests/cmdline/update_tests.py (update_wc_on_windows_drive): Try to use subprocess module. * subversion/tests/cmdline/svntest/main.py (wait_on_pipe): Properly use exit code from processes opened with subprocess. (spawn_process, copy_repos): Pass lists to open_pipe(). ------------------------------------------------------------------------ r34866 | hwright | 2008-12-19 22:28:09 +0100 (Fri, 19 Dec 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_wc/wc_db.c M /trunk/subversion/libsvn_wc/wc_db.h WC-NG: Add a few more database administrative APIs. This mainly just fleshes out some ideas I've had about transaction handling and general db administration. * subversion/libsvn_wc/wc_db.c (svn_wc__db_txn_begin, svn_wc__db_txn_rollback, svn_wc__db_txn_commit, svn_wc__db_close): New. * subversion/libsvn_wc/wc_db.h (svn_wc__db_txn_begin, svn_wc__db_txn_rollback, svn_wc__db_txn_commit, svn_wc__db_close): New. ------------------------------------------------------------------------ r34867 | hwright | 2008-12-19 22:41:54 +0100 (Fri, 19 Dec 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/libsvn_fs_fs/structure Followup to r34616: Update documentation to reflect a new use of the node-id within an FSFS transaction. Suggested by: glasser * subversion/libsvn_fs_fs/fs_fs.c (write_next_ids, read_next_ids, get_new_txn_node_id): Update doc string. * subversion/libsvn_fs_fs/structure: Note that the next-temp-node-id may be used for both creating unique node ids and also uniquifiying reps. ------------------------------------------------------------------------ r34870 | arfrever | 2008-12-19 23:21:55 +0100 (Fri, 19 Dec 2008) | 5 lines Changed paths: M /trunk/tools/client-side/bash_completion Add BASH completion for svnlook. * tools/client-side/bash_completion (_svnlook): New. ------------------------------------------------------------------------ r34872 | arfrever | 2008-12-20 01:41:59 +0100 (Sat, 20 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/po/pl.po Polish translation update. * subversion/po/pl.po: Polish translation update. ------------------------------------------------------------------------ r34873 | julianfoad | 2008-12-20 02:05:18 +0100 (Sat, 20 Dec 2008) | 14 lines Changed paths: M /trunk/subversion/libsvn_client/client.h M /trunk/subversion/libsvn_client/url.c M /trunk/subversion/libsvn_ra_svn/cyrus_auth.c M /trunk/subversion/libsvn_subr/mergeinfo.c Don't cast away 'const' when there's a better way. * subversion/libsvn_client/client.h, subversion/libsvn_client/url.c (svn_client__derive_location): Take a non-const session pointer, as it requires, rather than pretending it takes a const one. * subversion/libsvn_ra_svn/cyrus_auth.c (svn_ra_svn__enable_sasl_encryption): Add "const" to the cast. Also move variables into tighter scope. * subversion/libsvn_subr/mergeinfo.c (mergeinfo_to_stringbuf): Add "const" to the cast. ------------------------------------------------------------------------ r34874 | julianfoad | 2008-12-20 02:12:05 +0100 (Sat, 20 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_client/copy.c Factor out functions for finding absent parent directories that need to be made for the "copy --parents" code path. Factoring out these two similar functions is a preliminary step to combining them. * subversion/libsvn_client/copy.c (find_absent_parents1, find_absent_parents2): New functions, extracted from repos_to_repos_copy() and wc_to_repos_copy() respectively. (repos_to_repos_copy): Use find_absent_parents1(). (wc_to_repos_copy): Use find_absent_parents2() and tweak comments. ------------------------------------------------------------------------ r34875 | rhuijben | 2008-12-20 12:48:53 +0100 (Sat, 20 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/depth_tests.py * subversion/tests/cmdline/depth_tests.py (upgrade_from_above): Clone the sandbox instead of trying to clean from within the test. The cleaning code frequently failed to remove all files when testing BDB via mod_dav_svn and svnserve. (Especially on Windows where files can't be deleted while some process has a handle open) ------------------------------------------------------------------------ r34876 | rhuijben | 2008-12-20 13:28:17 +0100 (Sat, 20 Dec 2008) | 13 lines Changed paths: M /trunk/win-tests.py On Windows, allow running the mod_dav_svn tests with httpd as daemon instead of as global Windows service. (Removes the administrator rights requirement for running the mod_dav_svn tests) * win-tests.py (global, _usage_exit): Add --httpd-daemon and --httpd-service arguments. Default to running as service to keep current behavior. (Httpd): Add support for running apache in daemon mode instead of as service. (Httpd.start, Httpd.stop): Implement as call to _*_service or _*_daemon. (Httpd._start_service, Http._stop_service): Moved start and stop code here. (Httpd._start_daemon, Httpd._stop_daemon): Start and stop apache as daemon (mostly copied from the svnserve code). ------------------------------------------------------------------------ r34879 | cauchy | 2008-12-21 07:15:53 +0100 (Sun, 21 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/po/zh_CN.po Simplified chinese translation update. * subversion/po/zh_CN.po: Update to r34878, translate some new strings. ------------------------------------------------------------------------ r34880 | cauchy | 2008-12-21 07:19:04 +0100 (Sun, 21 Dec 2008) | 4 lines Changed paths: M /branches/1.5.x/subversion/po/zh_CN.po Simplified chinese translation update on the '1.5.x' branch: * subversion/po/zh_CN.po: translate new backport strings. ------------------------------------------------------------------------ r34881 | adejong | 2008-12-21 16:47:16 +0100 (Sun, 21 Dec 2008) | 8 lines Changed paths: M /trunk/contrib/client-side/svn2cl/NEWS M /trunk/contrib/client-side/svn2cl/svn2cl.1 M /trunk/contrib/client-side/svn2cl/svn2cl.sh M /trunk/contrib/client-side/svn2cl/svn2cl.xsl M /trunk/contrib/client-side/svn2cl/svn2html.xsl Import release 0.11 of svn2cl. This version includes some small portability improvements to the wrapper shell script. [in contrib/client-side/svn2cl] * svn2cl.sh: fix for OpenBSD's ksh by Carlo Marcelo Arenas Belon and don't use GNU awk extensions ------------------------------------------------------------------------ r34882 | joeswatosh | 2008-12-21 22:33:50 +0100 (Sun, 21 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/test_repos.rb More follow on to r33730 which merged fs-rep-sharing branch. * subversion/bindings/swig/ruby/test/test_repos.rb (SvnReposTest#test_hotcopy): Manage the lifetime of objects that might hold the repository open carefully, so that directories may be moved when running the test on Windows. ------------------------------------------------------------------------ r34883 | cmpilato | 2008-12-22 15:57:52 +0100 (Mon, 22 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/include/svn_delta.h * subversion/include/svn_delta.h (svn_delta_editor_t.set_target_revision, svn_delta_editor_t.delete_entry): Add some typical-usage notes. ------------------------------------------------------------------------ r34884 | julianfoad | 2008-12-22 16:49:27 +0100 (Mon, 22 Dec 2008) | 6 lines Changed paths: M /trunk/configure.ac * configure.ac (AC_ARG_ENABLE(maintainer-mode)): Put the extra CFLAGS before the user's CFLAGS so the user can override them. Remove the "-std=c99" flag because it contradicts the "-ansi" flag which specifies C'89 which is the standard we use. ------------------------------------------------------------------------ r34886 | julianfoad | 2008-12-22 18:37:57 +0100 (Mon, 22 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_wc/questions.c Fix a bug introduced in the deprecated svn_wc_conflicted_p() in r33938. Found by: Joe Swatosh * subversion/libsvn_wc/questions.c (svn_wc_conflicted_p): Initialize the outputs. ------------------------------------------------------------------------ r34887 | julianfoad | 2008-12-22 19:11:12 +0100 (Mon, 22 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/include/svn_wc.h * subversion/include/svn_wc.h (svn_wc_conflicted_p2): Tweak doc string. (svn_wc_conflicted_p): Put all details in the doc string, as it is considerably different from svn_wc_conflicted_p2(). ------------------------------------------------------------------------ r34888 | arfrever | 2008-12-22 19:15:46 +0100 (Mon, 22 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/swig/python/svn/fs.py Follow-up to r34863: * subversion/bindings/swig/python/svn/fs.py (FileDiff.get_pipe): Fix typos. Found by: cmpilato ------------------------------------------------------------------------ r34889 | arfrever | 2008-12-22 19:27:45 +0100 (Mon, 22 Dec 2008) | 2 lines Changed paths: M /trunk/tools/dist/construct-rolling-environment.sh * tools/dist/construct-rolling-environment.sh: Update SWIG version. ------------------------------------------------------------------------ r34890 | arfrever | 2008-12-22 20:32:18 +0100 (Mon, 22 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/svnlook/main.c Revert r34878. * subversion/svnlook/main.c (cmd_table."propget", cmd_table."proplist"): Add some spaces in the descriptions. ------------------------------------------------------------------------ r34893 | julianfoad | 2008-12-23 14:20:02 +0100 (Tue, 23 Dec 2008) | 11 lines Changed paths: M /trunk/subversion/libsvn_wc/adm_ops.c Fix a bug whereby resolving conflicts on a file would also resolve any property conflicts on the containing directory (but without deleting the 'dir_conflicts.prej' file). Found when converting prop_tests.py 6 to use run_and_verify_resolved() which made it check the result more strictly. * subversion/libsvn_wc/adm_ops.c (svn_wc_delete3, svn_wc_remove_from_revision_control): Move path-splitting into the scope where it is needed. (resolve_found_entry_callback): Remove a redundant base_name setting. Initialize base_name properly where it was wrongly set to NULL. ------------------------------------------------------------------------ r34894 | julianfoad | 2008-12-23 14:21:44 +0100 (Tue, 23 Dec 2008) | 16 lines Changed paths: M /trunk/subversion/tests/cmdline/basic_tests.py M /trunk/subversion/tests/cmdline/commit_tests.py M /trunk/subversion/tests/cmdline/depth_tests.py M /trunk/subversion/tests/cmdline/log_tests.py M /trunk/subversion/tests/cmdline/prop_tests.py M /trunk/subversion/tests/cmdline/resolved_tests.py M /trunk/subversion/tests/cmdline/svntest/actions.py M /trunk/subversion/tests/cmdline/switch_tests.py M /trunk/subversion/tests/cmdline/tree_conflict_tests.py Implement and use a "run_and_verify_resolved" test function. In most cases, little or no checking of the result was done before. * subversion/tests/cmdline/svntest/actions.py (run_and_verify_resolved): New function. * subversion/tests/cmdline/basic_tests.py, subversion/tests/cmdline/commit_tests.py, subversion/tests/cmdline/depth_tests.py, subversion/tests/cmdline/log_tests.py, subversion/tests/cmdline/prop_tests.py, subversion/tests/cmdline/resolved_tests.py, subversion/tests/cmdline/switch_tests.py, subversion/tests/cmdline/tree_conflict_tests.py Use run_and_verify_resolved() instead of running the command long-hand. ------------------------------------------------------------------------ r34896 | cmpilato | 2008-12-23 16:35:08 +0100 (Tue, 23 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/tests/libsvn_fs_base/fs-base-test.c Add regression text for issue #3349 (BDB backend could allow `changes' table out-of-sync with actual changes). * subversion/tests/libsvn_fs_base/fs-base-test.c (orphaned_textmod_change): New regression test. (test_funcs): Add reference to new test. ------------------------------------------------------------------------ r34897 | cmpilato | 2008-12-23 16:39:11 +0100 (Tue, 23 Dec 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_fs_base/tree.c M /trunk/subversion/tests/libsvn_fs_base/fs-base-test.c Fix issue #3349 (BDB backend could allow `changes' table out-of-sync with actual changes). * subversion/libsvn_fs_base/tree.c (txn_body_txdelta_finalize_edits): Add the `changes' table item here... (txn_body_apply_textdelta): ...instead of here. (txn_body_fulltext_finalize_edits): And do the same here... (txn_body_apply_text): ...instead of here. * subversion/tests/libsvn_fs_base/fs-base-test.c (test_funcs): Expect 'orphaned_textmod_change' test to pass now. ------------------------------------------------------------------------ r34898 | hwright | 2008-12-23 17:30:06 +0100 (Tue, 23 Dec 2008) | 3 lines Changed paths: A /trunk/tools/buildbot/slaves/ubuntu-x64 (from /trunk/tools/buildbot/slaves/i686-debian-sarge1:34897) * buildbot/slave/ubuntu-x64: Add new directory for the new buildbot. ------------------------------------------------------------------------ r34899 | hwright | 2008-12-23 17:36:51 +0100 (Tue, 23 Dec 2008) | 8 lines Changed paths: M /trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh M /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh M /trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh M /trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh [ in tools/buildbot/slaves/ubuntu-x64] * svnbuild.sh * svnlog.sh * svnclean.sh * svncheck.sh: Set svn:eol-style to native. ------------------------------------------------------------------------ r34900 | hwright | 2008-12-23 18:30:09 +0100 (Tue, 23 Dec 2008) | 9 lines Changed paths: M /trunk/tools/buildbot/slaves/ubuntu-x64 M /trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh M /trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh More customizations for me buildbot. * tools/buildbot/slaves/ubuntu-x64: Ignore the build directory. * tools/buildbot/slaves/ubuntu-x64/svnbuild.sh, tools/buildbot/slaves/ubuntu-x64/svnclean.sh: Customize build paths and targets. ------------------------------------------------------------------------ r34901 | hwright | 2008-12-23 19:26:18 +0100 (Tue, 23 Dec 2008) | 5 lines Changed paths: M /trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh Fix my buildbot by only using one process for the javahl build. * tools/buildbot/slaves/ubuntu-x64/svnbuild.sh: Use 'make -j1' for javahl. ------------------------------------------------------------------------ r34902 | dws | 2008-12-23 19:42:07 +0100 (Tue, 23 Dec 2008) | 7 lines Changed paths: M /trunk/packages/rpm/redhat-8+/subversion.spec M /trunk/packages/rpm/rhel-3/subversion.spec M /trunk/packages/rpm/rhel-4/subversion.spec M /trunk/packages/rpm/rhel-5/subversion.spec * rpm/redhat-8+/subversion.spec, rpm/rhel-3/subversion.spec, rpm/rhel-4/subversion.spec, rpm/rhel-5/subversion.spec : Changed RHEL3 SPEC file to build 1.5.x RPM on RHEL3. ------------------------------------------------------------------------ r34903 | sussman | 2008-12-23 20:25:55 +0100 (Tue, 23 Dec 2008) | 5 lines Changed paths: M /branches/http-protocol-v2/subversion/mod_dav_svn/mod_dav_svn.c On the 'http-protocol-v2' branch: * subversion/mod_dav_svn/mod_dav_svn.c (dav_svn__get_root_stub): oops, forgot to implement ------------------------------------------------------------------------ r34904 | joeswatosh | 2008-12-23 22:40:31 +0100 (Tue, 23 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c Follows on to r33860. Use the greatest precision possible when looking at a revision as a date. This fixes intermittent test failures on Windows. * subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c (svn_swig_rb_set_revision): Use to_f and apr_time_make instead of to_i and apr_time_from_sec to calculate the date revision. ------------------------------------------------------------------------ r34905 | joeswatosh | 2008-12-23 22:42:40 +0100 (Tue, 23 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/test/test_client.rb More follow on to r33730, the merge to use SQLite. Combined with r34502 shows more pool life time issues in the bindings tests. * subversion/bindings/swig/ruby/test/test_client.rb (SvnClientTest#test_username_provider): Use only the revision from the make_context block as it is just an Integer instead of an Info that will be cleaned up in the block. Also use the (now prefered) block form of Svn::Client::Context.new(). ------------------------------------------------------------------------ r34906 | julianfoad | 2008-12-23 23:27:28 +0100 (Tue, 23 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/verify.py Implement the test suite's ExpectedOutput(..., match_all=False) code path which was simply assumed never to be the case unless regular expressions were being used. * subversion/tests/cmdline/svntest/verify.py (ExpectedOutput): Implement the (not is_reg_exp, not match_all) case. Give a proper doc string for __init__ and tweak other comments. ------------------------------------------------------------------------ r34907 | julianfoad | 2008-12-23 23:31:07 +0100 (Tue, 23 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/tests/cmdline/tree_conflict_tests.py Make a very slight simplification in tree-conflict test code. * subversion/tests/cmdline/tree_conflict_tests.py (ensure_tree_conflict): Use plain text matching instead of regex matching. ------------------------------------------------------------------------ r34908 | sussman | 2008-12-24 00:25:49 +0100 (Wed, 24 Dec 2008) | 13 lines Changed paths: M /branches/http-protocol-v2/subversion/libsvn_ra_serf/options.c M /branches/http-protocol-v2/subversion/libsvn_ra_serf/ra_serf.h On the 'http-protocol-v2' branch: Getting ready to unify serf's OPTIONS code. No new functionality, but at least dumb wrapper doesn't break tests. :-) * subversion/libsvn_ra_serf/options.c (struct options_response_ctx_t, options_response_handler): new response handler for __create_options_req() (svn_ra_serf__create_options_req): use new response handler. * subversion/libsvn_ra_serf/ra_serf.h (struct svn_ra_serf__session_t): add 5 new url 'stubs' for v2 protocol. ------------------------------------------------------------------------ r34910 | hwright | 2008-12-24 02:57:04 +0100 (Wed, 24 Dec 2008) | 9 lines Changed paths: M /trunk/Makefile.in Make the swig-ruby bindings compile again by filtering out the -ansi option passed to the compiler. This is a ruby problem, not a problem with our bindings. (One of the ruby header files uses the inline keyword.) More information in this thread: http://svn.haxx.se/dev/archive-2008-12/0621.shtml * Makefile.in (COMPILE_SWIG_RB): Filter out '-ansi' option from CFLAGS. ------------------------------------------------------------------------ r34911 | arfrever | 2008-12-24 02:58:11 +0100 (Wed, 24 Dec 2008) | 44 lines Changed paths: M /trunk/tools/backup/hot-backup.py.in M /trunk/tools/bdb/erase-all-text-data.py M /trunk/tools/bdb/svn-bdb-view.py M /trunk/tools/bdb/whatis-rep.py M /trunk/tools/client-side/change-svn-wc-format.py M /trunk/tools/client-side/server-version.py M /trunk/tools/dev/check-license.py M /trunk/tools/dev/contribulyze.py M /trunk/tools/dev/datecheck.py M /trunk/tools/dev/gen-javahl-errors.py M /trunk/tools/dev/graph-dav-servers.py M /trunk/tools/dev/iz/ff2csv.py M /trunk/tools/dev/iz/find-fix.py M /trunk/tools/dev/mlpatch.py M /trunk/tools/dev/normalize-dump.py M /trunk/tools/dev/po-merge.py M /trunk/tools/dev/random-commits.py M /trunk/tools/dev/scramble-tree.py M /trunk/tools/dev/svn-merge-revs.py M /trunk/tools/dev/verify-history.py M /trunk/tools/dev/which-error.py M /trunk/tools/dist/gen_nightly_ann.py M /trunk/tools/dist/getsigs.py M /trunk/tools/dist/post-to-tigris.py M /trunk/tools/dist/write-announcement.py M /trunk/tools/examples/blame.py M /trunk/tools/examples/check-modified.py M /trunk/tools/examples/dumpprops.py M /trunk/tools/examples/get-location-segments.py M /trunk/tools/examples/getfile.py M /trunk/tools/examples/geturl.py M /trunk/tools/examples/putfile.py M /trunk/tools/examples/revplist.py M /trunk/tools/examples/svnlook.py M /trunk/tools/examples/svnshell.py M /trunk/tools/hook-scripts/mailer/tests/mailer-tweak.py M /trunk/tools/hook-scripts/svn2feed.py M /trunk/tools/po/l10n-report.py M /trunk/tools/server-side/fsfs-reshard.py M /trunk/tools/server-side/svn-backup-dumps.py Python 3 compatibility: Update calls to print() in 'tools' directory. * tools/backup/hot-backup.py.in: * tools/bdb/erase-all-text-data.py: * tools/bdb/svn-bdb-view.py: * tools/bdb/whatis-rep.py: * tools/client-side/change-svn-wc-format.py: * tools/client-side/server-version.py: * tools/dev/check-license.py: * tools/dev/contribulyze.py: * tools/dev/datecheck.py: * tools/dev/gen-javahl-errors.py: * tools/dev/graph-dav-servers.py: * tools/dev/iz/ff2csv.py: * tools/dev/iz/find-fix.py: * tools/dev/mlpatch.py: * tools/dev/normalize-dump.py: * tools/dev/po-merge.py: * tools/dev/random-commits.py: * tools/dev/scramble-tree.py: * tools/dev/svn-merge-revs.py: * tools/dev/verify-history.py: * tools/dev/which-error.py: * tools/dist/gen_nightly_ann.py: * tools/dist/getsigs.py: * tools/dist/post-to-tigris.py: * tools/dist/write-announcement.py: * tools/examples/blame.py: * tools/examples/check-modified.py: * tools/examples/dumpprops.py: * tools/examples/getfile.py: * tools/examples/get-location-segments.py: * tools/examples/geturl.py: * tools/examples/putfile.py: * tools/examples/revplist.py: * tools/examples/svnlook.py: * tools/examples/svnshell.py: * tools/hook-scripts/mailer/tests/mailer-tweak.py: * tools/hook-scripts/svn2feed.py: * tools/po/l10n-report.py: * tools/server-side/fsfs-reshard.py: * tools/server-side/svn-backup-dumps.py: Call print() or file.write(). ------------------------------------------------------------------------ r34912 | sussman | 2008-12-24 03:49:01 +0100 (Wed, 24 Dec 2008) | 26 lines Changed paths: M /branches/http-protocol-v2/subversion/libsvn_ra_serf/options.c M /branches/http-protocol-v2/subversion/libsvn_ra_serf/ra_serf.h M /branches/http-protocol-v2/subversion/libsvn_ra_serf/serf.c On the 'http-protocol-v2' branch: Unify all serf OPTIONS requests to go through svn_ra_serf__create_options_req(): - always send a request body - always fill in the session->capabilities hash - pave the way for always receiving & storing protocol v2 "stubs" * subversion/libsvn_ra_serf/ra_serf.h (SERF_CAPABILITY_YES, SERF_CAPABILITY_NO, SERF_CAPABILITY_SERVER_YES): new constants shared by serf.c and options.c, to replace 'static char *' vars. * subversion/libsvn_ra_serf/options.c (struct options_response_ctx_t): add pool field. (options_response_handler): fill in pool field. (capabilities_headers_iterator_callback): moved here from serf.c -- slightly tweaked to use new baton. (options_response_handler): parse the capabilities headers. * subversion/libsvn_ra_serf/serf.c (capability_yes, capability_no, capability_server_yes): removed. (struct capabilities_response_baton): removed. (capabilities_headers_iterator_callback): removed. (capabilities_response_handler): removed. (exchange_capabilities): simplify! just call __create_options_req(). ------------------------------------------------------------------------ r34914 | sussman | 2008-12-24 05:06:49 +0100 (Wed, 24 Dec 2008) | 16 lines Changed paths: M /branches/http-protocol-v2/subversion/libsvn_ra_serf/options.c M /branches/http-protocol-v2/subversion/libsvn_ra_serf/ra_serf.h M /branches/http-protocol-v2/subversion/libsvn_ra_serf/serf.c On the 'http-protocol-v2' branch: Make serf notice and hold onto the v2 "stubs" in its session_t. This should happen right in the initial ra_open() call, when the RA session kicks off. * subversion/libsvn_ra_serf/options.c (capabilities_headers_iterator_callback): notice the new v2 stub headers, and save the values in the master session_t. * subversion/libsvn_ra_serf/ra_serf.h (struct svn_ra_serf__session_t): add (cached) youngest_rev field. * subversion/libsvn_ra_serf/serf.c (svn_ra_serf__open): initialize session's youngest_rev field. (svn_ra_serf__get_latest_revnum): try to return cached youngest_rev first! ------------------------------------------------------------------------ r34915 | kameshj | 2008-12-24 12:57:28 +0100 (Wed, 24 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/libsvn_ra_neon/util.c Support commit of a new file of size(post-compression) >2G. Neon has a support of large file requests for quite sometime, Subversion should make use of this support if available. * subversion/libsvn_ra_neon/util.c (svn_ra_neon__set_neon_body_provider): Make use of 'ne_set_request_body_provider64' if LFS support is available. ------------------------------------------------------------------------ r34919 | rhuijben | 2008-12-24 14:33:01 +0100 (Wed, 24 Dec 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_ra_neon/util.c Following up on r34915 and r34917, support commit of a new file of size (post-compression) >2G. Neon has support for large file requests for quite some time, Subversion should use this support if available. * subversion/libsvn_ra_neon/util.c (svn_ra_neon__set_neon_body_provider): Provide 64 bit content length if LFS is supported. Use 'ne_set_request_body_provider64' for neon < 0.28. (0.27 broke the ABI of the original function to allow 64 bit values) ------------------------------------------------------------------------ r34920 | rhuijben | 2008-12-24 14:45:36 +0100 (Wed, 24 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/main.py * subversion/tests/cmdline/svntest/main.py (open_pipe): Enable universal newlines when using subprocess.Popen on Windows in an attempt to (at least temporary) fix the Windows buildbot. ------------------------------------------------------------------------ r34922 | arfrever | 2008-12-24 16:54:33 +0100 (Wed, 24 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/main.py Don't use external password stores when running tests. * subversion/tests/cmdline/svntest/main.py (create_config_dir): Set the 'password-stores' option. ------------------------------------------------------------------------ r34923 | hwright | 2008-12-24 17:00:40 +0100 (Wed, 24 Dec 2008) | 4 lines Changed paths: M /trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh * tools/buildbot/slaves/x64-ubuntu/svnbuild.sh: Build swig-pl with 'make -j1'. Also, use default static/shared configure settings. ------------------------------------------------------------------------ r34924 | arfrever | 2008-12-24 17:09:20 +0100 (Wed, 24 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_ra_neon/util.c Follow-up to r34919: * subversion/libsvn_ra_neon/util.c (svn_ra_neon__set_neon_body_provider): Use improved version of ne_set_request_body_provider() when using Neon >=0.27 instead of >=0.28. ------------------------------------------------------------------------ r34925 | hwright | 2008-12-24 17:16:19 +0100 (Wed, 24 Dec 2008) | 3 lines Changed paths: M /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh * tools/buildbot/slaves/x64-ubuntu/svncheck.sh: Include the swig bindings in the list of targets to check. ------------------------------------------------------------------------ r34926 | hwright | 2008-12-24 18:36:34 +0100 (Wed, 24 Dec 2008) | 23 lines Changed paths: M /trunk/subversion/include/private/svn_skel.h M /trunk/subversion/libsvn_fs_base/bdb/changes-table.c M /trunk/subversion/libsvn_fs_base/bdb/copies-table.c M /trunk/subversion/libsvn_fs_base/bdb/dbt.c M /trunk/subversion/libsvn_fs_base/bdb/dbt.h M /trunk/subversion/libsvn_fs_base/bdb/locks-table.c M /trunk/subversion/libsvn_fs_base/bdb/nodes-table.c M /trunk/subversion/libsvn_fs_base/bdb/reps-table.c M /trunk/subversion/libsvn_fs_base/bdb/rev-table.c M /trunk/subversion/libsvn_fs_base/bdb/txn-table.c M /trunk/subversion/libsvn_fs_base/dag.c M /trunk/subversion/libsvn_fs_base/util/fs_skels.c M /trunk/subversion/libsvn_fs_base/util/fs_skels.h M /trunk/subversion/libsvn_subr/skel.c M /trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c M /trunk/subversion/tests/libsvn_subr/skel-test.c Followup to the move of the skels logic to libsvn_subr: Rename skel_t to svn_skel_t. While this symbol is defined in a private header file, and I don't know that we have a hard-and-fast policy for those, consistency dictates we make this change. * subversion/libsvn_subr/skel.c, subversion/tests/libsvn_fs_base/strings-reps-test.c, subversion/tests/libsvn_subr/skel-test.c, subversion/libsvn_fs_base/bdb/reps-table.c, subversion/libsvn_fs_base/bdb/copies-table.c, subversion/libsvn_fs_base/bdb/dbt.c, subversion/libsvn_fs_base/bdb/dbt.h, subversion/libsvn_fs_base/bdb/nodes-table.c, subversion/libsvn_fs_base/bdb/txn-table.c, subversion/libsvn_fs_base/bdb/locks-table.c, subversion/libsvn_fs_base/bdb/rev-table.c, subversion/libsvn_fs_base/bdb/changes-table.c, subversion/libsvn_fs_base/dag.c, subversion/libsvn_fs_base/util/fs_skels.h, subversion/libsvn_fs_base/util/fs_skels.c, subversion/include/private/svn_skel.h: Update references from skel_t to svn_skel_t. ------------------------------------------------------------------------ r34927 | arfrever | 2008-12-24 18:57:02 +0100 (Wed, 24 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c Fix compiler warning in Ruby bindings: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c: In function ‘svn_swig_rb_set_revision’: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c:3232: warning: incompatible implicit declaration of built-in function ‘modf’ * subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c (): Include . ------------------------------------------------------------------------ r34928 | sussman | 2008-12-24 19:58:33 +0100 (Wed, 24 Dec 2008) | 6 lines Changed paths: M /branches/http-protocol-v2/subversion/libsvn_ra_serf/options.c On the 'http-protocol-v2' branch: Bugfix spotted by gstein. * subversion/libsvn_ra_serf/options.c (capabilities_headers_iterator_callback): compare first 3 chars of key with "SVN". ------------------------------------------------------------------------ r34929 | arfrever | 2008-12-24 21:49:19 +0100 (Wed, 24 Dec 2008) | 6 lines Changed paths: M /trunk/tools/backup/hot-backup.py.in M /trunk/tools/dev/which-error.py M /trunk/tools/hook-scripts/mailer/mailer.py M /trunk/tools/hook-scripts/svn2feed.py M /trunk/tools/hook-scripts/svnperms.py * tools/backup/hot-backup.py.in: * tools/dev/which-error.py: * tools/hook-scripts/mailer/mailer.py: * tools/hook-scripts/svn2feed.py: * tools/hook-scripts/svnperms.py: Declare UTF-8 encoding. ------------------------------------------------------------------------ r34931 | danielsh | 2008-12-25 18:03:22 +0100 (Thu, 25 Dec 2008) | 1 line Changed paths: M /trunk/subversion/libsvn_fs_fs/fs.c * subversion/libsvn_fs_fs/fs.c (fs_upgrade): Fix typo in comment. ------------------------------------------------------------------------ r34933 | arfrever | 2008-12-26 15:11:42 +0100 (Fri, 26 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/main.py Follow-up to r34920: Try to not ignore incorrect line endings on Windows. * subversion/tests/cmdline/svntest/main.py (open_pipe): Don't enable universal newlines. (_convert_windows_line_ending): New. (spawn_process): Use _convert_windows_line_ending() for stdout and stderr from processes opened in text mode on Windows. ------------------------------------------------------------------------ r34934 | arfrever | 2008-12-26 15:14:59 +0100 (Fri, 26 Dec 2008) | 7 lines Changed paths: M /trunk/build/generator/gen_base.py Python 3 compatibility: Fix 'RuntimeError: dictionary changed size during iteration' during running autogen.sh. * build/generator/gen_base.py (IncludeDependencyInfo._include_closure): Make 'items' a list. ------------------------------------------------------------------------ r34935 | hwright | 2008-12-26 15:45:17 +0100 (Fri, 26 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_fs_base/reps-strings.c Fix a possible segfault in the Berkeley DB backend. Found by: rhuijben * subversion/libsvn_fs_base/reps-strings.c (txn_body_read_rep): If the checksum mismatches, don't use a bogus pointer to generate the error message. ------------------------------------------------------------------------ r34936 | arfrever | 2008-12-26 16:06:43 +0100 (Fri, 26 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/main.py Python 3 compatibility: Try to import queue module. (Queue was renamed to queue.) * subversion/tests/cmdline/svntest/main.py: Try to import queue module. ------------------------------------------------------------------------ r34937 | arfrever | 2008-12-26 16:25:32 +0100 (Fri, 26 Dec 2008) | 6 lines Changed paths: M /trunk/tools/hook-scripts/svn2feed.py Python 3 compatibility: Use pickle module when cPickle module isn't available. * tools/hook-scripts/svn2feed.py: Use pickle module when cPickle module isn't available. ------------------------------------------------------------------------ r34938 | hwright | 2008-12-26 16:56:23 +0100 (Fri, 26 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/rep-cache.c Improve an error message in the FSFS backend. * subversion/libsvn_fs_fs/rep-cache.c (svn_fs_fs__set_rep_reference): Cache a zero'd sha1_checksum before it hits the sqlite database. [ Reverted in r34942. ] ------------------------------------------------------------------------ r34939 | hwright | 2008-12-26 17:23:10 +0100 (Fri, 26 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_subr/checksum.c If parsing an all-zeros checksum, just return NULL, which by definition represents the same thing (but is easier to check for). * subversion/libsvn_subr/checksum.c (svn_checksum_parse_hex): Check for the all-zeros parsed checksum. ------------------------------------------------------------------------ r34941 | hwright | 2008-12-26 18:30:53 +0100 (Fri, 26 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_subr/checksum.c Whoa! Followup to a Boxing Day Blunder (r34939): Use the return pointer to set the checksum to NULL. * subversion/libsvn_subr/checksum.c (svn_checksum_parse_hex): Set the output pointer. ------------------------------------------------------------------------ r34944 | hwright | 2008-12-26 19:35:21 +0100 (Fri, 26 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c FSFS: If a representation does not have a sha1 checksum, that means it is from an older incarnation of the database, so do not include an empty checksum and a null uniquifier in the representation string. * subversion/libsvn_fs_fs/fs_fs.c (representation_string): Use the existance of the sha1 checksum to determine whether or not the sha1 should even be written. ------------------------------------------------------------------------ r34947 | hwright | 2008-12-26 21:03:24 +0100 (Fri, 26 Dec 2008) | 9 lines Changed paths: A /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh:34925) M /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh Separate the bindings tests from the other tests on my buildbot. [ in tools/buildbot/slaves/ubuntu-x64 ] * svncheck.sh: Remove bindings tests. * svncheck-bindings.sh: New script to check the bindings. ------------------------------------------------------------------------ r34948 | lgo | 2008-12-26 21:47:11 +0100 (Fri, 26 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/libsvn_ra_serf/util.c ra_serf: Fix compiler warnings when building with serf 0.2. * subversion/libsvn_ra_serf/util.c (svn_ra_serf__cleanup_serf_session): Move declaration of variables inside the conditional section. ------------------------------------------------------------------------ r34949 | hwright | 2008-12-26 23:16:20 +0100 (Fri, 26 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/libsvn_subr/checksum.c Use a slightly more efficient method of checking for the zero'd checksum while parsing it. * subversion/libsvn_subr/checksum.c (svn_checksum_parse_hex): Just OR the bytes together and check for a zero value to see if we just parsed the zero checksum. ------------------------------------------------------------------------ r34950 | arfrever | 2008-12-27 00:06:11 +0100 (Sat, 27 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Fix compiler warning in SWIG Python bindings: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c: In function ‘ra_callbacks_get_wc_prop’: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c:2980: warning: passing argument 3 of ‘PyString_AsStringAndSize’ from incompatible pointer type * subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (): Define Py_ssize_t when using Python <2.5. (ra_callbacks_get_wc_prop): Fix type of 'len' variable. ------------------------------------------------------------------------ r34951 | hwright | 2008-12-27 00:15:59 +0100 (Sat, 27 Dec 2008) | 11 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Only add representations to the rep-cache which are in the revision being committed. The issue here is that nodes which have just property mods may have data reps which are older than the format 4 filesystem, and thus only have md5 checksums. Attempting to add these nodes to the rep cache results in errors. This also has the happy side effect of not attempting to add nodes which do have the sha1 checksum, but which are already in the cache. * subversion/libsvn_fs_fs/fs_fs.c (write_final_rev): Only put a node in the rep cache if it is part of the current revision. ------------------------------------------------------------------------ r34953 | arfrever | 2008-12-27 02:59:07 +0100 (Sat, 27 Dec 2008) | 5 lines Changed paths: M /trunk/tools/dev/mlpatch.py Python 3 compatibility: Try to import html.entities.entitydefs. * tools/dev/mlpatch.py: Try to import html.entities.entitydefs. ------------------------------------------------------------------------ r34954 | arfrever | 2008-12-27 03:13:35 +0100 (Sat, 27 Dec 2008) | 14 lines Changed paths: M /trunk/build/generator/gen_win.py M /trunk/subversion/bindings/ctypes-python/test/wc.py M /trunk/subversion/bindings/swig/python/tests/delta.py M /trunk/subversion/bindings/swig/python/tests/mergeinfo.py M /trunk/subversion/bindings/swig/python/tests/ra.py M /trunk/subversion/bindings/swig/python/tests/repository.py M /trunk/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py M /trunk/subversion/bindings/swig/python/tests/wc.py M /trunk/subversion/tests/cmdline/svntest/tree.py M /trunk/tools/hook-scripts/mailer/mailer.py Python 3 compatibility: Import io.StringIO when using Python 3. * build/generator/gen_win.py: * subversion/bindings/ctypes-python/test/wc.py: * subversion/bindings/swig/python/tests/delta.py: * subversion/bindings/swig/python/tests/mergeinfo.py: * subversion/bindings/swig/python/tests/ra.py: * subversion/bindings/swig/python/tests/repository.py: * subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py: * subversion/bindings/swig/python/tests/wc.py: * subversion/tests/cmdline/svntest/tree.py: * tools/hook-scripts/mailer/mailer.py: Import io.StringIO when using Python 3. ------------------------------------------------------------------------ r34955 | arfrever | 2008-12-27 04:56:04 +0100 (Sat, 27 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/bindings/swig/python/svn/fs.py Python 3 compatibility: Try to import builtins module. (__builtin__ was renamed to builtins.) * subversion/bindings/swig/python/svn/fs.py: Try to import builtins module. ------------------------------------------------------------------------ r34957 | hwright | 2008-12-27 20:52:22 +0100 (Sat, 27 Dec 2008) | 12 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c For FSFS packing, put each pack file and manifest in it's own directory. This brings back one of the hidden benefits of sharding: being able to grow a repository by putting different directories on different filesystems. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (pack_filesystem): Update test. * subversion/libsvn_fs_fs/fs_fs.c (path_rev_packed): Update to the new path scheme. (pack_shard): Update file and directory paths to reflect the new directory scheme. ------------------------------------------------------------------------ r34958 | danielsh | 2008-12-27 22:34:53 +0100 (Sat, 27 Dec 2008) | 11 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Fix 'svnadmin verify' of some packed FSFS repositories by making the calculation of offsets in the rev file consistent. Review by: hwright * subversion/libsvn_fs_fs/fs_fs.c (get_root_changes_offset): Return the offsets from the start of the pack file, not from the start of the revision data. (get_fs_id_at_offset): Don't repeat the logic that's now in get_root_changes_offset(). ------------------------------------------------------------------------ r34959 | arfrever | 2008-12-27 23:44:25 +0100 (Sat, 27 Dec 2008) | 8 lines Changed paths: M /trunk/tools/backup/hot-backup.py.in M /trunk/tools/hook-scripts/mailer/mailer.py M /trunk/tools/hook-scripts/verify-po.py Python 3 compatibility: Try to use subprocess module in 'tools' directory. * tools/hook-scripts/mailer/mailer.py: * tools/hook-scripts/verify-po.py: Try to use subprocess module. * tools/backup/hot-backup.py.in: Fix a typo. ------------------------------------------------------------------------ r34960 | hwright | 2008-12-28 03:09:22 +0100 (Sun, 28 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/structure Followup to r34957: Update fsfs structure doc. * subversion/libsvn_fs_fs/structure: Note the changed layout of the pack files. ------------------------------------------------------------------------ r34962 | psamuelson | 2008-12-28 21:03:46 +0100 (Sun, 28 Dec 2008) | 12 lines Changed paths: M /trunk/notes/webdav-proxy Update notes/webdav-proxy from my own experience setting one up. * notes/webdav-proxy (introduction): Note not all clients need to use the proxy; mention speedup from network proximity, which is a major reason to deploy the proxy. (requirements): Mention mod_proxy_http, mod_dav, mod_dav_svn. (configuration): Clarify that svnsync can indeed be used; mention need for revprop-change propagation; replace a clumsy procedure of writing, transferring, reading, and deleting a dump file with a simple pipe; use -q in svnadmin {dump,load}. ------------------------------------------------------------------------ r34963 | steveking | 2008-12-29 18:09:17 +0100 (Mon, 29 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/libsvn_subr/dirent_uri.c Fix bug in svn_path_is_canonical() where Windows UNC paths were always considered non-canonical. * subversion/libsvn_subr/dirent_uri.c (svn_uri_is_canonical): skip the second '/' of an UNC path. ------------------------------------------------------------------------ r34964 | stsp | 2008-12-29 18:27:01 +0100 (Mon, 29 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_subr/dirent_uri.c * subversion/libsvn_subr/dirent_uri.c (svn_uri_is_canonical): Fix indentation. ------------------------------------------------------------------------ r34965 | rhuijben | 2008-12-29 19:56:38 +0100 (Mon, 29 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Following up on r34963,r34964, add a few extra testcases on unc uris. * subversion/tests/libsvn_subr/dirent_uri-test.c (test_uri_canonicalize): Assert behavior on canocalization of unc uris. (test_uri_is_canonical): Assert that an uppercase hostname unc uri is never canonical and unc uris are canonical on WIN32 and Cygwin only. ------------------------------------------------------------------------ r34966 | rhuijben | 2008-12-29 20:12:18 +0100 (Mon, 29 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Following up on r34965, fix assumed non Windows behavior. (UNC paths encoded in URIs are treated the same on !Windows) * subversion/tests/libsvn_subr/dirent_uri-test.c (test_uri_canonicalize,test_uri_is_canonical): Move UNC uri assertions outside the windows specific block, and remove assumed non-windows UNC uri assertions. ------------------------------------------------------------------------ r34967 | arfrever | 2008-12-29 21:24:29 +0100 (Mon, 29 Dec 2008) | 13 lines Changed paths: M /trunk/subversion/svn/cl.h M /trunk/subversion/svn/main.c Implement the '--config-option=FILE:SECTION:OPTION=[VALUE]' option for svn. * subversion/svn/cl.h (svn_cl__opt_state_t.config_options): New. * subversion/svn/main.c (svn_cl__longopt_t.opt_config_options): New. (svn_cl__options."config-option"): New. (svn_cl__global_options): Add opt_config_options. (config_option_t): New. (main): Rename 'cfg' to 'cfg_config'. Add 'cfg_servers' variable. Handle the '--config-option' option. ------------------------------------------------------------------------ r34969 | arfrever | 2008-12-29 21:49:17 +0100 (Mon, 29 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r34967: Fix segmentation fault when the '--config-option' option isn't used. * subversion/svn/main.c (main): Use opt_state.config_options only when it isn't NULL. Found by: stsp ------------------------------------------------------------------------ r34970 | arfrever | 2008-12-29 22:22:46 +0100 (Mon, 29 Dec 2008) | 9 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r34967: Move parsing of argument of '--config-option' to separate function. * subversion/svn/main.c (main): Move parsing of argument of '--config-option' from here ... (parse_config_option): ... to here. Suggested by: stsp ------------------------------------------------------------------------ r34971 | stsp | 2008-12-29 23:05:04 +0100 (Mon, 29 Dec 2008) | 13 lines Changed paths: M /trunk/subversion/svn/main.c M /trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Provide an example for the mysterious FILE:SECTION:OPTION=[VALUE] syntax in the help output. * subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout: Adjust expected output to make getopt_tests.py 7 pass. * subversion/svn/main.c (svn_cl__options): Expand help text for config-option command line flag. Suggested by: arfrever (he suggested which example to use) ------------------------------------------------------------------------ r34972 | arfrever | 2008-12-29 23:22:05 +0100 (Mon, 29 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r34970: * subversion/svn/main.c (parse_config_option): Mark as static. Found by: stsp ------------------------------------------------------------------------ r34974 | arfrever | 2008-12-30 05:00:00 +0100 (Tue, 30 Dec 2008) | 6 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r34970: * subversion/svn/main.c (parse_config_option): Fix type of config_options. (main): Update call to parse_config_option(). ------------------------------------------------------------------------ r34975 | arfrever | 2008-12-30 05:25:02 +0100 (Tue, 30 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r34967: Simplify parsing of argument of '--config-option' option. * subversion/svn/main.c (config_option_t.file, config_option_t.section, config_option_t.option, config_option_t.value): Constify. (parse_config_option): Simplify. Suggested by: danielsh ------------------------------------------------------------------------ r34976 | arfrever | 2008-12-30 05:36:16 +0100 (Tue, 30 Dec 2008) | 5 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r34975: * subversion/svn/main.c (parse_config_option): Fix a typo. ------------------------------------------------------------------------ r34977 | stylesen | 2008-12-30 11:26:56 +0100 (Tue, 30 Dec 2008) | 20 lines Changed paths: M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Prompts for default keyring password if the keyring is locked and unlocks the keyring. * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (gnome_keyring_baton): New struct. (callback_destroy_data_keyring): New helper function to do cleanup. (callback_done): New helper function. (callback_get_info_keyring): New helper function to handle keyring details. (callback_default_keyring): New helper function for getting the default keyring name. (gnome_keyring_unlock_keyring): New function, which will prompt for the keyring password and unlocks the keyring if it is already locked. (gnome_keyring_password_get): Use gnome_keyring_unlock_keyring() to unlock a keyring and later do the cleanup. (gnome_keyring_password_set): Use gnome_keyring_unlock_keyring() to unlock a keyring and later do the cleanup. Patch by: Alexander Thomas (Tweaked by me) ------------------------------------------------------------------------ r34979 | arfrever | 2008-12-30 19:28:50 +0100 (Tue, 30 Dec 2008) | 8 lines Changed paths: M /trunk/TODO-1.6 M /trunk/subversion/libsvn_ra/ra_loader.c Revert r33767, because SVN_HTTP_LIBRARY="${VALUE}" variable has been superseded by "--config-option=servers:global:http-library=${VALUE}" option. * subversion/libsvn_ra/ra_loader.c (svn_ra_open3): Don't use SVN_HTTP_LIBRARY environment variable. * TODO-1.6: Delete item about reversion of r33767. ------------------------------------------------------------------------ r34980 | arfrever | 2008-12-30 20:02:17 +0100 (Tue, 30 Dec 2008) | 11 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r34967: Print a warning when unrecognized file was specified in argument of the '--config-option' option. * subversion/svn/main.c (main): Print a warning when unrecognized file was specified in argument of the '--config-option' option. Suggested by: stsp danielsh ------------------------------------------------------------------------ r34981 | arfrever | 2008-12-30 20:51:53 +0100 (Tue, 30 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/svn/main.c Follow-up to r34975 and r34980: * subversion/svn/main.c (parse_config_option): Don't allocate members of config_option manually. (main): Clear the error after printing warning. Found by: danielsh ------------------------------------------------------------------------ r34982 | hwright | 2008-12-30 21:43:13 +0100 (Tue, 30 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c * subversion/libsvn_fs_fs/fs_fs.c (get_fs_id_at_offset): Remove unused variable. ------------------------------------------------------------------------ r34983 | hwright | 2008-12-30 21:56:37 +0100 (Tue, 30 Dec 2008) | 10 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c A bit of refactoring in FSFS, no functional change. * subversion/libsvn_fs_fs/fs_fs.c (is_packed_rev): Abstract out a bit of magic for determining if a rev is packed or not. This is a function and not a macro to make it easier to grow, should we need more complex logic later. (open_pack_or_rev_file, open_and_seek_revision, get_root_changes_offset, get_root_changes_offset, svn_fs_fs__set_revision_proplist): Use the new helper function. ------------------------------------------------------------------------ r34984 | hwright | 2008-12-30 22:30:14 +0100 (Tue, 30 Dec 2008) | 7 lines Changed paths: M /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Add another packing test. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (pack_even_filesystem): New test which checks packing in the scenario where all current shards are full. (test_funcs): Add new test as XFail. ------------------------------------------------------------------------ r34985 | hwright | 2008-12-30 22:58:56 +0100 (Tue, 30 Dec 2008) | 13 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Fix an off-by-one error in 'svnadmin pack' which left a shard unpacked in some circumstances. Not a terribly bad correctness bug, but still nice to do, nonetheless. Found by: danielsh * subversion/tests/libsvn_fs_fs/fs-pack-test.c (test_funcs): Mark the test as pass. * subversion/libsvn_fs_fs/fs_fs.c (svn_fs_fs__pack): Add one to the youngest revision to get the *number* of revisions in the filesystem. ------------------------------------------------------------------------ r34986 | arfrever | 2008-12-31 00:41:18 +0100 (Wed, 31 Dec 2008) | 6 lines Changed paths: M /trunk/tools/client-side/bash_completion Update BASH completion. * tools/client-side/bash_completion (_svn): Support '--config-option' option and 'svn propget --verbose'. (_svnadmin): Support 'svnadmin pack'. ------------------------------------------------------------------------ r34988 | arfrever | 2008-12-31 03:40:36 +0100 (Wed, 31 Dec 2008) | 8 lines Changed paths: M /trunk/Makefile.in M /trunk/subversion/tests/libsvn_subr/hashdump-test.c M /trunk/subversion/tests/libsvn_subr/string-test.c * Makefile.in (check-clean): Delete subversion/tests/libsvn_fs_fs/test-repo-* directories. * subversion/tests/libsvn_subr/hashdump-test.c (test2): * subversion/tests/libsvn_subr/string-test.c (test12): Delete temporary files after using them. ------------------------------------------------------------------------ r34989 | pynoos | 2008-12-31 09:04:33 +0100 (Wed, 31 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/po/ko.po * subversion/po/ko.po: Korean translation updated. (no fuzzy, 93 untranslated) ------------------------------------------------------------------------ r34990 | fabien | 2008-12-31 11:38:12 +0100 (Wed, 31 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/po/fr.po French translation update for r34989. * subversion/po/fr.po: po-update, 3 fuzzy and 2 new translations. ------------------------------------------------------------------------ r34991 | fabien | 2008-12-31 12:03:48 +0100 (Wed, 31 Dec 2008) | 4 lines Changed paths: M /trunk/subversion/po/fr.po French translation update. * subversion/po/fr.po: use unbreakable spaces where appropriate. ------------------------------------------------------------------------ r34993 | danielsh | 2008-12-31 18:56:10 +0100 (Wed, 31 Dec 2008) | 8 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Fix 'svnadmin recover' of packed FSFS repositories. * subversion/libsvn_fs_fs/fs_fs.c (recover_get_largest_revision): Use open_pack_or_rev_file() instead of svn_fs_fs__path_rev() to look for the rev files. (open_pack_or_rev_file): Document the specific error returned for non-existing revision/pack files. ------------------------------------------------------------------------ r34994 | arfrever | 2008-12-31 19:21:17 +0100 (Wed, 31 Dec 2008) | 7 lines Changed paths: M /trunk/build/ac-macros/neon.m4 M /trunk/configure.ac Try to use `pkg-config neon` instead of `neon-config`. * build/ac-macros/neon.m4 (SVN_LIB_NEON, SVN_NEON_CONFIG): Try to use `pkg-config neon`. * configure.ac: Search for pkg-config before searching for Neon. ------------------------------------------------------------------------ r34995 | arfrever | 2008-12-31 23:44:00 +0100 (Wed, 31 Dec 2008) | 3 lines Changed paths: M /trunk/subversion/tests/libsvn_subr/auth-test.c * subversion/tests/libsvn_subr/auth-test.c (test_platform_specific_auth_providers): Fix test expectations. ------------------------------------------------------------------------ r34996 | arfrever | 2008-12-31 23:57:51 +0100 (Wed, 31 Dec 2008) | 10 lines Changed paths: M /branches/svnpatch-diff/subversion/libsvn_wc/diff.c On the 'svnpatch-diff' branch: Use svn_io_file_checksum2() instead of deprecated svn_io_file_checksum(). Use svn_checksum_to_cstring_display() instead of deprecated svn_md5_digest_to_cstring_display(). * subversion/libsvn_wc/diff.c (close_file): Use svn_io_file_checksum2() instead of deprecated svn_io_file_checksum(). Use svn_checksum_to_cstring_display() instead of deprecated svn_md5_digest_to_cstring_display(). ------------------------------------------------------------------------ r34997 | arfrever | 2009-01-01 00:20:25 +0100 (Thu, 01 Jan 2009) | 8 lines Changed paths: M /branches/svnpatch-diff/subversion/svn/patch-cmd.c On the 'svnpatch-diff' branch: Use svn_client_args_to_target_array() instead of deprecated svn_opt_args_to_target_array2(). * subversion/svn/patch-cmd.c (svn_cl__patch): Use svn_client_args_to_target_array() instead of deprecated svn_opt_args_to_target_array2(). ------------------------------------------------------------------------ r34998 | arfrever | 2009-01-01 00:58:14 +0100 (Thu, 01 Jan 2009) | 7 lines Changed paths: M /branches/svnpatch-diff/subversion/libsvn_client/patch.c On the 'svnpatch-diff' branch: Use svn_wc_add3() instead of deprecated svn_wc_add2(). * subversion/libsvn_client/patch.c (merge_file_added, merge_dir_added): Use svn_wc_add3() instead of deprecated svn_wc_add2(). ------------------------------------------------------------------------ r35003 | hwright | 2009-01-01 04:10:28 +0100 (Thu, 01 Jan 2009) | 4 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/main.py * subversion/tests/cmdline/svntest/main.py (create_python_hook_script): Use the 'windows' variable to determine compatibility. ------------------------------------------------------------------------ r35004 | hwright | 2009-01-01 17:08:59 +0100 (Thu, 01 Jan 2009) | 8 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Fix a FSFS packing bug where an incorrect path was used to duplicate permissions. (There will be a followup commit to refactor some common code which this duplicates.) * subversion/libsvn_fs_fs/fs_fs.c (commit_body): Use the pack file path instead of the revision file, if that revision is packed. ------------------------------------------------------------------------ r35005 | hwright | 2009-01-01 17:36:29 +0100 (Thu, 01 Jan 2009) | 9 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Followup to r35004: Refactor some pack path conditionals into a helper function. * subversion/libsvn_fs_fs/fs_fs.c (is_packed_rev): Move in the file. (path_rev_absolute): New. (open_pack_or_rev_file, svn_fs_fs__set_revision_proplist, commit_body): Use the new function. ------------------------------------------------------------------------ r35006 | hwright | 2009-01-01 18:08:11 +0100 (Thu, 01 Jan 2009) | 16 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/libsvn_fs_fs/fs_fs.h M /trunk/subversion/libsvn_fs_fs/lock.c Use the correct path for duplicating permissions when creating lock files. * subversion/libsvn_fs_fs/fs_fs.c (path_rev): Renamed from svn_fs_fs__path_rev(). (svn_fs_fs__path_rev_absolute): Renamed from path_rev_absolute(). (open_path_or_rev_file, svn_fs_fs__set_revision_proplist, commit_body, write_revision_zero): Update callers. * subversion/libsvn_fs_fs/fs_fs.h (svn_fs_fs__path_rev): Remove. (svn_fs_fs__path_rev_absolute): Add. * subversion/libsvn_fs_fs/lock.c (write_digest_file): The actual fix: use the packed file if needed for duplicating permissions. ------------------------------------------------------------------------ r35007 | hwright | 2009-01-01 18:42:39 +0100 (Thu, 01 Jan 2009) | 9 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Reduce function visibility. * subversion/libsvn_fs_fs/fs_fs.c (move_into_place): Renamed from svn_fs_fs__move_into_place(), and moved within the file. (svn_fs_fs__set_revision_proplist, get_and_increment_txn_key_body, write_current, commit_body, svn_fs_fs__set_uuid, pack_shard): Update callers. ------------------------------------------------------------------------ r35009 | danielsh | 2009-01-01 18:58:21 +0100 (Thu, 01 Jan 2009) | 25 lines Changed paths: M /trunk/Makefile.in M /trunk/build/run_tests.py M /trunk/subversion/tests/cmdline/svntest/main.py M /trunk/win-tests.py Add sharding and packing support to 'make check'. * Makefile.in (check): Support $FSFS_SHARDING and $FSFS_PACKING. * win-tests.py Add --fsfs-sharding and --fsfs-packing, and pass fsfs_sharding and fsfs_packing to TestHarness. * build/run_tests.py (main): Add --fsfs-sharding and --fsfs-packing, and pass fsfs_sharding and fsfs_packing to TestHarness. (TestHarness.__init__): Add fsfs_sharding and fsfs_packing parameters and pass them to the tests. * subversion/tests/cmdline/svntest/main.py (fsfs_sharding, fsfs_packing): New global variables. (get_fsfs_format_file_path): New helper. (create_repos): Use fsfs_sharding to create the format file and fsfs_packing to install a post-commit hook that runs 'svnadmin pack'. (usage): Add --fsfs-sharding and --fsfs-packing. (run_tests): Parse --fsfs-sharding and --fsfs-packing. ------------------------------------------------------------------------ r35011 | danielsh | 2009-01-01 23:16:58 +0100 (Thu, 01 Jan 2009) | 19 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Fix a class of C and python test failures with packing enabled. One failure identified in this case was due to ffd->min_unpacked_rev getting out-of-sync with db/min-unpacked-rev due to commits while an fs object was open. The fix is by re-reading db/min-unpacked-rev when opening the (unpacked) rev file fails. This commit applies the new logic only in open_pack_or_rev_file(); later it should be extended to other callers of svn_fs_fs__path_rev_absolute() as well. * subversion/libsvn_fs_fs/fs_fs.c (update_min_unpacked_rev): New. (svn_fs_fs__open): Use update_min_unpacked_rev(). (open_pack_or_rev_file): If opening the rev file fails, check if it had just been packed, and retry in that case. (pack_shard): Update comment. ------------------------------------------------------------------------ r35017 | arfrever | 2009-01-03 03:53:25 +0100 (Sat, 03 Jan 2009) | 21 lines Changed paths: M /trunk/Makefile.in M /trunk/build/ac-macros/berkeley-db.m4 M /trunk/configure.ac Don't ignore optional argument of the '--with-berkeley-db' option. This change allows to build support for Berkeley DB repositories when using APR-Util 1.4. When APR supports DSO and APR-Util is configured without '--disable-util-dso', then apr-util-1/apr_dbm_db-1.so instead of libaprutil-1.so is linked against libdb-*.so. libaprutil-1.so dynamically loads apr_dbm_db-1.so when needed. $(apu-1-config --libs) doesn't contain '-ldb-*'. * build/ac-macros/berkeley-db.m4 (SVN_LIB_BERKELEY_DB, SVN_LIB_BERKELEY_DB_TRY): Don't ignore optional argument of the '--with-berkeley-db' option. Fix the extraction of the BDB library option ('-ldb...') from the '$apu_config' command: it worked incorrectly when `$apu_config --libs` doesn't contain '-ldb[^[:space:]]*'. * configure.ac (SVN_DB_INCLUDES, SVN_DB_LIBS): Mark for substitution. * Makefile.in (SVN_DB_LIBS): Set to @SVN_DB_LIBS@. (INCLUDES): Add @SVN_DB_INCLUDES@. ------------------------------------------------------------------------ r35018 | arfrever | 2009-01-03 04:11:03 +0100 (Sat, 03 Jan 2009) | 3 lines Changed paths: M /trunk/subversion/libsvn_diff/diff_file.c * subversion/libsvn_diff/diff_file.c (output_unified_default_hdr): Mark a string for translation. ------------------------------------------------------------------------ r35020 | arfrever | 2009-01-03 16:39:46 +0100 (Sat, 03 Jan 2009) | 4 lines Changed paths: M /trunk/subversion/po/pl.po Polish translation update. * subversion/po/pl.po: Polish translation update. ------------------------------------------------------------------------ r35022 | danielsh | 2009-01-04 07:27:22 +0100 (Sun, 04 Jan 2009) | 10 lines Changed paths: M /trunk/subversion/tests/cmdline/svnadmin_tests.py Adjust svnadmin_tests to expect packing/sharding. * subversion/tests/cmdline/svnadmin_tests.py (fsfs_file): Give the path to the pack file, if necessary (analogously to svn_fs_fs__path_rev_absolute). (verify_incremental_fsfs): Skip editing r2 if it is in a pack file. (fsfs_recover_handle_missing_revs_or_revprops_file): Adjust paths and expected error messages. ------------------------------------------------------------------------ r35023 | danielsh | 2009-01-04 07:33:05 +0100 (Sun, 04 Jan 2009) | 23 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/libsvn_fs_fs/fs_fs.h M /trunk/subversion/libsvn_fs_fs/lock.c Properly fix the 'ffd->min_unpacked_rev may get out of date' issue originally patched in r35011. * subversion/libsvn_fs_fs/fs_fs.c (read_min_unpacked_rev, update_min_unpacked_rev): Add declarations. (path_rev_packed, path_rev): Add assertions. (svn_fs_fs__path_rev_absolute): If the rev file isn't found, check if it had just been packed, and try the pack file in that case. (open_pack_or_rev_file): Revert r35011, the logic is now in svn_fs_fs__path_rev_absolute(). (commit_body, svn_fs_fs__set_revision_proplist): Update calls to svn_fs_fs__path_rev_absolute(). * subversion/libsvn_fs_fs/fs_fs.h (svn_fs_fs__path_rev_absolute): Change return type and add 'path' parameter. * subversion/libsvn_fs_fs/lock.c (write_digest_file): Update calls to svn_fs_fs__path_rev_absolute(). ------------------------------------------------------------------------ r35026 | danielsh | 2009-01-04 22:37:43 +0100 (Sun, 04 Jan 2009) | 9 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs.h M /trunk/subversion/libsvn_fs_fs/structure Improve fsfs documentation. * subversion/libsvn_fs_fs/fs.h (PATH_MIN_UNPACKED_REV): Don't document PATH_MAX_PACKED_REV. * subversion/libsvn_fs_fs/structure (max-packed-rev): Replace by min-unpacked-rev. ------------------------------------------------------------------------ r35029 | hwright | 2009-01-05 14:50:32 +0100 (Mon, 05 Jan 2009) | 18 lines Changed paths: M /trunk/subversion/libsvn_diff/diff.h M /trunk/subversion/libsvn_diff/diff_file.c M /trunk/subversion/libsvn_diff/diff_memory.c M /trunk/subversion/libsvn_diff/util.c Fix conversion-related warnings in libsvn_diff. I took the strategy of increasing the size of any variables we use directly, and explicitly casting variables that are converted as part of function calls. * subversion/libsvn_diff/diff_memory.c (token_compare): Add cast. (unified_output_baton_t): Increase variable size. * subversion/libsvn_diff/diff_file.c (datasource_to_index, datasource_open, datasource_get_next_token): Increase variable size, add cast. (map_or_read_file, token_compare): Add casts. * subversion/libsvn_diff/diff.h, subversion/libsvn_diff/util.c (svn_diff__adler32): Increase variable size. ------------------------------------------------------------------------ r35030 | hwright | 2009-01-05 14:54:44 +0100 (Mon, 05 Jan 2009) | 6 lines Changed paths: M /trunk/subversion/libsvn_fs_fs/fs_fs.c Fix conversion-related warnings in libsvn_fs_fs. Followup to r35029. * subversion/libsvn_fs_fs/fs_fs.c (recover_read_from_file_baton): Increase variable size. (read_handler_recover): Increase variable size, add cast. ------------------------------------------------------------------------ r35031 | hwright | 2009-01-05 17:14:47 +0100 (Mon, 05 Jan 2009) | 27 lines Changed paths: M /trunk/subversion/libsvn_fs/fs-loader.c M /trunk/subversion/libsvn_fs/fs-loader.h M /trunk/subversion/libsvn_fs_base/fs.c M /trunk/subversion/libsvn_fs_fs/fs.c M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/libsvn_fs_fs/fs_fs.h Use the FSFS write lock when packing. This ensures that multiple instances of 'svnadmin pack' run in parallel don't corrupt the filesystem. See this thread for more information: http://svn.haxx.se/dev/archive-2009-01/0040.shtml * subversion/libsvn_fs/fs-loader.h (fs_library_vtable_t): Update pack member to accept a new fs parameter. * subversion/libsvn_fs/fs-loader.c (svn_fs_pack): Grab the fs mutex before packing. * subversion/libsvn_fs_base/fs.c (base_bdb_pack): Update signature based on the new vtable. * subversion/libsvn_fs_fs/fs_fs.c (pack_baton): New. (pack_body): Renamed from svn_fs_fs__pack(), arguments adjusted. (svn_fs_fs__pack): New. * subversion/libsvn_fs_fs/fs_fs.h (svn_fs_fs__pack): Adjust parameters. * subversion/libsvn_fs_fs/fs.c (fs_pack): New. (library_vtable): Use the wrapper function. ------------------------------------------------------------------------ r35032 | cmpilato | 2009-01-05 17:39:05 +0100 (Mon, 05 Jan 2009) | 8 lines Changed paths: M /trunk/subversion/libsvn_fs_base/dag.c In the spirit of similar changes for FSFS in r34951, avoid SEGFAULTs caused by trying to get/set a 'checksum-rep' record when no SHA1 checksum is available. * subversion/libsvn_fs_base/dag.c (maybe_store_checksum_rep): Only try to record checksum->rep mappings when there's a SHA1 checksum available for use. ------------------------------------------------------------------------ r35033 | hwright | 2009-01-05 19:04:39 +0100 (Mon, 05 Jan 2009) | 40 lines Changed paths: M /trunk/subversion/include/svn_fs.h M /trunk/subversion/include/svn_repos.h M /trunk/subversion/libsvn_fs/fs-loader.c M /trunk/subversion/libsvn_fs/fs-loader.h M /trunk/subversion/libsvn_fs_base/fs.c M /trunk/subversion/libsvn_fs_fs/fs.c M /trunk/subversion/libsvn_fs_fs/fs_fs.c M /trunk/subversion/libsvn_fs_fs/fs_fs.h M /trunk/subversion/libsvn_repos/fs-wrap.c M /trunk/subversion/svnadmin/main.c M /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c Add notifications for fs packing. * subversion/libsvn_fs/fs-loader.h (library_vtable_t): Pass a notify func/baton to pack_fs(). * subversion/libsvn_fs/fs-loader.c (svn_fs_pack): Add notification parameters, and pass them to the vtable. * subversion/tests/libsvn_fs_fs/fs-pack-test.c (create_packed_filesystem): Use a NULL notification func/baton. * subversion/libsvn_fs_base/fs.c (base_bdb_pack): Add notification func/baton parameters. * subversion/svnadmin/main.c (pack_notify): New. (subcommand_pack): Use pack_notify() as the notification function. * subversion/include/svn_fs.h (svn_fs_pack_notify_action_t): New. (svn_fs_pack_notify_t): New. (svn_fs_pack): Add new notification parameters. * subversion/include/svn_repos.h, subversion/libsvn_repos/fs-wrap.c (svn_repos_fs_pack): Add new notification parameters, pass them along. * subversion/libsvn_fs_fs/fs_fs.c (pack_shard): Add notification func/baton parameters, and notify caller when starting and finishing a shard. (pack_baton): Add notification func/baton members. (pack_body): Pass notification func/baton to pack_shard(). (svn_fs_fs__pack): Add new parameters, and put them in the baton. * subversion/libsvn_fs_fs/fs_fs.h (svn_fs_fs__pack): Add new notification parameters. * subversion/libsvn_fs_fs/fs.c (fs_pack): Add new notification parameters. ------------------------------------------------------------------------ r35036 | gstein | 2009-01-06 12:00:30 +0100 (Tue, 06 Jan 2009) | 41 lines Changed paths: M /trunk/subversion/libsvn_wc/log.c M /trunk/subversion/libsvn_wc/tree_conflicts.c M /trunk/subversion/libsvn_wc/tree_conflicts.h M /trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c Switch tree conflict storage over to skels, rather than a custom format. Solves issue #3343. Review and additional work by: hwright * subversion/libsvn_wc/tree_conflicts.h: (svn_wc__write_tree_conflicts): constify a parameter * subversion/libsvn_wc/tree_conflicts.c: (field_separator, desc_separator, escape_char, read_field_separator, read_desc_separator, read_string_field, write_string_field, write_integer_field): removed (is_valid_version_info_skel, is_valid_conflict_skel): new (read_enum_field): read the field from a skel, rather than a character start/end position. the pool param is no longer required. (read_node_version_info, read_one_tree_conflict): read from a skel instead of a string. split the single pool param into both scratch and result pools. (svn_wc__read_tree_conflicts): parse the input into a skel, and then walk that to construct the tree conflict structures. (write_enum_field): renamed to ... (skel_prepend_enum): ... this. prepend the mapped value to a given skel. (prepend_version_info_skel): build a skel for the version info, and prepend it to the provided skel. (svn_wc__write_tree_conflicts): constify a parameter, and switch to skel-based preparation. (svn_wc__loggy_del_tree_conflict): remove temp variable, writing the conflict data result directly into the entry (save a strdup). * subversion/libsvn_wc/log.c: (run_log): remove temp variable, writing directly into the entry structure, saving a strdup. (svn_wc__loggy_add_tree_conflict): constify temp variable. * subversion/tests/libsvn_wc/tree-conflict-data-test.c: (test_read_tree_conflict, test_read_2_tree_conflicts): change the expected string representation of the tree conflicts. (test_write_tree_conflict, test_write_2_tree_conflicts): constify a param and change the expected string rep of the conflict. (test_write_invalid_tree_conflicts): constify a variable. ------------------------------------------------------------------------ r35040 | pburba | 2009-01-06 16:31:29 +0100 (Tue, 06 Jan 2009) | 17 lines Changed paths: M /trunk/subversion/libsvn_subr/mergeinfo.c M /trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Allow colons within mergeinfo path names. Previously a mergeinfo pathname containing colons produced a parsing error. Found by: Damien Deville * subversion/libsvn_subr/mergeinfo.c (parse_pathname): Permit colons in the pathname. * subversion/tests/libsvn_subr/mergeinfo-test.c (NBR_MERGEINFO_VALS, mergeinfo_vals, mergeinfo_paths, mergeinfo_ranges): Add some test cases for test_parse_single_line_mergeinfo() which have pathnames with colons. (NBR_BROKEN_MERGEINFO_VALS, broken_mergeinfo_vals): Add some test cases for test_parse_broken_mergeinfo() which have pathnames with colons. (test_merge_mergeinfo): Add some colons to pathnames. ------------------------------------------------------------------------ r35045 | cmpilato | 2009-01-06 17:13:20 +0100 (Tue, 06 Jan 2009) | 5 lines Changed paths: M /trunk/subversion/svnadmin/main.c * subversion/svnadmin/main.c (pack_notify): Build a formatted string separately so gettext can do the right thing for the final target string. Found by: Fabien COELHO ------------------------------------------------------------------------ r35047 | fabien | 2009-01-06 17:33:43 +0100 (Tue, 06 Jan 2009) | 4 lines Changed paths: M /trunk/subversion/po/fr.po French translation update for r35045 * subversion/po/fr.po: po-update, one new and a few fuzzy fixed ------------------------------------------------------------------------ r35048 | hwright | 2009-01-06 17:46:40 +0100 (Tue, 06 Jan 2009) | 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/notes/tree-conflicts/scratch-pad.txt M /branches/1.5.x/subversion/bindings/swig M /branches/1.5.x/subversion/include/private M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_subr M /branches/1.5.x/subversion/libsvn_subr/mergeinfo.c M /branches/1.5.x/subversion/libsvn_wc/adm_ops.c M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py M /branches/1.5.x/subversion/tests/libsvn_subr/mergeinfo-test.c M /branches/1.5.x/www/images/subversion-diagram.png M /branches/1.5.x/www/images/subversion_logo-200x173.png M /branches/1.5.x/www/images/subversion_logo-384x332.png M /branches/1.5.x/www/images/subversion_logo_hor-468x64.png Merge r35040 from trunk: * r35040 Allow colons within mergeinfo path names. Justification: Colons in pathnames are legal on many OSes, so it was only a matter of time before someone hit this bug, http://subversion.tigris.org/ds/ viewMessage.do?dsForumId=462&dsMessageId=1005163. Votes: +1: pburba, rhuijben, cmpilato ------------------------------------------------------------------------ r35049 | pburba | 2009-01-06 18:11:11 +0100 (Tue, 06 Jan 2009) | 12 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/main.py Follow-up to r34863, stop spurious passing of all tests on Windows. Found by: rhuijben See http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462& dsMessageId=993668. * subversion/tests/cmdline/svntest/main.py (open_pipe): Allow subprocess.Popen() to successfully run a python script on Windows by ensuring the first arg is the Python executable, not the script name. ------------------------------------------------------------------------ r35050 | julianfoad | 2009-01-06 19:15:33 +0100 (Tue, 06 Jan 2009) | 7 lines Changed paths: M /trunk/subversion/libsvn_subr/svn_base64.c Tweak a local function signature to avoid the need for a type cast. (This particular type cast was casting away "const" though it need not have done.) * subversion/libsvn_subr/svn_base64.c (encode_bytes): Take "void *" instead of "char *" input data. (svn_base64_from_checksum): Remove a type cast in calling encode_bytes(). ------------------------------------------------------------------------ r35051 | julianfoad | 2009-01-06 19:46:07 +0100 (Tue, 06 Jan 2009) | 17 lines Changed paths: M /trunk/subversion/include/svn_io.h M /trunk/subversion/libsvn_fs/fs-loader.c M /trunk/subversion/libsvn_subr/io.c M /trunk/subversion/libsvn_subr/stream.c M /trunk/subversion/libsvn_wc/adm_crawler.c M /trunk/subversion/libsvn_wc/questions.c M /trunk/subversion/libsvn_wc/update_editor.c M /trunk/subversion/tests/libsvn_fs/fs-test.c Simplify the signature of the new API svn_stream_checksummed2(). * subversion/include/svn_io.h, subversion/libsvn_subr/stream.c (svn_stream_checksummed2): Replace two separate checksum kind parameters with just one, as it is unlikely that any user wants them to differ, and if they do they can compose two checksumming streams. * subversion/libsvn_fs/fs-loader.c subversion/libsvn_subr/io.c subversion/libsvn_subr/stream.c subversion/libsvn_wc/adm_crawler.c subversion/libsvn_wc/questions.c subversion/libsvn_wc/update_editor.c subversion/tests/libsvn_fs/fs-test.c Adjust all calls to it. ------------------------------------------------------------------------ r35052 | julianfoad | 2009-01-06 19:58:34 +0100 (Tue, 06 Jan 2009) | 7 lines Changed paths: M /trunk/subversion/libsvn_subr/stream.c Fix an inefficiency in svn_stream_checksummed() that was introduced recently. * subversion/libsvn_subr/stream.c (svn_stream_checksummed): Remove redundant creation of checksum structures. Don't ask svn_stream_checksummed2() to calculate checksums in all cases, only when we want them. Add comments about what's going on. ------------------------------------------------------------------------ r35053 | cmpilato | 2009-01-06 20:34:33 +0100 (Tue, 06 Jan 2009) | 18 lines Changed paths: M /trunk/subversion/svnsync/main.c M /trunk/subversion/tests/cmdline/svnsync_tests.py Add an 'info' subcommand to svnsync to print the synchronization information, and also add two tests for it. * subversion/svnsync/main.c (SVNSYNC_OPTS_DEFAULT): Remove 'q' from the default options. (svnsync_cmd_table): Add the 'info' subcommand, and add 'q' to the list of accepted options for the 'init', 'sync', and 'copy-revprops' subcommands. (info_cmd): New 'info' subcommand handler. * subversion/tests/cmdline/svnsync_tests.py (run_info): New helper function. (info_syncronized, info_not_syncronized): New tests. (test_list): Add references to new tests. Patch by: Chris Foote (Tweaked by me.) ------------------------------------------------------------------------ r35054 | cmpilato | 2009-01-06 21:22:23 +0100 (Tue, 06 Jan 2009) | 7 lines Changed paths: M /trunk/subversion/tests/cmdline/svnsync_tests.py Fix some spelling oopses. * subversion/tests/cmdline/svnsync_tests.py s/syncron/synchron/ Found by: glasser ------------------------------------------------------------------------ r35055 | stylesen | 2009-01-07 11:45:06 +0100 (Wed, 07 Jan 2009) | 37 lines Changed paths: M /trunk/subversion/include/svn_auth.h M /trunk/subversion/include/svn_cmdline.h M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c M /trunk/subversion/libsvn_subr/auth.c M /trunk/subversion/libsvn_subr/prompt.c Follow up r34977. Remove cmdline prompt added to a library function. * subversion/libsvn_subr/auth.c (): Include svn_cmdline.h (svn_auth_get_platform_specific_provider): Change parameters passed to GNOME Keyring provider function. * subversion/libsvn_subr/prompt.c (svn_cmdline_auth_unlock_prompt): New function to prompt for unlocking GNOME Keyring. * subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (unlock_prompt_provider_baton_t): New baton. (get_default_keyring_name): New function to return default keyring's name. (check_keyring_is_locked): New function to check whether a keyring is locked. (gnome_keyring_unlock_keyring): Modified to unlock the provided keyring with a password supplied. (gnome_keyring_password_get, gnome_keyring_password_set): Get default keyring name with the new function. (gnome_keyring_simple_first_creds, gnome_keyring_simple_save_creds): Check if the keyring is locked and throw a prompt in order to get the password and unlock it. (svn_auth_get_gnome_keyring_simple_provider): Change signature in order to accept a prompt function. Since this API was added for 1.6, the name remains the same. * subversion/include/svn_cmdline.h (svn_cmdline_auth_unlock_prompt): New function signature added. * subversion/include/svn_auth.h (svn_auth_unlock_prompt_func_t): New callback. (svn_auth_unlock_provider_func_t): New function type returning GNOME Keyring authentication provider. (svn_auth_get_gnome_keyring_simple_provider): Change signature. ------------------------------------------------------------------------ r35059 | julianfoad | 2009-01-07 13:58:21 +0100 (Wed, 07 Jan 2009) | 6 lines Changed paths: M /trunk/build/ac-macros/berkeley-db.m4 Fix detection of Berkeley DB. A follow-up to r35017 and r35021. * build/ac-macros/berkeley-db.m4 (SVN_LIB_BERKELEY_DB, SVN_LIB_BERKELEY_DB_TRY): Avoid "$GREP" as it was not defined in autoconf versions before 2.60. Use "$EGREP" which was. ------------------------------------------------------------------------ r35060 | stylesen | 2009-01-07 14:15:03 +0100 (Wed, 07 Jan 2009) | 6 lines Changed paths: M /trunk/subversion/include/svn_auth.h Follow up r35055. * subversion/include/svn_auth.h (svn_auth_get_gnome_keyring_simple_provider): Fix doc string to include new unlock prompt function. ------------------------------------------------------------------------ r35063 | pburba | 2009-01-07 15:49:41 +0100 (Wed, 07 Jan 2009) | 5 lines Changed paths: M /trunk/subversion/libsvn_subr/auth.c Follow-up to r35055, make variable declarations C89 friendly. * subversion/libsvn_subr/auth.c (svn_auth_get_platform_specific_provider): Move variable declaration to start of code block. ------------------------------------------------------------------------ r35064 | kameshj | 2009-01-07 15:59:51 +0100 (Wed, 07 Jan 2009) | 6 lines Changed paths: M /branches/issue-2897-take2 M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py On issue-2897-take2: Merge r28510 from ^/branches/issue-2897 Resolved a conflict on 'subversion/tests/cmdline/merge_tests.py' ------------------------------------------------------------------------ r35066 | pburba | 2009-01-08 00:20:43 +0100 (Thu, 08 Jan 2009) | 6 lines Changed paths: M /trunk/subversion/tests/cmdline/svntest/main.py In the Python test suite: Don't print raw command lists to stderr. * subversion/tests/cmdline/svntest/main.py (wait_on_pipe): When printing commands and their exit codes/signals to stderr, convert the command list to a string like we do everywhere else. ------------------------------------------------------------------------