There are 6656 revisions on the trunk from 29081 until now.

We will devide them up into groups of 656 revisions each. Then each
of use will make a pass over or 656 revisions. You can do it any way
 you want, bu I suggest the following method.

First, make quick pass to eliminate all revisions that
  a) Are already accounted for in the CHANGES-TILL-1.5.5 file.
  b) Don not contain a new feature or bugfix, or

That should eliminate many revisions. Then go over the remaining ones
more carefully, looking or bugfixes or other user-visible changes
that never made it into the issue tracker (for example, because the
patch was handled immediately when ist was posted to dev@).

############################################################################
######                                                             #########
###### Each volunteers's group starts of with "[[[[ username ]]]]" #########
######                                                             #########
############################################################################


[[[[ bhuvan ]]]]
[[[[ tkoski ]]]]
[[[[ bdrhoa ]]]]
[[[[ gbjbaanb ]]]]
[[[[ troubz ]]]]
------------------------------------------------------------------------
r33982 | markphip | 2008-10-31 18:19:26 +0100 (Fri, 31 Oct 2008) | 6 lines
Changed paths:
   M /trunk/TODO-1.6

Remove a TODO.

* TODO-1.6
  Removed JavaHL Notifications for tree conflicts.  Completed
  by hwright with r33698, r33699.

------------------------------------------------------------------------
r33983 | sbutler | 2008-10-31 19:44:30 +0100 (Fri, 31 Oct 2008) | 54 lines
Changed paths:
   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/switch_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

A fix for a tree conflict problem reported by Mark Phippard.

If update/switch caused a tree conflict by trying to delete a modified
item, the working copy became unusable.  The user couldn't svn
add/cp/rm/up/ci at all.  And svn resolved didn't help, because it
restored the original state that triggered the tree conflict.

This commit changes the update editor so that an incoming delete
action will delete a tree conflict victim (and items inside it),
instead of skipping the deletion.

Such a victim, or the modified items inside it, can be reinstated via
svn add/cp.  Or the user can accept the incoming change ("theirs
full") via "rm" or "rm -rf".

The email thread for the bug report starts at:

  http://svn.haxx.se/dev/archive-2008-10/1090.shtml


* subversion/libsvn_wc/update_editor.c
  (do_entry_deletion): Don't bail out after recording a tree conflict.
   Include tree-conflict status in deletion notification.

* subversion/tests/cmdline/update_tests.py
  (update_delete_modified_files,
   update_deleted_missing_dir,
   another_hudson_problem,
   tree_conflicts_on_update_1_2,
   tree_conflicts_on_update_2_1,
   tree_conflicts_on_update_2_2,
   tree_conflicts_on_update_3): Expect update to delete tree conflict
   victims and items inside them.

* subversion/tests/cmdline/switch_tests.py
  (failed_anchor_is_target,
   tree_conflicts_on_switch_1_2,
   tree_conflicts_on_switch_2_1,
   tree_conflicts_on_switch_2_2,
   tree_conflicts_on_switch_3): Expect update to delete tree conflict
   victims and items inside them.

* subversion/tests/cmdline/commit_tests.py
  (tree_conflicts_resolved): Expect update to delete tree conflict
   victims and items inside them.

* subversion/tests/cmdline/revert_tests.py
  (revert_tree_conflicts_in_updated_files): Expect update to delete
   tree conflict victims and items inside them.

* subversion/tests/cmdline/stat_tests.py
  (status_with_tree_conflicts): Expect update to delete tree conflict
   victims and items inside them.

------------------------------------------------------------------------
r33984 | pburba | 2008-10-31 21:36:25 +0100 (Fri, 31 Oct 2008) | 7 lines
Changed paths:
   M /branches/reintegrate-improvements/subversion/tests/cmdline/merge_tests.py

On the issue-3067-deleted-subtrees branch: Correct the expectations of an
XFailing --reintegrate merge test.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_with_rename): Small expectation change, big comment to
  explain why.

------------------------------------------------------------------------
r33985 | arfrever | 2008-10-31 22:21:14 +0100 (Fri, 31 Oct 2008) | 4 lines
Changed paths:
   M /trunk/subversion/bindings/ctypes-python/setup.py

* subversion/bindings/ctypes-python/setup.py
  (build, build.validate_options): Look for apr-1-config / apu-1-config before
   apr-config / apu-config.

------------------------------------------------------------------------
r33986 | neels | 2008-11-01 03:31:28 +0100 (Sat, 01 Nov 2008) | 1 line
Changed paths:
   M /branches/tc-merge-notify
   M /branches/tc-merge-notify/TODO-1.6
   M /branches/tc-merge-notify/build.conf
   M /branches/tc-merge-notify/notes/tree-conflicts/design-overview.txt
   M /branches/tc-merge-notify/notes/tree-conflicts/requirements.txt
   M /branches/tc-merge-notify/subversion/bindings/ctypes-python/setup.py
   M /branches/tc-merge-notify/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/tc-merge-notify/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/tc-merge-notify/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/tc-merge-notify/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/tc-merge-notify/subversion/include
   M /branches/tc-merge-notify/subversion/include/private/svn_auth_private.h
   M /branches/tc-merge-notify/subversion/include/svn_cmdline.h
   M /branches/tc-merge-notify/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/tc-merge-notify/subversion/libsvn_client/copy.c
   M /branches/tc-merge-notify/subversion/libsvn_client/merge.c
   M /branches/tc-merge-notify/subversion/libsvn_client/repos_diff.c
   M /branches/tc-merge-notify/subversion/libsvn_fs/fs-loader.c
   M /branches/tc-merge-notify/subversion/libsvn_fs/fs-loader.h
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/dag.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/dag.h
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/fs.h
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/notes/structure
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/reps-strings.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/reps-strings.h
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/tree.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/tc-merge-notify/subversion/libsvn_fs_fs/dag.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_fs/lock.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/tc-merge-notify/subversion/libsvn_fs_fs/tree.c
   M /branches/tc-merge-notify/subversion/libsvn_ra/compat.c
   M /branches/tc-merge-notify/subversion/libsvn_ra/deprecated.c
   M /branches/tc-merge-notify/subversion/libsvn_ra_neon/util.c
   M /branches/tc-merge-notify/subversion/libsvn_subr
   M /branches/tc-merge-notify/subversion/libsvn_subr/cmdline.c
   M /branches/tc-merge-notify/subversion/libsvn_subr/config_auth.c
   M /branches/tc-merge-notify/subversion/libsvn_subr/config_file.c
   M /branches/tc-merge-notify/subversion/libsvn_subr/opt.c
   M /branches/tc-merge-notify/subversion/libsvn_wc/props.c
   M /branches/tc-merge-notify/subversion/libsvn_wc/status.c
   M /branches/tc-merge-notify/subversion/libsvn_wc/update_editor.c
   M /branches/tc-merge-notify/subversion/po/fr.po
   M /branches/tc-merge-notify/subversion/svn/main.c
   M /branches/tc-merge-notify/subversion/svnsync/main.c
   M /branches/tc-merge-notify/subversion/tests/cmdline/commit_tests.py
   M /branches/tc-merge-notify/subversion/tests/cmdline/info_tests.py
   M /branches/tc-merge-notify/subversion/tests/cmdline/merge_tests.py
   M /branches/tc-merge-notify/subversion/tests/cmdline/prop_tests.py
   M /branches/tc-merge-notify/subversion/tests/cmdline/revert_tests.py
   M /branches/tc-merge-notify/subversion/tests/cmdline/stat_tests.py
   M /branches/tc-merge-notify/subversion/tests/cmdline/svntest/actions.py
   M /branches/tc-merge-notify/subversion/tests/cmdline/switch_tests.py
   M /branches/tc-merge-notify/subversion/tests/cmdline/update_tests.py
   M /branches/tc-merge-notify/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/tc-merge-notify/subversion/tests/libsvn_subr
   M /branches/tc-merge-notify/tools/server-side/svn_server_log_parse.py
   M /branches/tc-merge-notify/tools/server-side/test_svn_server_log_parse.py
   M /branches/tc-merge-notify/www/development.html
   M /branches/tc-merge-notify/www/faq.html
   M /branches/tc-merge-notify/www/issue-tracker.html
   M /branches/tc-merge-notify/www/tasks.html

Bring branch tc-merge-notify up to trunk r33985.
------------------------------------------------------------------------
r33987 | joeswatosh | 2008-11-01 03:46:17 +0100 (Sat, 01 Nov 2008) | 10 lines
Changed paths:
   M /trunk/subversion/bindings/swig/ruby/test/test_delta.rb

Follow on to r32901: 'Merge the double-delete branch back to trunk, fixing 
issue #3156 "Delete should conflict with delete (at the repos level)" 
<http://subversion.tigris.org/issues/show_bug.cgi?id=3156>.'

This change exposed a bug in the test below which was trying to copy a path 
after it had been deleted.

* subversion/bindings/swig/ruby/test/test_delta.rb
  (SvnDeltaTest#test_changed): cp a path being tested before rm-ing it.

------------------------------------------------------------------------
r33988 | joeswatosh | 2008-11-01 03:55:38 +0100 (Sat, 01 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/bindings/swig/ruby/test/test_client.rb

Follow on to r33082: 'Merge the tree-conflicts branch back to trunk. This 
implements basic tree conflict detection for most cases.'

Since the directory in this test is now being detected as conflicted, just 
mark it resolved and move on.

* subversion/bindings/swig/ruby/test/test_client.rb
  (SvnClientTest#assert_merge): Mark the directory conflict resolved.

------------------------------------------------------------------------
r33989 | neels | 2008-11-01 04:39:02 +0100 (Sat, 01 Nov 2008) | 85 lines
Changed paths:
   M /trunk
   M /trunk/build.conf
   M /trunk/notes/tree-conflicts/design-overview.txt
   M /trunk/notes/tree-conflicts/requirements.txt
   M /trunk/subversion/include
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/private/svn_cache.h
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_client/diff.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/repos_diff.c
   M /trunk/subversion/libsvn_subr
   M /trunk/subversion/libsvn_wc/diff.c
   M /trunk/subversion/tests/cmdline/merge_tests.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.txt
   M /trunk/subversion/tests/libsvn_subr
   M /trunk/tools/buildbot/slaves/win32-xp-VS2005
   M /trunk/tools/server-side/svn_server_log_parse.py
   M /trunk/tools/server-side/test_svn_server_log_parse.py
   M /trunk/www/development.html
   M /trunk/www/issue-tracker.html
   M /trunk/www/tasks.html

Merge (lightweight) branch tc-merge-notify to trunk.

Implement per-victim tree-conflicts notification during merge.
Use newly implemented notification style in merge operations (as done
for update/switch recently).

Do not show `Skipped' messages within newly tree-conflicted directories.
Pass a boolean SKIP down the item batons and completely skip *all*
action in the editor if SKIP is TRUE (i.e. don't even call diff callbacks).
Since the diff callbacks don't have an item baton to fill, I solved it
by skipping child nodes already in the general editor that calls the diff
callbacks. But it would probably do this code good to move to a standard
editor implementation altogether, like `update/switch' does it.


* subversion/include/svn_wc.h (svn_wc_diff_callbacks3_t): Add a svn_boolean_t
    *TREE_CONFLICTED argument to all of the callbacks functions, which
    returns whether the callback wants this node to be notified as
    tree-conflicted. Returning TRUE in *TREE_CONFLICTED makes a repos
    diff (and consequently a merge) skip any child nodes.

* subversion/libsvn_wc/diff.c
  (file_diff, directory_elements_diff, report_wc_file_as_added,
   report_wc_directory_as_added, delete_entry, close_directory,
   close_file): Pass NULL for new *TREE_CONFLICTED parameter upon calling
    the svn_wc_diff_callbacks3_t callback functions. Currently, handling
    tree-conflicts notifications here is not needed, since there is no
    code using it. Note that this variant of diff will also not skip
    child nodes of a tree-conflicted item for the same reason.

* subversion/libsvn_client/repos_diff.c 
  (dir_baton, file_baton): Add two booleans TREE_CONFLICTED and SKIPPED.
  (make_dir_baton, make_file_baton): Default TREE_CONFLICTED to FALSE.
    Default SKIPPED to FALSE.
  (delete_entry, add_directory, open_directory, close_file, close_directory):
    Pass the tree-conflict state through to the notify_func, and change some
    of the logic around the notify action to not show tree-conflicts as
    skipped paths.
  (delete_entry, add_directory, open_directory, add_file, open_file):
    Skip *all* action if the parent node is SKIPped or TREE_CONFLICTED.
    Propagate the SKIP flag to child batons where necessary.
  (window_handler, apply_textdelta, close_file, close_directory,
   change_file_prop, change_dir_prop): Skip *all* action if this node's
    SKIP flag is TRUE.
  (kind_action_state_t): Add a boolean TREE_CONFLICTED field (breaking the
    name kind_action_state_t which says "it has a kind, an action and a
    state") used for notification of deleted nodes.
  (absent_directory, absent_file): Add a question comment.
  
* subversion/libsvn_client/merge.c
  (merge_props_changed, merge_file_changed, merge_file_added,
   merge_file_deleted, merge_dir_added, merge_dir_deleted, merge_dir_opened,
   merge_dir_closed, single_file_merge_notify, do_file_merge): Apply addition
    of new callbacks argument called *TREE_CONFLICTED and use it.
  (merge_cmd_baton_t): Remove obsoleted field TREE_CONFLICTED_DIRS which
    used to list all dirs that contain tree-conflicts.
  (add_parent_to_tree_conflicted_dirs, is_tree_conflicted_dir_p): Remove
    obsoleted functions related to TREE_CONFLICTED_DIRS.
  (do_merge, tree_conflict): Remove use of TREE_CONFLICTED_DIRS.

* subversion/libsvn_client/diff.c
  (diff_props_changed, diff_file_changed, diff_file_added,
  diff_file_deleted_with_diff, diff_file_deleted_no_diff,
  diff_dir_added, diff_dir_deleted, diff_dir_opened, diff_dir_closed):
    Apply addition of callbacks parameter *TREE_CONFLICTED and ignore it.
    These are the callbacks for a plain diff, they don't cause 
    tree-conflicts by definition.

* subversion/tests/cmdline/merge_tests.py
  (delete_file_and_dir, merge_catches_nonexistent_target,
   merge_tree_deleted_in_target, merge_added_dir_to_deleted_in_target,
   three_way_merge_add_of_existing_binary_file, del_differing_file,
   tree_conflicts_and_obstructions,
   tree_conflicts_on_merge_local_ci_4_1,
   tree_conflicts_on_merge_local_ci_4_2, tree_conflicts_on_merge_local_ci_5_1,
   tree_conflicts_on_merge_local_ci_5_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_5_1,
   tree_conflicts_on_merge_no_local_ci_5_2,
   tree_conflicts_on_merge_no_local_ci_6): Fix up some tests. Intentionally
    leaving some merge tests unfixed for now. Their common problem shall be
    fixed on trunk, since update/switch/checkout are also affected.


------------------------------------------------------------------------
r33990 | neels | 2008-11-01 04:51:11 +0100 (Sat, 01 Nov 2008) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_client/repos_diff.c

Rename kind_action_state_t to deleted_path_notify_t, the former describing
what fields it had (KIND, ACTION and STATE, plus now TREE_CONFLICTED), and
the latter describing what it is used for.

* subversion/libsvn_client/repos_diff.c:
  (kind_action_state_t): Rename to deleted_path_notify_t.
  (deleted_path_notify_t): New name of kind_action_state_t.
  (edit_baton, delete_entry, add_directory, close_file, close_directory):
    Apply rename of kind_action_state_t to deleted_path_notify_t and rename
    instance variables KAS to DPN.


------------------------------------------------------------------------
r33991 | neels | 2008-11-01 04:53:07 +0100 (Sat, 01 Nov 2008) | 2 lines
Changed paths:
   D /branches/tc-merge-notify

Removing branch tc-merge-notify, which was merged to trunk.

------------------------------------------------------------------------
r33992 | danielsh | 2008-11-01 11:00:02 +0100 (Sat, 01 Nov 2008) | 2 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/checkout_tests.py

* subversion/tests/cmdline/checkout_tests.py
  (checkout_peg_rev_date): Sleep for one second instead of for a minute.
------------------------------------------------------------------------
r33993 | pburba | 2008-11-01 16:06:53 +0100 (Sat, 01 Nov 2008) | 9 lines
Changed paths:
   M /branches/reintegrate-improvements/subversion/include/svn_mergeinfo.h
   M /branches/reintegrate-improvements/subversion/libsvn_subr/mergeinfo.c

On the reintegrate-improvements branch: New API for making deep copies of
mergeinfo catalogs.

* subversion/include/svn_mergeinfo.h
  (svn_mergeinfo_catalog_dup): New declaration.

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo_catalog_dup): New definition.

------------------------------------------------------------------------
r33994 | sbutler | 2008-11-01 17:44:45 +0100 (Sat, 01 Nov 2008) | 17 lines
Changed paths:
   M /trunk/subversion/libsvn_client/commit_util.c
   M /trunk/subversion/libsvn_repos/commit.c
   M /trunk/subversion/tests/cmdline/commit_tests.py

In the client commit code, convert a "not found" error to the more
helpful "out of date" error.

This follows up on work done on the double-delete branch, which was
merged to trunk in r32901.

* subversion/tests/cmdline/commit_tests.py
  (commit_out_of_date_deletions): Expect "out of date" instead of
   "File not found: transaction".

* subversion/libsvn_client/commit_util.c
  (fixup_out_of_date_error): New function.
  (do_item_commit): Convert certain RA errors to "out of date".

* subversion/libsvn_repos/commit.c
  (out_of_date): Minor tweak to error text.

------------------------------------------------------------------------
r33995 | arfrever | 2008-11-02 00:51:36 +0100 (Sun, 02 Nov 2008) | 32 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/autoprop_tests.py
   M /trunk/subversion/tests/cmdline/basic_tests.py
   M /trunk/subversion/tests/cmdline/checkout_tests.py
   M /trunk/subversion/tests/cmdline/commit_tests.py
   M /trunk/subversion/tests/cmdline/copy_tests.py
   M /trunk/subversion/tests/cmdline/diff_tests.py
   M /trunk/subversion/tests/cmdline/getopt_tests.py
   M /trunk/subversion/tests/cmdline/info_tests.py
   M /trunk/subversion/tests/cmdline/lock_tests.py
   M /trunk/subversion/tests/cmdline/log_tests.py
   M /trunk/subversion/tests/cmdline/merge_tests.py
   M /trunk/subversion/tests/cmdline/prop_tests.py
   M /trunk/subversion/tests/cmdline/revert_tests.py
   M /trunk/subversion/tests/cmdline/schedule_tests.py
   M /trunk/subversion/tests/cmdline/stat_tests.py
   M /trunk/subversion/tests/cmdline/svnadmin_tests.py
   M /trunk/subversion/tests/cmdline/svneditor.py
   M /trunk/subversion/tests/cmdline/svnlook_tests.py
   M /trunk/subversion/tests/cmdline/svntest/actions.py
   M /trunk/subversion/tests/cmdline/svntest/entry.py
   M /trunk/subversion/tests/cmdline/svntest/main.py
   M /trunk/subversion/tests/cmdline/svntest/testcase.py
   M /trunk/subversion/tests/cmdline/svntest/tree.py
   M /trunk/subversion/tests/cmdline/svntest/verify.py
   M /trunk/subversion/tests/cmdline/switch_tests.py
   M /trunk/subversion/tests/cmdline/trans_tests.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

Python 3 compatibility:
Update calls to print() in 'subversion/tests' directory.

* subversion/tests/cmdline/autoprop_tests.py:
* subversion/tests/cmdline/basic_tests.py:
* subversion/tests/cmdline/checkout_tests.py:
* subversion/tests/cmdline/commit_tests.py:
* subversion/tests/cmdline/copy_tests.py:
* subversion/tests/cmdline/diff_tests.py:
* subversion/tests/cmdline/getopt_tests.py:
* subversion/tests/cmdline/info_tests.py:
* subversion/tests/cmdline/lock_tests.py:
* subversion/tests/cmdline/log_tests.py:
* subversion/tests/cmdline/merge_tests.py:
* subversion/tests/cmdline/prop_tests.py:
* subversion/tests/cmdline/revert_tests.py:
* subversion/tests/cmdline/schedule_tests.py:
* subversion/tests/cmdline/stat_tests.py:
* subversion/tests/cmdline/svnadmin_tests.py:
* subversion/tests/cmdline/svneditor.py:
* subversion/tests/cmdline/svnlook_tests.py:
* subversion/tests/cmdline/svntest/actions.py:
* subversion/tests/cmdline/svntest/entry.py:
* subversion/tests/cmdline/svntest/main.py:
* subversion/tests/cmdline/svntest/testcase.py:
* subversion/tests/cmdline/svntest/tree.py:
* subversion/tests/cmdline/svntest/verify.py:
* subversion/tests/cmdline/switch_tests.py:
* subversion/tests/cmdline/trans_tests.py:
* subversion/tests/cmdline/tree_conflict_tests.py:
* subversion/tests/cmdline/update_tests.py: Call print() or file.write().

------------------------------------------------------------------------
r33996 | arfrever | 2008-11-02 01:14:38 +0100 (Sun, 02 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/entry.py
   M /trunk/win-tests.py

* subversion/tests/cmdline/svntest/entry.py
  (svn_entry.prettyprint):
* win-tests.py
  (_usage_exit): Fix calls to print() for compatibility with Python 2.

------------------------------------------------------------------------
r33997 | arfrever | 2008-11-02 01:45:48 +0100 (Sun, 02 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/ctx.c
   M /trunk/subversion/libsvn_wc/lock.c

Fix some typos.

* subversion/include/svn_client.h
  (svn_client_commit_item3_t, svn_client_commit_item_create2,
   svn_client_ctx_t, svn_client_create_context):
* subversion/include/svn_wc.h
  (svn_wc_external_item2_t, svn_wc_external_item_create):
* subversion/libsvn_client/ctx.c:
* subversion/libsvn_wc/lock.c
  (adm_access_alloc): Fix typos in doc strings.

------------------------------------------------------------------------
r33998 | hwright | 2008-11-02 02:41:20 +0100 (Sun, 02 Nov 2008) | 4 lines
Changed paths:
   M /trunk/tools/dist/dist.sh

* tools/dist/dist.sh:
  Accept the '-pre X' suffix for releases.  A pre-release isn't an alpha or
  a beta, but rather a nebulous term meaning either!

------------------------------------------------------------------------
r33999 | neels | 2008-11-02 02:42:38 +0100 (Sun, 02 Nov 2008) | 47 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/repos_diff.c
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/libsvn_wc/util.c
   M /trunk/subversion/svn/notify.c
   M /trunk/subversion/tests/cmdline/merge_tests.py
   M /trunk/subversion/tests/cmdline/switch_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

Implement a seemingly better way of notifying about a tree-conflict.
Instead of using a TREE_CONFLICTED flag in svn_wc_notify_t, rather use
a new, separate svn_wc_notify_action_t enum value. This also removes all
other letters ('A', 'D'...) from tree-conflict notifications ("by force").
## TODO: This doesn't mean that the actions are actually skipped, though.

* subversion/tests/cmdline/switch_tests.py
  (tree_conflicts_on_switch_1_2, tree_conflicts_on_switch_2_1,
   tree_conflicts_on_switch_2_2, tree_conflicts_on_switch_3):
    Fix up these tests (omitting 'D' notification on tree-conflicts).

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_1_2, tree_conflicts_on_update_2_1,
   tree_conflicts_on_update_2_2, tree_conflicts_on_update_3):
    Fix up these tests (omitting 'D' notification on tree-conflicts).

* subversion/tests/cmdline/merge_tests.py
  (del_differing_file, tree_conflicts_on_merge_local_ci_5_1,
   tree_conflicts_on_merge_local_ci_5_2,
   tree_conflicts_on_merge_no_local_ci_5_2):
    Fix up these tests (add '--- Merging rN...' output lines).

* subversion/svn/notify.c (notify): Introduce a separate switch case for
    tree-conflicts notification. Remove all inline notification of
    tree-conflicts from the other notification cases. Use the new way of
    sending a tree-conflicts notification.

* subversion/include/svn_wc.h
  (svn_wc_notify_action_t): Add enum value SVN_WC_NOTIFY_TREE_CONFLICT.
  (svn_wc_notify_t): Remove TREE_CONFLICTED flag.

* subversion/libsvn_wc/util.c (svn_wc_create_notify):
    Do not initialize the removed field TREE_CONFLICTED.
 
* subversion/libsvn_wc/update_editor.c
  (do_entry_deletion, add_directory, open_directory, close_directory,
   open_file, close_file): Use the new way of tree-conflict notification.

* subversion/libsvn_client/repos_diff.c
  (delete_entry, add_directory, close_file, close_directory):
    Use the new way of tree-conflict notification.
   
* subversion/libsvn_client/merge.c
  (IS_OPERATIVE_MERGE): Add tree-conflicted cases to this condition macro.
  (single_file_merge_notify, do_file_merge):
    Use the new way of tree-conflict notification.

------------------------------------------------------------------------
r34000 | fabien | 2008-11-02 14:53:44 +0100 (Sun, 02 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/po/fr.po

French translation update for r33999

* subversion/po/fr.po: po-update & 1 fuzzy fixed

------------------------------------------------------------------------
r34001 | arfrever | 2008-11-02 15:39:55 +0100 (Sun, 02 Nov 2008) | 37 lines
Changed paths:
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_subr/macos_keychain.c
   M /trunk/subversion/libsvn_subr/simple_providers.c
   M /trunk/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /trunk/subversion/libsvn_subr/win32_crypto.c

Pass parameters instead of configuration to implementations of
svn_auth__password_get_t / svn_auth__password_set_t.

* subversion/include/private/svn_auth_private.h
  (svn_auth__password_get_t, svn_auth__password_set_t,
   svn_auth__simple_password_get, svn_auth__simple_password_set): Replace
   'config' argument with 'parameters'.

* subversion/libsvn_subr/simple_providers.c
  (svn_auth__simple_password_get, svn_auth__simple_password_set): Replace
   'config' argument with 'parameters'.
  (svn_auth__simple_first_creds_helper): Update call to password_get().
  (svn_auth__simple_save_creds_helper): Delete 'cfg' and update call to
   password_set().

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c
  (simple_passphrase_get, simple_passphrase_set): Replace 'config' argument
   with 'parameters'.
  (svn_auth__ssl_client_cert_pw_file_first_creds_helper): Update call to
   passphrase_get().
  (svn_auth__ssl_client_cert_pw_file_save_creds_helper): Delete 'cfg' and
   update call to passphrase_set().

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (gnome_keyring_password_get, gnome_keyring_password_set):
* subversion/libsvn_auth_kwallet/kwallet.cpp
  (kwallet_password_get, kwallet_password_set):
* subversion/libsvn_subr/macos_keychain.c
  (keychain_password_set, keychain_password_get): Replace 'config' argument
   with 'parameters'.

* subversion/libsvn_subr/win32_crypto.c
  (windows_password_encrypter): Replace 'config' argument with 'parameters'
   and update call to svn_auth__simple_password_set().
  (windows_password_decrypter): Replace 'config' argument with 'parameters'
   and update call to svn_auth__simple_password_get().

------------------------------------------------------------------------
r34002 | pburba | 2008-11-02 16:35:13 +0100 (Sun, 02 Nov 2008) | 6 lines
Changed paths:
   M /branches/reintegrate-improvements/subversion/tests/cmdline/merge_tests.py

On the issue-3067-deleted-subtrees branch: Correct the expectations of an
XFailing --reintegrate merge test.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_branch_never_merged_to): Another small expectation change,
  another big comment to explain why.
------------------------------------------------------------------------
r34003 | arfrever | 2008-11-02 16:38:45 +0100 (Sun, 02 Nov 2008) | 14 lines
Changed paths:
   M /trunk/subversion/include/svn_auth.h
   M /trunk/subversion/libsvn_ra_neon/session.c
   M /trunk/subversion/libsvn_ra_serf/serf.c

Pass client configuration to authentication baton.

* subversion/include/svn_auth.h
  (SVN_AUTH_PARAM_CONFIG_CLIENT): New.
  (SVN_AUTH_PARAM_CONFIG): Update value.

* subversion/libsvn_ra_neon/session.c
  (svn_ra_neon__open): Store SVN_AUTH_PARAM_CONFIG_CLIENT parameter in
   authentication baton.

* subversion/libsvn_ra_serf/serf.c
  (load_config): Store SVN_AUTH_PARAM_CONFIG_CLIENT parameter in
   authentication baton.

------------------------------------------------------------------------
r34004 | arfrever | 2008-11-02 16:45:40 +0100 (Sun, 02 Nov 2008) | 13 lines
Changed paths:
   M /trunk/subversion/include/svn_config.h
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_subr/config_file.c

Support the 'kwallet-wallet' configuration option which is used to specify
which wallet should be used by Subversion.

* subversion/include/svn_config.h
  (SVN_CONFIG_OPTION_KWALLET_WALLET): New.

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (get_wallet_name): New.
  (kwallet_password_get, kwallet_password_set): Use get_wallet_name().

* subversion/libsvn_subr/config_file.c
  (svn_config_ensure): Update the default 'config' file.

------------------------------------------------------------------------
r34005 | arfrever | 2008-11-02 17:06:23 +0100 (Sun, 02 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svnlook_tests.py
   M /trunk/subversion/tests/cmdline/svntest/actions.py
   M /trunk/subversion/tests/cmdline/svntest/main.py
   M /trunk/subversion/tests/cmdline/svntest/tree.py

Follow-up to r33995:
Delete unneded backslashes in calls to print().

Suggested by: gstein

* subversion/tests/cmdline/svnlook_tests.py:
* subversion/tests/cmdline/svntest/actions.py:
* subversion/tests/cmdline/svntest/main.py:
* subversion/tests/cmdline/svntest/tree.py: Delete unneded backslashes in calls
   to print().

------------------------------------------------------------------------
r34006 | arfrever | 2008-11-02 20:26:21 +0100 (Sun, 02 Nov 2008) | 5 lines
Changed paths:
   M /trunk/www/svn_1.6_releasenotes.html

* www/svn_1.6_releasenotes.html
  (svn-patch): Delete. `svn patch` hopefully will be available in
   Subversion 1.7.
  (wc-upgrades): Delete '[BRANCH]' identifier.

------------------------------------------------------------------------
r34007 | arfrever | 2008-11-02 20:34:25 +0100 (Sun, 02 Nov 2008) | 117 lines
Changed paths:
   M /trunk/build/generator/extractor.py
   M /trunk/build/generator/gen_vcnet_vcproj.py
   M /trunk/build/generator/gen_win.py
   M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /trunk/subversion/bindings/ctypes-python/csvn/repos.py
   M /trunk/subversion/bindings/ctypes-python/csvn/wc.py
   M /trunk/subversion/bindings/ctypes-python/examples/mucc.py
   M /trunk/subversion/bindings/ctypes-python/setup.py
   M /trunk/subversion/bindings/ctypes-python/test/localrepos.py
   M /trunk/subversion/bindings/ctypes-python/test/remoterepos.py
   M /trunk/subversion/bindings/ctypes-python/test/run_all.py
   M /trunk/subversion/bindings/ctypes-python/test/svntypes.py
   M /trunk/subversion/bindings/ctypes-python/test/wc.py
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/include/private/svn_wc_private.h
   M /trunk/subversion/include/svn_auth.h
   M /trunk/subversion/include/svn_checksum.h
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/include/svn_cmdline.h
   M /trunk/subversion/include/svn_dirent_uri.h
   M /trunk/subversion/include/svn_path.h
   M /trunk/subversion/include/svn_props.h
   M /trunk/subversion/libsvn_client/commit_util.c
   M /trunk/subversion/libsvn_client/copy.c
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/export.c
   M /trunk/subversion/libsvn_client/externals.c
   M /trunk/subversion/libsvn_client/info.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/mergeinfo.h
   M /trunk/subversion/libsvn_client/ra.c
   M /trunk/subversion/libsvn_client/repos_diff.c
   M /trunk/subversion/libsvn_fs/fs-loader.c
   M /trunk/subversion/libsvn_fs/fs-loader.h
   M /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
   M /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.h
   M /trunk/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
   M /trunk/subversion/libsvn_fs_base/bdb/reps-table.c
   M /trunk/subversion/libsvn_fs_base/dag.c
   M /trunk/subversion/libsvn_fs_base/dag.h
   M /trunk/subversion/libsvn_fs_base/err.h
   M /trunk/subversion/libsvn_fs_base/fs.c
   M /trunk/subversion/libsvn_fs_base/reps-strings.c
   M /trunk/subversion/libsvn_fs_base/tree.c
   M /trunk/subversion/libsvn_fs_base/tree.h
   M /trunk/subversion/libsvn_fs_base/util/fs_skels.c
   M /trunk/subversion/libsvn_fs_fs/dag.h
   M /trunk/subversion/libsvn_fs_fs/fs_fs.h
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c
   M /trunk/subversion/libsvn_fs_fs/rep-cache.h
   M /trunk/subversion/libsvn_fs_fs/tree.c
   M /trunk/subversion/libsvn_ra/compat.c
   M /trunk/subversion/libsvn_ra_neon/log.c
   M /trunk/subversion/libsvn_ra_neon/session.c
   M /trunk/subversion/libsvn_ra_serf/log.c
   M /trunk/subversion/libsvn_ra_serf/update.c
   M /trunk/subversion/libsvn_ra_serf/util.c
   M /trunk/subversion/libsvn_ra_serf/win32_auth_sspi.c
   M /trunk/subversion/libsvn_repos/hooks.c
   M /trunk/subversion/libsvn_repos/log.c
   M /trunk/subversion/libsvn_repos/repos.h
   M /trunk/subversion/libsvn_subr/checksum.c
   M /trunk/subversion/libsvn_subr/cmdline.c
   M /trunk/subversion/libsvn_subr/config_file.c
   M /trunk/subversion/libsvn_subr/config_win.c
   M /trunk/subversion/libsvn_subr/dirent_uri.c
   M /trunk/subversion/libsvn_subr/dso.c
   M /trunk/subversion/libsvn_subr/io.c
   M /trunk/subversion/libsvn_subr/nls.c
   M /trunk/subversion/libsvn_subr/simple_providers.c
   M /trunk/subversion/libsvn_subr/sqlite.c
   M /trunk/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /trunk/subversion/libsvn_subr/stream.c
   M /trunk/subversion/libsvn_subr/win32_crypto.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/diff.c
   M /trunk/subversion/libsvn_wc/props.c
   M /trunk/subversion/libsvn_wc/status.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/libsvn_wc/wc_db.h
   M /trunk/subversion/svn/cl.h
   M /trunk/subversion/svn/propedit-cmd.c
   M /trunk/subversion/svn/propget-cmd.c
   M /trunk/subversion/svn/status-cmd.c
   M /trunk/subversion/svn/tree-conflicts.c
   M /trunk/subversion/svn/util.c
   M /trunk/subversion/svndumpfilter/main.c
   M /trunk/subversion/svnlook/main.c
   M /trunk/subversion/svnserve/main.c
   M /trunk/subversion/tests/cmdline/commit_tests.py
   M /trunk/subversion/tests/cmdline/copy_tests.py
   M /trunk/subversion/tests/cmdline/info_tests.py
   M /trunk/subversion/tests/cmdline/log_tests.py
   M /trunk/subversion/tests/cmdline/merge_tests.py
   M /trunk/subversion/tests/cmdline/prop_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/svntest/tree.py
   M /trunk/subversion/tests/cmdline/switch_tests.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py
   M /trunk/subversion/tests/libsvn_repos/repos-test.c
   M /trunk/subversion/tests/libsvn_subr/checksum-test.c
   M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /trunk/subversion/tests/libsvn_subr/path-test.c
   M /trunk/subversion/tests/libsvn_subr/target-test.c
   M /trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /trunk/tools/examples/svnlook.py

Delete trailing whitespace.
Follow-up to r26317 and r27598.

* build/generator/extractor.py:
* build/generator/gen_vcnet_vcproj.py:
* build/generator/gen_win.py:
* contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py:
* subversion/bindings/ctypes-python/csvn/repos.py:
* subversion/bindings/ctypes-python/csvn/wc.py:
* subversion/bindings/ctypes-python/examples/mucc.py:
* subversion/bindings/ctypes-python/setup.py:
* subversion/bindings/ctypes-python/test/localrepos.py:
* subversion/bindings/ctypes-python/test/remoterepos.py:
* subversion/bindings/ctypes-python/test/run_all.py:
* subversion/bindings/ctypes-python/test/svntypes.py:
* subversion/bindings/ctypes-python/test/wc.py:
* subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java:
* subversion/include/private/svn_auth_private.h:
* subversion/include/private/svn_sqlite.h:
* subversion/include/private/svn_wc_private.h:
* subversion/include/svn_auth.h:
* subversion/include/svn_checksum.h:
* subversion/include/svn_client.h:
* subversion/include/svn_cmdline.h:
* subversion/include/svn_dirent_uri.h:
* subversion/include/svn_path.h:
* subversion/include/svn_props.h:
* subversion/libsvn_client/commit_util.c:
* subversion/libsvn_client/copy.c:
* subversion/libsvn_client/deprecated.c:
* subversion/libsvn_client/export.c:
* subversion/libsvn_client/externals.c:
* subversion/libsvn_client/info.c:
* subversion/libsvn_client/merge.c:
* subversion/libsvn_client/mergeinfo.h:
* subversion/libsvn_client/ra.c:
* subversion/libsvn_client/repos_diff.c:
* subversion/libsvn_fs_base/bdb/checksum-reps-table.c:
* subversion/libsvn_fs_base/bdb/checksum-reps-table.h:
* subversion/libsvn_fs_base/bdb/miscellaneous-table.c:
* subversion/libsvn_fs_base/bdb/reps-table.c:
* subversion/libsvn_fs_base/dag.c:
* subversion/libsvn_fs_base/dag.h:
* subversion/libsvn_fs_base/err.h:
* subversion/libsvn_fs_base/fs.c:
* subversion/libsvn_fs_base/reps-strings.c:
* subversion/libsvn_fs_base/tree.c:
* subversion/libsvn_fs_base/tree.h:
* subversion/libsvn_fs_base/util/fs_skels.c:
* subversion/libsvn_fs_fs/dag.h:
* subversion/libsvn_fs_fs/fs_fs.h:
* subversion/libsvn_fs/fs-loader.c:
* subversion/libsvn_fs/fs-loader.h:
* subversion/libsvn_fs_fs/rep-cache.c:
* subversion/libsvn_fs_fs/rep-cache.h:
* subversion/libsvn_fs_fs/tree.c:
* subversion/libsvn_ra/compat.c:
* subversion/libsvn_ra_neon/log.c:
* subversion/libsvn_ra_neon/session.c:
* subversion/libsvn_ra_serf/log.c:
* subversion/libsvn_ra_serf/update.c:
* subversion/libsvn_ra_serf/util.c:
* subversion/libsvn_ra_serf/win32_auth_sspi.c:
* subversion/libsvn_repos/hooks.c:
* subversion/libsvn_repos/log.c:
* subversion/libsvn_repos/repos.h:
* subversion/libsvn_subr/checksum.c:
* subversion/libsvn_subr/cmdline.c:
* subversion/libsvn_subr/config_file.c:
* subversion/libsvn_subr/config_win.c:
* subversion/libsvn_subr/dirent_uri.c:
* subversion/libsvn_subr/dso.c:
* subversion/libsvn_subr/io.c:
* subversion/libsvn_subr/nls.c:
* subversion/libsvn_subr/simple_providers.c:
* subversion/libsvn_subr/sqlite.c:
* subversion/libsvn_subr/ssl_client_cert_pw_providers.c:
* subversion/libsvn_subr/stream.c:
* subversion/libsvn_subr/win32_crypto.c:
* subversion/libsvn_wc/adm_ops.c:
* subversion/libsvn_wc/diff.c:
* subversion/libsvn_wc/props.c:
* subversion/libsvn_wc/status.c:
* subversion/libsvn_wc/tree_conflicts.c:
* subversion/libsvn_wc/tree_conflicts.h:
* subversion/libsvn_wc/update_editor.c:
* subversion/libsvn_wc/wc_db.h:
* subversion/svn/cl.h:
* subversion/svndumpfilter/main.c:
* subversion/svnlook/main.c:
* subversion/svn/propedit-cmd.c:
* subversion/svn/propget-cmd.c:
* subversion/svnserve/main.c:
* subversion/svn/status-cmd.c:
* subversion/svn/tree-conflicts.c:
* subversion/svn/util.c:
* subversion/tests/cmdline/commit_tests.py:
* subversion/tests/cmdline/copy_tests.py:
* subversion/tests/cmdline/info_tests.py:
* subversion/tests/cmdline/log_tests.py:
* subversion/tests/cmdline/merge_tests.py:
* subversion/tests/cmdline/prop_tests.py:
* subversion/tests/cmdline/revert_tests.py:
* subversion/tests/cmdline/stat_tests.py:
* subversion/tests/cmdline/svntest/actions.py:
* subversion/tests/cmdline/svntest/tree.py:
* subversion/tests/cmdline/switch_tests.py:
* subversion/tests/cmdline/tree_conflict_tests.py:
* subversion/tests/cmdline/update_tests.py:
* subversion/tests/libsvn_repos/repos-test.c:
* subversion/tests/libsvn_subr/checksum-test.c:
* subversion/tests/libsvn_subr/dirent_uri-test.c:
* subversion/tests/libsvn_subr/path-test.c:
* subversion/tests/libsvn_subr/target-test.c:
* subversion/tests/libsvn_wc/tree-conflict-data-test.c:
* tools/examples/svnlook.py: Delete trailing whitespace.

------------------------------------------------------------------------
r34008 | kfogel | 2008-11-03 00:42:46 +0100 (Mon, 03 Nov 2008) | 4 lines
Changed paths:
   M /branches/issue-2843-dev
   M /branches/issue-2843-dev/build.conf
   M /branches/issue-2843-dev/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/requirements.txt
   M /branches/issue-2843-dev/subversion
   M /branches/issue-2843-dev/subversion/include
   M /branches/issue-2843-dev/subversion/include/private/svn_auth_private.h
   M /branches/issue-2843-dev/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2843-dev/subversion/libsvn_subr
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr
   D /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp VS2005
   A /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005 (from /trunk/tools/buildbot/slaves/win32-xp-VS2005:33536)
   R /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005/config.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/config.bat:33536)
   R /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat:33536)
   R /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat:33536)
   R /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat:33536)
   R /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat:33536)
   R /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat:33536)
   M /branches/issue-2843-dev/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2843-dev/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2843-dev/www/development.html
   M /branches/issue-2843-dev/www/issue-tracker.html
   M /branches/issue-2843-dev/www/tasks.html

On the issue-2843-dev branch: bring up-to-date with trunk@r33536:

   svn merge https://svn.collab.net/repos/svn/trunk@r33536

------------------------------------------------------------------------
r34009 | kfogel | 2008-11-03 01:06:16 +0100 (Mon, 03 Nov 2008) | 12 lines
Changed paths:
   M /branches/issue-2843-dev
   M /branches/issue-2843-dev/CHANGES
   M /branches/issue-2843-dev/COMMITTERS
   M /branches/issue-2843-dev/INSTALL
   A /branches/issue-2843-dev/TODO-1.6 (from /trunk/TODO-1.6:34008)
   M /branches/issue-2843-dev/build/generator/extractor.py
   M /branches/issue-2843-dev/build/generator/gen_base.py
   M /branches/issue-2843-dev/build/generator/gen_make.py
   M /branches/issue-2843-dev/build/generator/gen_vcnet_vcproj.py
   M /branches/issue-2843-dev/build/generator/gen_win.py
   M /branches/issue-2843-dev/build/generator/swig/header_wrappers.py
   M /branches/issue-2843-dev/build/run_tests.py
   M /branches/issue-2843-dev/build/strip-po-charset.py
   M /branches/issue-2843-dev/build.conf
   M /branches/issue-2843-dev/configure.ac
   M /branches/issue-2843-dev/contrib/client-side/emacs/psvn.el
   M /branches/issue-2843-dev/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/issue-2843-dev/contrib/hook-scripts/enforcer/enforcer
   M /branches/issue-2843-dev/gen-make.py
   M /branches/issue-2843-dev/notes/http-protocol-v2.txt
   M /branches/issue-2843-dev/notes/l10n-problems
   A /branches/issue-2843-dev/notes/tree-conflicts/all-tests.sh (from /trunk/notes/tree-conflicts/all-tests.sh:34008)
   M /branches/issue-2843-dev/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/requirements.txt
   M /branches/issue-2843-dev/notes/wc-ng-design
   M /branches/issue-2843-dev/packages/windows-WiX/BuildSubversion/Bitmaps/svn_bck.png
   M /branches/issue-2843-dev/subversion
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/csvn/wc.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/examples/example.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/examples/log.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/setup.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/test/localrepos.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/test/remoterepos.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/test/run_all.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/test/svntypes.py
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/test/wc.py
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/ConflictResolverCallback.h
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/EnumMapper.h
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/InfoCallback.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/SVNClient.h
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/StatusCallback.h
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   A /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java:34008)
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
   M /branches/issue-2843-dev/subversion/bindings/swig/core.i
   M /branches/issue-2843-dev/subversion/bindings/swig/include/svn_global.swg
   M /branches/issue-2843-dev/subversion/bindings/swig/python/svn/core.py
   M /branches/issue-2843-dev/subversion/bindings/swig/python/tests/auth.py
   M /branches/issue-2843-dev/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/issue-2843-dev/subversion/bindings/swig/ruby/svn/commit-mailer.rb
   M /branches/issue-2843-dev/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/issue-2843-dev/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/issue-2843-dev/subversion/bindings/swig/svn_client.i
   M /branches/issue-2843-dev/subversion/include
   M /branches/issue-2843-dev/subversion/include/private/svn_auth_private.h
   A /branches/issue-2843-dev/subversion/include/private/svn_cache.h (from /trunk/subversion/include/private/svn_cache.h:34008)
   M /branches/issue-2843-dev/subversion/include/private/svn_dep_compat.h
   M /branches/issue-2843-dev/subversion/include/private/svn_sqlite.h
   M /branches/issue-2843-dev/subversion/include/private/svn_wc_private.h
   M /branches/issue-2843-dev/subversion/include/svn_auth.h
   D /branches/issue-2843-dev/subversion/include/svn_cache.h
   M /branches/issue-2843-dev/subversion/include/svn_checksum.h
   M /branches/issue-2843-dev/subversion/include/svn_client.h
   M /branches/issue-2843-dev/subversion/include/svn_cmdline.h
   M /branches/issue-2843-dev/subversion/include/svn_config.h
   M /branches/issue-2843-dev/subversion/include/svn_delta.h
   M /branches/issue-2843-dev/subversion/include/svn_dirent_uri.h
   M /branches/issue-2843-dev/subversion/include/svn_error.h
   M /branches/issue-2843-dev/subversion/include/svn_error_codes.h
   M /branches/issue-2843-dev/subversion/include/svn_fs.h
   M /branches/issue-2843-dev/subversion/include/svn_io.h
   M /branches/issue-2843-dev/subversion/include/svn_path.h
   M /branches/issue-2843-dev/subversion/include/svn_props.h
   M /branches/issue-2843-dev/subversion/include/svn_time.h
   M /branches/issue-2843-dev/subversion/include/svn_utf.h
   M /branches/issue-2843-dev/subversion/include/svn_wc.h
   M /branches/issue-2843-dev/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/issue-2843-dev/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2843-dev/subversion/libsvn_client/add.c
   M /branches/issue-2843-dev/subversion/libsvn_client/blame.c
   M /branches/issue-2843-dev/subversion/libsvn_client/cat.c
   M /branches/issue-2843-dev/subversion/libsvn_client/changelist.c
   M /branches/issue-2843-dev/subversion/libsvn_client/checkout.c
   M /branches/issue-2843-dev/subversion/libsvn_client/cleanup.c
   M /branches/issue-2843-dev/subversion/libsvn_client/commit.c
   M /branches/issue-2843-dev/subversion/libsvn_client/commit_util.c
   M /branches/issue-2843-dev/subversion/libsvn_client/copy.c
   M /branches/issue-2843-dev/subversion/libsvn_client/ctx.c
   M /branches/issue-2843-dev/subversion/libsvn_client/delete.c
   A /branches/issue-2843-dev/subversion/libsvn_client/deprecated.c (from /trunk/subversion/libsvn_client/deprecated.c:34008)
   M /branches/issue-2843-dev/subversion/libsvn_client/diff.c
   M /branches/issue-2843-dev/subversion/libsvn_client/export.c
   M /branches/issue-2843-dev/subversion/libsvn_client/externals.c
   M /branches/issue-2843-dev/subversion/libsvn_client/info.c
   M /branches/issue-2843-dev/subversion/libsvn_client/list.c
   M /branches/issue-2843-dev/subversion/libsvn_client/locking_commands.c
   M /branches/issue-2843-dev/subversion/libsvn_client/log.c
   M /branches/issue-2843-dev/subversion/libsvn_client/merge.c
   M /branches/issue-2843-dev/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-2843-dev/subversion/libsvn_client/mergeinfo.h
   M /branches/issue-2843-dev/subversion/libsvn_client/prop_commands.c
   M /branches/issue-2843-dev/subversion/libsvn_client/ra.c
   M /branches/issue-2843-dev/subversion/libsvn_client/relocate.c
   M /branches/issue-2843-dev/subversion/libsvn_client/repos_diff.c
   M /branches/issue-2843-dev/subversion/libsvn_client/resolved.c
   M /branches/issue-2843-dev/subversion/libsvn_client/revert.c
   M /branches/issue-2843-dev/subversion/libsvn_client/revisions.c
   M /branches/issue-2843-dev/subversion/libsvn_client/status.c
   M /branches/issue-2843-dev/subversion/libsvn_client/switch.c
   M /branches/issue-2843-dev/subversion/libsvn_client/update.c
   M /branches/issue-2843-dev/subversion/libsvn_client/url.c
   M /branches/issue-2843-dev/subversion/libsvn_client/util.c
   M /branches/issue-2843-dev/subversion/libsvn_delta/text_delta.c
   A /branches/issue-2843-dev/subversion/libsvn_diff/deprecated.c (from /trunk/subversion/libsvn_diff/deprecated.c:34008)
   M /branches/issue-2843-dev/subversion/libsvn_diff/diff_file.c
   M /branches/issue-2843-dev/subversion/libsvn_fs/fs-loader.c
   M /branches/issue-2843-dev/subversion/libsvn_fs/fs-loader.h
   A /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/checksum-reps-table.c (from /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.c:34008)
   A /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/checksum-reps-table.h (from /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.h:34008)
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/dbt.h
   D /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/metadata-table.c
   D /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/metadata-table.h
   A /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/miscellaneous-table.c (from /trunk/subversion/libsvn_fs_base/bdb/miscellaneous-table.c:34008)
   A /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/miscellaneous-table.h (from /trunk/subversion/libsvn_fs_base/bdb/miscellaneous-table.h:34008)
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/node-origins-table.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/dag.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/dag.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/err.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/err.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/fs.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/fs.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/key-gen.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/notes/structure
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/reps-strings.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/reps-strings.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/tree.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/tree.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/caching.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/dag.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/dag.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/fs.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/lock.c
   A /branches/issue-2843-dev/subversion/libsvn_fs_fs/rep-cache.c (from /trunk/subversion/libsvn_fs_fs/rep-cache.c:34008)
   A /branches/issue-2843-dev/subversion/libsvn_fs_fs/rep-cache.h (from /trunk/subversion/libsvn_fs_fs/rep-cache.h:34008)
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/tree.c
   M /branches/issue-2843-dev/subversion/libsvn_ra/compat.c
   A /branches/issue-2843-dev/subversion/libsvn_ra/deprecated.c (from /trunk/subversion/libsvn_ra/deprecated.c:34008)
   M /branches/issue-2843-dev/subversion/libsvn_ra/ra_loader.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_local/ra_plugin.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_neon/log.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_neon/session.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_neon/util.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/blame.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/commit.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/getdate.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/getlocations.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/getlocationsegments.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/getlocks.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/locks.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/log.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/merge.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/mergeinfo.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/options.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/replay.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/serf.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/update.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/util.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/win32_auth_sspi.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/xml.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_svn/internal_auth.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_svn/ra_svn.h
   M /branches/issue-2843-dev/subversion/libsvn_repos/commit.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/delta.c
   A /branches/issue-2843-dev/subversion/libsvn_repos/deprecated.c (from /trunk/subversion/libsvn_repos/deprecated.c:34008)
   M /branches/issue-2843-dev/subversion/libsvn_repos/dump.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/fs-wrap.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/hooks.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/load.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/log.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/replay.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/reporter.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/repos.c
   M /branches/issue-2843-dev/subversion/libsvn_repos/repos.h
   M /branches/issue-2843-dev/subversion/libsvn_repos/rev_hunt.c
   M /branches/issue-2843-dev/subversion/libsvn_subr
   M /branches/issue-2843-dev/subversion/libsvn_subr/auth.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/cache-inprocess.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/cache-memcache.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/cache.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/cache.h
   M /branches/issue-2843-dev/subversion/libsvn_subr/checksum.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/cmdline.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/config_auth.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/config_file.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/config_win.c
   A /branches/issue-2843-dev/subversion/libsvn_subr/deprecated.c (from /trunk/subversion/libsvn_subr/deprecated.c:34008)
   M /branches/issue-2843-dev/subversion/libsvn_subr/dirent_uri.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/dso.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/genctype.py
   M /branches/issue-2843-dev/subversion/libsvn_subr/io.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/macos_keychain.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/nls.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/opt.c
   A /branches/issue-2843-dev/subversion/libsvn_subr/opt.h (from /trunk/subversion/libsvn_subr/opt.h:34008)
   M /branches/issue-2843-dev/subversion/libsvn_subr/path.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/simple_providers.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/sqlite.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/stream.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/subst.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/time.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/utf.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/win32_crypto.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/adm_crawler.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/adm_files.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/adm_files.h
   M /branches/issue-2843-dev/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/copy.c
   A /branches/issue-2843-dev/subversion/libsvn_wc/deprecated.c (from /trunk/subversion/libsvn_wc/deprecated.c:34008)
   M /branches/issue-2843-dev/subversion/libsvn_wc/diff.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/entries.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/lock.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/lock.h
   M /branches/issue-2843-dev/subversion/libsvn_wc/log.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/log.h
   M /branches/issue-2843-dev/subversion/libsvn_wc/merge.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/props.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/props.h
   M /branches/issue-2843-dev/subversion/libsvn_wc/questions.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/revision_status.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/status.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/translate.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/tree_conflicts.h
   M /branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/util.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/issue-2843-dev/subversion/libsvn_wc/wc_db.h
   M /branches/issue-2843-dev/subversion/po/de.po
   M /branches/issue-2843-dev/subversion/po/fr.po
   M /branches/issue-2843-dev/subversion/po/pl.po
   M /branches/issue-2843-dev/subversion/svn/cl.h
   M /branches/issue-2843-dev/subversion/svn/commit-cmd.c
   M /branches/issue-2843-dev/subversion/svn/copy-cmd.c
   M /branches/issue-2843-dev/subversion/svn/delete-cmd.c
   M /branches/issue-2843-dev/subversion/svn/diff-cmd.c
   M /branches/issue-2843-dev/subversion/svn/import-cmd.c
   M /branches/issue-2843-dev/subversion/svn/info-cmd.c
   M /branches/issue-2843-dev/subversion/svn/main.c
   M /branches/issue-2843-dev/subversion/svn/mkdir-cmd.c
   M /branches/issue-2843-dev/subversion/svn/move-cmd.c
   M /branches/issue-2843-dev/subversion/svn/notify.c
   M /branches/issue-2843-dev/subversion/svn/propedit-cmd.c
   M /branches/issue-2843-dev/subversion/svn/propget-cmd.c
   M /branches/issue-2843-dev/subversion/svn/schema/info.rnc
   M /branches/issue-2843-dev/subversion/svn/schema/status.rnc
   M /branches/issue-2843-dev/subversion/svn/status-cmd.c
   M /branches/issue-2843-dev/subversion/svn/status.c
   M /branches/issue-2843-dev/subversion/svn/tree-conflicts.c
   M /branches/issue-2843-dev/subversion/svn/util.c
   M /branches/issue-2843-dev/subversion/svn_private_config.hw
   M /branches/issue-2843-dev/subversion/svnadmin/main.c
   M /branches/issue-2843-dev/subversion/svndumpfilter/main.c
   M /branches/issue-2843-dev/subversion/svnlook/main.c
   M /branches/issue-2843-dev/subversion/svnserve/main.c
   M /branches/issue-2843-dev/subversion/svnsync/main.c
   M /branches/issue-2843-dev/subversion/tests/cmdline/autoprop_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/basic_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/changelist_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/checkout_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/commit_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/copy_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/diff_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/getopt_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/import_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/info_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/lock_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/log_tests.py
   A /branches/issue-2843-dev/subversion/tests/cmdline/log_tests_data/merge_history_repo.png (from /trunk/subversion/tests/cmdline/log_tests_data/merge_history_repo.png:34008)
   M /branches/issue-2843-dev/subversion/tests/cmdline/merge_authz_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/prop_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/revert_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/schedule_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/special_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/stat_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svneditor.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svnlook_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svntest/actions.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svntest/entry.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svntest/testcase.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svntest/tree.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svntest/verify.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svntest/wc.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/switch_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/trans_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-2843-dev/subversion/tests/cmdline/update_tests.py
   M /branches/issue-2843-dev/subversion/tests/libsvn_delta
   A /branches/issue-2843-dev/subversion/tests/libsvn_delta/window-test.c (from /trunk/subversion/tests/libsvn_delta/window-test.c:34008)
   M /branches/issue-2843-dev/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/issue-2843-dev/subversion/tests/libsvn_repos/repos-test.c
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr/cache-test.c
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr/checksum-test.c
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr/path-test.c
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr/target-test.c
   M /branches/issue-2843-dev/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/issue-2843-dev/tools/bdb/skel.py
   M /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
   M /branches/issue-2843-dev/tools/client-side/change-svn-wc-format.py
   M /branches/issue-2843-dev/tools/dev/contribulyze.py
   M /branches/issue-2843-dev/tools/dev/graph-dav-servers.py
   M /branches/issue-2843-dev/tools/dev/iz/find-fix.py
   M /branches/issue-2843-dev/tools/dev/svn-merge-revs.py
   M /branches/issue-2843-dev/tools/dist/construct-rolling-environment.sh
   M /branches/issue-2843-dev/tools/dist/dist.sh
   M /branches/issue-2843-dev/tools/dist/post-to-tigris.py
   M /branches/issue-2843-dev/tools/dist/write-announcement.py
   M /branches/issue-2843-dev/tools/examples/revplist.py
   M /branches/issue-2843-dev/tools/examples/svnlook.py
   M /branches/issue-2843-dev/tools/hook-scripts/mailer/mailer.py
   M /branches/issue-2843-dev/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2843-dev/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2843-dev/win-tests.py
   M /branches/issue-2843-dev/www/commercial-support.html
   M /branches/issue-2843-dev/www/development.html
   M /branches/issue-2843-dev/www/faq.html
   M /branches/issue-2843-dev/www/getting.html
   M /branches/issue-2843-dev/www/hacking.html
   M /branches/issue-2843-dev/www/images/svn-dav-securityspace-survey.png
   M /branches/issue-2843-dev/www/index.html
   M /branches/issue-2843-dev/www/issue-tracker.html
   M /branches/issue-2843-dev/www/release-history.html
   M /branches/issue-2843-dev/www/roadmap.html
   M /branches/issue-2843-dev/www/svn-dav-securityspace-survey.html
   M /branches/issue-2843-dev/www/svn_1.6_releasenotes.html
   M /branches/issue-2843-dev/www/tasks.html

On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34008):

   svn merge https://svn.collab.net/repos/svn/trunk

There were four conflicts.  I am committing them with conflict markers
intact, so they can be resolved in a separate revision:

   subversion/libsvn_wc/update_editor.c
   subversion/libsvn_wc/lock.c
   subversion/libsvn_wc/adm_crawler.c
   subversion/libsvn_client/ra.c

------------------------------------------------------------------------
r34010 | pburba | 2008-11-03 01:07:14 +0100 (Mon, 03 Nov 2008) | 1 line
Changed paths:
   M /branches/issue-3067-deleted-subtrees
   M /branches/issue-3067-deleted-subtrees/TODO-1.6
   M /branches/issue-3067-deleted-subtrees/build/generator/extractor.py
   M /branches/issue-3067-deleted-subtrees/build/generator/gen_vcnet_vcproj.py
   M /branches/issue-3067-deleted-subtrees/build/generator/gen_win.py
   M /branches/issue-3067-deleted-subtrees/build.conf
   M /branches/issue-3067-deleted-subtrees/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/issue-3067-deleted-subtrees/notes/tree-conflicts/design-overview.txt
   M /branches/issue-3067-deleted-subtrees/notes/tree-conflicts/requirements.txt
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/csvn/wc.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/setup.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/test/localrepos.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/test/remoterepos.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/test/run_all.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/test/svntypes.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/ctypes-python/test/wc.py
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/issue-3067-deleted-subtrees/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/issue-3067-deleted-subtrees/subversion/include
   M /branches/issue-3067-deleted-subtrees/subversion/include/private/svn_auth_private.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/private/svn_cache.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/private/svn_sqlite.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/private/svn_wc_private.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_auth.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_checksum.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_client.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_cmdline.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_config.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_dirent_uri.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_path.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_props.h
   M /branches/issue-3067-deleted-subtrees/subversion/include/svn_wc.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/commit_util.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/copy.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/ctx.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/deprecated.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/diff.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/export.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/externals.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/info.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/merge.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/mergeinfo.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/ra.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_client/repos_diff.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs/fs-loader.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs/fs-loader.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/bdb/checksum-reps-table.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/dag.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/dag.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/err.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/fs.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/fs.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/notes/structure
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/reps-strings.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/reps-strings.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/tree.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/tree.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_fs/dag.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_fs/lock.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_fs/tree.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra/compat.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_neon/log.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_neon/session.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_neon/util.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_serf/log.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_serf/serf.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_serf/update.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_serf/util.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_serf/win32_auth_sspi.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_repos/commit.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_repos/hooks.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_repos/log.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_repos/repos.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/checksum.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/cmdline.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/config_auth.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/config_file.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/config_win.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/dirent_uri.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/dso.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/io.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/macos_keychain.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/nls.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/simple_providers.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/sqlite.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/stream.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_subr/win32_crypto.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/diff.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/lock.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/props.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/status.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/tree_conflicts.h
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/update_editor.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/util.c
   M /branches/issue-3067-deleted-subtrees/subversion/libsvn_wc/wc_db.h
   M /branches/issue-3067-deleted-subtrees/subversion/po/fr.po
   M /branches/issue-3067-deleted-subtrees/subversion/svn/cl.h
   M /branches/issue-3067-deleted-subtrees/subversion/svn/notify.c
   M /branches/issue-3067-deleted-subtrees/subversion/svn/propedit-cmd.c
   M /branches/issue-3067-deleted-subtrees/subversion/svn/propget-cmd.c
   M /branches/issue-3067-deleted-subtrees/subversion/svn/status-cmd.c
   M /branches/issue-3067-deleted-subtrees/subversion/svn/tree-conflicts.c
   M /branches/issue-3067-deleted-subtrees/subversion/svn/util.c
   M /branches/issue-3067-deleted-subtrees/subversion/svndumpfilter/main.c
   M /branches/issue-3067-deleted-subtrees/subversion/svnlook/main.c
   M /branches/issue-3067-deleted-subtrees/subversion/svnserve/main.c
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/autoprop_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/basic_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/checkout_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/commit_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/copy_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/diff_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/getopt_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/info_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/lock_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/log_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/prop_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/revert_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/schedule_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/stat_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svneditor.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svnlook_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svntest/actions.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svntest/entry.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svntest/testcase.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svntest/tree.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/svntest/verify.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/switch_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/trans_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-3067-deleted-subtrees/subversion/tests/cmdline/update_tests.py
   M /branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_repos/repos-test.c
   M /branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_subr
   M /branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_subr/checksum-test.c
   M /branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_subr/path-test.c
   M /branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_subr/target-test.c
   M /branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/issue-3067-deleted-subtrees/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-3067-deleted-subtrees/tools/dist/dist.sh
   M /branches/issue-3067-deleted-subtrees/tools/examples/svnlook.py
   M /branches/issue-3067-deleted-subtrees/tools/server-side/svn_server_log_parse.py
   M /branches/issue-3067-deleted-subtrees/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-3067-deleted-subtrees/win-tests.py
   M /branches/issue-3067-deleted-subtrees/www/development.html
   M /branches/issue-3067-deleted-subtrees/www/issue-tracker.html
   M /branches/issue-3067-deleted-subtrees/www/svn_1.6_releasenotes.html
   M /branches/issue-3067-deleted-subtrees/www/tasks.html

On the issue-3067-deleted-subtrees branch: Merge r33961-34008 from trunk.
------------------------------------------------------------------------
r34011 | kfogel | 2008-11-03 01:37:53 +0100 (Mon, 03 Nov 2008) | 14 lines
Changed paths:
   M /branches/issue-2843-dev/subversion/libsvn_client/ra.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/adm_crawler.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/lock.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c

On the issue-2843-dev branch: resolve conflicts from the r34009 merge.

* subversion/libsvn_wc/update_editor.c
  (do_entry_deletion): Adjust for check_tree_conflict's new parameters.

* subversion/libsvn_wc/lock.c
  (do_open): Adjust for r33676.

* subversion/libsvn_client/ra.c
  (svn_client_uuid_from_path): Adjust for r33775.

* subversion/libsvn_wc/adm_crawler.c
  (svn_wc_crawl_revisions4): Resolve non-conflict.

------------------------------------------------------------------------
r34012 | kfogel | 2008-11-03 01:57:10 +0100 (Mon, 03 Nov 2008) | 11 lines
Changed paths:
   M /branches/issue-2843-dev/subversion/libsvn_client/update.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/adm_crawler.c

On the issue-2843-dev branch:

Update for APIs and deprecations made since this branch was created.

* subversion/libsvn_client/update.c
  (svn_client__update_internal): Call svn_wc_adm_close2.

* subversion/libsvn_wc/adm_crawler.c: Remove a big stretch of code
    that now lives in deprecated.c.  Wonder, and maybe worry, about
    why the recent merges didn't take care of this automatically.

------------------------------------------------------------------------
r34013 | kfogel | 2008-11-03 01:58:23 +0100 (Mon, 03 Nov 2008) | 5 lines
Changed paths:
   M /branches/issue-2843-dev/subversion/libsvn_wc/crop.c

On the issue-2843-dev branch:

* subversion/libsvn_wc/crop.c
  (crop_children): Add static keyword.

------------------------------------------------------------------------
r34014 | kfogel | 2008-11-03 03:14:41 +0100 (Mon, 03 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_ra/compat.c

* subversion/libsvn_ra/compat.c
  (svn_ra__file_revs_from_log): Remove unused var, following up to r33977.

------------------------------------------------------------------------
r34015 | kfogel | 2008-11-03 03:21:11 +0100 (Mon, 03 Nov 2008) | 2 lines
Changed paths:
   M /branches/issue-2843-dev
   M /branches/issue-2843-dev/build.conf
   M /branches/issue-2843-dev/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/requirements.txt
   M /branches/issue-2843-dev/subversion
   M /branches/issue-2843-dev/subversion/include
   M /branches/issue-2843-dev/subversion/include/private/svn_auth_private.h
   M /branches/issue-2843-dev/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2843-dev/subversion/libsvn_ra/compat.c
   M /branches/issue-2843-dev/subversion/libsvn_subr
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr
   M /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2843-dev/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2843-dev/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2843-dev/www/development.html
   M /branches/issue-2843-dev/www/issue-tracker.html
   M /branches/issue-2843-dev/www/tasks.html

On the issue-2843-dev branch: bring up-to-date with trunk@r34014.

------------------------------------------------------------------------
r34016 | pburba | 2008-11-03 04:15:17 +0100 (Mon, 03 Nov 2008) | 1 line
Changed paths:
   M /trunk
   M /trunk/build.conf
   M /trunk/notes/tree-conflicts/design-overview.txt
   M /trunk/notes/tree-conflicts/requirements.txt
   M /trunk/subversion/include
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/private/svn_cache.h
   M /trunk/subversion/include/svn_ra.h
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_ra/compat.c
   M /trunk/subversion/libsvn_ra/ra_loader.c
   M /trunk/subversion/libsvn_ra/ra_loader.h
   M /trunk/subversion/libsvn_ra_local/ra_plugin.c
   A /trunk/subversion/libsvn_ra_neon/get_deleted_rev.c (from /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_neon/get_deleted_rev.c:34010)
   M /trunk/subversion/libsvn_ra_neon/ra_neon.h
   M /trunk/subversion/libsvn_ra_neon/session.c
   A /trunk/subversion/libsvn_ra_serf/get_deleted_rev.c (from /branches/issue-3067-deleted-subtrees/subversion/libsvn_ra_serf/get_deleted_rev.c:34010)
   M /trunk/subversion/libsvn_ra_serf/ra_serf.h
   M /trunk/subversion/libsvn_ra_serf/serf.c
   M /trunk/subversion/libsvn_ra_svn/client.c
   M /trunk/subversion/libsvn_ra_svn/protocol
   M /trunk/subversion/libsvn_subr
   M /trunk/subversion/mod_dav_svn/dav_svn.h
   A /trunk/subversion/mod_dav_svn/reports/deleted-rev.c (from /branches/issue-3067-deleted-subtrees/subversion/mod_dav_svn/reports/deleted-rev.c:34010)
   M /trunk/subversion/mod_dav_svn/version.c
   M /trunk/subversion/svnserve/serve.c
   M /trunk/subversion/tests/cmdline/merge_tests.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.txt
   M /trunk/subversion/tests/libsvn_subr
   M /trunk/tools/buildbot/slaves/win32-xp-VS2005
   M /trunk/tools/server-side/svn_server_log_parse.py
   M /trunk/tools/server-side/test_svn_server_log_parse.py
   M /trunk/www/development.html
   M /trunk/www/issue-tracker.html
   M /trunk/www/tasks.html

Merge the issue-3067-deleted-subtrees branch to trunk.
------------------------------------------------------------------------
r34017 | neels | 2008-11-03 04:47:48 +0100 (Mon, 03 Nov 2008) | 18 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/deprecated.c

Fix r33989 which forgets to adapt the callbacks wrappers in deprecated.c,
resulting in compiler warnings and breaking backward compatibility for the
diff callbacks.

* subversion/libsvn_wc/deprecated.c
  (file_changed, file_added, file_deleted, dir_added, dir_deleted,
   dir_props_changed, dir_opened, dir_closed): Use new callbacks argument
    called *TREE_CONFLICTED. Also add a missing default return value for
    parameter *STATE in dir_closed().
  (callbacks2_wrapper_baton): New baton.
  (file_changed2, file_added2, file_deleted2, dir_added2, dir_deleted2,
   dir_props_changed2): New callback functions to wrap svn_diff_callbacks2_t.
  (callbacks2_wrapper): New static struct with new *2() callback functions.
  (callbacks2_wrap): Remove obsoleted function.
  (svn_wc_get_diff_editor4, svn_wc_diff4): Use callbacks2_wrapper instead
    of callbacks2_wrap().


------------------------------------------------------------------------
r34018 | neels | 2008-11-03 05:40:11 +0100 (Mon, 03 Nov 2008) | 21 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/diff.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/repos_diff.c
   M /trunk/subversion/libsvn_wc/deprecated.c

Remove the dir_closed() diff callback, it is now unused everywhere.

* subversion/include/svn_wc.h (svn_wc_diff_callbacks3_t):
    Remove the now obsolete dir_closed() diff callback.

* subversion/libsvn_client/merge.c
  (merge_dir_closed): Remove this diff callback.
  (merge_callbacks): Remove use of merge_dir_closed().

* subversion/libsvn_client/diff.c
  (diff_dir_closed): Remove this diff callback.
  (svn_client_diff4, svn_client_diff_peg4): Remove use of diff_dir_closed().

* subversion/libsvn_client/repos_diff.c (close_directory):
    Don't call the dir_closed() callback anymore.

* subversion/libsvn_wc/deprecated.c
  (dir_closed, callbacks_wrapper, callbacks2_wrapper):
    Apply removal of dir_closed() diff callback.


------------------------------------------------------------------------
r34019 | kameshj | 2008-11-03 08:33:57 +0100 (Mon, 03 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c

* subversion/libsvn_client/merge.c
  (push_range): Remove unused function since r34016.

------------------------------------------------------------------------
r34020 | julianfoad | 2008-11-03 13:32:15 +0100 (Mon, 03 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add an item to fix a temp-file bug in external diff.
------------------------------------------------------------------------
r34021 | kameshj | 2008-11-03 14:27:35 +0100 (Mon, 03 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_serf/get_deleted_rev.c

Fix ra_serf compile error of kind "error: invalid lvalue in unary `&'"
caused by "  info = &((svn_string_t *)parser->state->private);".

* subversion/libsvn_ra_serf/get_deleted_rev.c
  (push_state): Make push_state a void function. parser->state->private to
   NULL.
  (end_getdrev): Adjust for parser->state->private being NULL.
  (cdata_getdrev): Set parser->state->private directly.

------------------------------------------------------------------------
r34022 | pburba | 2008-11-03 14:44:30 +0100 (Mon, 03 Nov 2008) | 1 line
Changed paths:
   D /branches/issue-3067-deleted-subtrees

Delete issue-3067-deleted-subtrees branch, it has been merged back to trunk.
------------------------------------------------------------------------
r34023 | pburba | 2008-11-03 15:15:29 +0100 (Mon, 03 Nov 2008) | 14 lines
Changed paths:
   M /branches/reintegrate-improvements/subversion/include/private/svn_mergeinfo_private.h
   M /branches/reintegrate-improvements/subversion/libsvn_subr/mergeinfo.c

On the reintegrate-improvements branch: Add some Subversion private helpers
for creating string representations of svn_mergeinfo_t and
svn_mergeinfo_catalog_t.

* subversion/include/private/svn_mergeinfo_private.h
  (svn_mergeinfo__catalog_to_formatted_string): New.
  (svn_mergeinfo__to_formatted_string): New.

* subversion/libsvn_subr/mergeinfo.c
  (mergeinfo_to_stringbuf): Accept optional prefix arg.
  (svn_mergeinfo_to_string): Update call to mergeinfo_to_stringbuf().
  (svn_mergeinfo__catalog_to_formatted_string): New.
  (svn_mergeinfo__to_formatted_string): New.

------------------------------------------------------------------------
r34024 | pburba | 2008-11-03 15:32:12 +0100 (Mon, 03 Nov 2008) | 1 line
Changed paths:
   M /branches/reintegrate-improvements
   M /branches/reintegrate-improvements/TODO-1.6
   M /branches/reintegrate-improvements/build/generator/extractor.py
   M /branches/reintegrate-improvements/build/generator/gen_vcnet_vcproj.py
   M /branches/reintegrate-improvements/build/generator/gen_win.py
   M /branches/reintegrate-improvements/build.conf
   M /branches/reintegrate-improvements/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/reintegrate-improvements/notes/tree-conflicts/design-overview.txt
   M /branches/reintegrate-improvements/notes/tree-conflicts/requirements.txt
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/csvn/wc.py
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/setup.py
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/test/localrepos.py
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/test/remoterepos.py
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/test/run_all.py
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/test/svntypes.py
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/test/wc.py
   M /branches/reintegrate-improvements/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/reintegrate-improvements/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/reintegrate-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/reintegrate-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/reintegrate-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /branches/reintegrate-improvements/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/reintegrate-improvements/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/reintegrate-improvements/subversion/include
   M /branches/reintegrate-improvements/subversion/include/private/svn_auth_private.h
   M /branches/reintegrate-improvements/subversion/include/private/svn_cache.h
   M /branches/reintegrate-improvements/subversion/include/private/svn_sqlite.h
   M /branches/reintegrate-improvements/subversion/include/private/svn_wc_private.h
   M /branches/reintegrate-improvements/subversion/include/svn_auth.h
   M /branches/reintegrate-improvements/subversion/include/svn_checksum.h
   M /branches/reintegrate-improvements/subversion/include/svn_client.h
   M /branches/reintegrate-improvements/subversion/include/svn_cmdline.h
   M /branches/reintegrate-improvements/subversion/include/svn_config.h
   M /branches/reintegrate-improvements/subversion/include/svn_dirent_uri.h
   M /branches/reintegrate-improvements/subversion/include/svn_path.h
   M /branches/reintegrate-improvements/subversion/include/svn_props.h
   M /branches/reintegrate-improvements/subversion/include/svn_ra.h
   M /branches/reintegrate-improvements/subversion/include/svn_wc.h
   M /branches/reintegrate-improvements/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/reintegrate-improvements/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/reintegrate-improvements/subversion/libsvn_client/commit_util.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/copy.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/ctx.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/deprecated.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/diff.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/export.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/externals.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/info.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/merge.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/mergeinfo.h
   M /branches/reintegrate-improvements/subversion/libsvn_client/ra.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/repos_diff.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs/fs-loader.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs/fs-loader.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/bdb/checksum-reps-table.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/dag.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/dag.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/err.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/fs.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/fs.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/notes/structure
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/reps-strings.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/reps-strings.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/tree.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/tree.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/dag.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/dag.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/lock.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/tree.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra/compat.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra/deprecated.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra/ra_loader.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra/ra_loader.h
   M /branches/reintegrate-improvements/subversion/libsvn_ra_local/ra_plugin.c
   A /branches/reintegrate-improvements/subversion/libsvn_ra_neon/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_neon/get_deleted_rev.c:34023)
   M /branches/reintegrate-improvements/subversion/libsvn_ra_neon/log.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/reintegrate-improvements/subversion/libsvn_ra_neon/session.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_neon/util.c
   A /branches/reintegrate-improvements/subversion/libsvn_ra_serf/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_serf/get_deleted_rev.c:34023)
   M /branches/reintegrate-improvements/subversion/libsvn_ra_serf/log.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/reintegrate-improvements/subversion/libsvn_ra_serf/serf.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_serf/update.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_serf/util.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_serf/win32_auth_sspi.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_svn/client.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_svn/protocol
   M /branches/reintegrate-improvements/subversion/libsvn_repos/commit.c
   M /branches/reintegrate-improvements/subversion/libsvn_repos/hooks.c
   M /branches/reintegrate-improvements/subversion/libsvn_repos/log.c
   M /branches/reintegrate-improvements/subversion/libsvn_repos/repos.h
   M /branches/reintegrate-improvements/subversion/libsvn_subr
   M /branches/reintegrate-improvements/subversion/libsvn_subr/checksum.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/cmdline.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/config_auth.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/config_file.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/config_win.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/dirent_uri.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/dso.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/io.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/macos_keychain.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/nls.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/simple_providers.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/sqlite.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/stream.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/win32_crypto.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/adm_ops.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/deprecated.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/diff.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/lock.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/props.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/status.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/tree_conflicts.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/tree_conflicts.h
   M /branches/reintegrate-improvements/subversion/libsvn_wc/update_editor.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/util.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/wc_db.h
   M /branches/reintegrate-improvements/subversion/mod_dav_svn/dav_svn.h
   A /branches/reintegrate-improvements/subversion/mod_dav_svn/reports/deleted-rev.c (from /trunk/subversion/mod_dav_svn/reports/deleted-rev.c:34023)
   M /branches/reintegrate-improvements/subversion/mod_dav_svn/version.c
   M /branches/reintegrate-improvements/subversion/po/fr.po
   M /branches/reintegrate-improvements/subversion/svn/cl.h
   M /branches/reintegrate-improvements/subversion/svn/main.c
   M /branches/reintegrate-improvements/subversion/svn/notify.c
   M /branches/reintegrate-improvements/subversion/svn/propedit-cmd.c
   M /branches/reintegrate-improvements/subversion/svn/propget-cmd.c
   M /branches/reintegrate-improvements/subversion/svn/status-cmd.c
   M /branches/reintegrate-improvements/subversion/svn/tree-conflicts.c
   M /branches/reintegrate-improvements/subversion/svn/util.c
   M /branches/reintegrate-improvements/subversion/svndumpfilter/main.c
   M /branches/reintegrate-improvements/subversion/svnlook/main.c
   M /branches/reintegrate-improvements/subversion/svnserve/main.c
   M /branches/reintegrate-improvements/subversion/svnserve/serve.c
   M /branches/reintegrate-improvements/subversion/svnsync/main.c
   M /branches/reintegrate-improvements/subversion/tests/cmdline/autoprop_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/basic_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/checkout_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/commit_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/copy_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/diff_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/getopt_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/info_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/lock_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/log_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/merge_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/prop_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/revert_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/schedule_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/stat_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svneditor.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svnlook_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svntest/entry.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svntest/main.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svntest/testcase.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svntest/tree.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svntest/verify.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/switch_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/trans_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/reintegrate-improvements/subversion/tests/cmdline/update_tests.py
   M /branches/reintegrate-improvements/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/reintegrate-improvements/subversion/tests/libsvn_repos/repos-test.c
   M /branches/reintegrate-improvements/subversion/tests/libsvn_subr
   M /branches/reintegrate-improvements/subversion/tests/libsvn_subr/checksum-test.c
   M /branches/reintegrate-improvements/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/reintegrate-improvements/subversion/tests/libsvn_subr/path-test.c
   M /branches/reintegrate-improvements/subversion/tests/libsvn_subr/target-test.c
   M /branches/reintegrate-improvements/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/reintegrate-improvements/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/reintegrate-improvements/tools/dist/dist.sh
   M /branches/reintegrate-improvements/tools/examples/svnlook.py
   M /branches/reintegrate-improvements/tools/server-side/svn_server_log_parse.py
   M /branches/reintegrate-improvements/tools/server-side/test_svn_server_log_parse.py
   M /branches/reintegrate-improvements/win-tests.py
   M /branches/reintegrate-improvements/www/development.html
   M /branches/reintegrate-improvements/www/faq.html
   M /branches/reintegrate-improvements/www/issue-tracker.html
   M /branches/reintegrate-improvements/www/svn_1.6_releasenotes.html
   M /branches/reintegrate-improvements/www/tasks.html

On the reintegrate-improvements branch: Merge r33950-34023 from trunk.
------------------------------------------------------------------------
r34025 | cmpilato | 2008-11-03 16:25:53 +0100 (Mon, 03 Nov 2008) | 5 lines
Changed paths:
   M /trunk/www/links.html

* www/links.html: Add 'submin' link.

Patch by: Michiel Holtkamp <michiel@elfstone.nl>
(Tweaked by me.)

------------------------------------------------------------------------
r34026 | julianfoad | 2008-11-03 16:27:21 +0100 (Mon, 03 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_diff_callbacks3_t): Add a note about the call sequence of
    dir_opened().
------------------------------------------------------------------------
r34027 | hwright | 2008-11-03 16:38:23 +0100 (Mon, 03 Nov 2008) | 3 lines
Changed paths:
   M /branches/fsfs-pack
   M /branches/fsfs-pack/TODO-1.6
   M /branches/fsfs-pack/build/generator/extractor.py
   M /branches/fsfs-pack/build/generator/gen_vcnet_vcproj.py
   M /branches/fsfs-pack/build/generator/gen_win.py
   M /branches/fsfs-pack/build.conf
   M /branches/fsfs-pack/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/fsfs-pack/notes/tree-conflicts/design-overview.txt
   M /branches/fsfs-pack/notes/tree-conflicts/requirements.txt
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/csvn/wc.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/setup.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/test/localrepos.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/test/remoterepos.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/test/run_all.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/test/svntypes.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/test/wc.py
   M /branches/fsfs-pack/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/fsfs-pack/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/fsfs-pack/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/fsfs-pack/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/fsfs-pack/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /branches/fsfs-pack/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/fsfs-pack/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/fsfs-pack/subversion/include
   M /branches/fsfs-pack/subversion/include/private/svn_auth_private.h
   M /branches/fsfs-pack/subversion/include/private/svn_cache.h
   M /branches/fsfs-pack/subversion/include/private/svn_sqlite.h
   M /branches/fsfs-pack/subversion/include/private/svn_wc_private.h
   M /branches/fsfs-pack/subversion/include/svn_auth.h
   M /branches/fsfs-pack/subversion/include/svn_checksum.h
   M /branches/fsfs-pack/subversion/include/svn_client.h
   M /branches/fsfs-pack/subversion/include/svn_cmdline.h
   M /branches/fsfs-pack/subversion/include/svn_config.h
   M /branches/fsfs-pack/subversion/include/svn_dirent_uri.h
   M /branches/fsfs-pack/subversion/include/svn_path.h
   M /branches/fsfs-pack/subversion/include/svn_props.h
   M /branches/fsfs-pack/subversion/include/svn_ra.h
   M /branches/fsfs-pack/subversion/include/svn_wc.h
   M /branches/fsfs-pack/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/fsfs-pack/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/fsfs-pack/subversion/libsvn_client/commit_util.c
   M /branches/fsfs-pack/subversion/libsvn_client/copy.c
   M /branches/fsfs-pack/subversion/libsvn_client/ctx.c
   M /branches/fsfs-pack/subversion/libsvn_client/deprecated.c
   M /branches/fsfs-pack/subversion/libsvn_client/diff.c
   M /branches/fsfs-pack/subversion/libsvn_client/export.c
   M /branches/fsfs-pack/subversion/libsvn_client/externals.c
   M /branches/fsfs-pack/subversion/libsvn_client/info.c
   M /branches/fsfs-pack/subversion/libsvn_client/merge.c
   M /branches/fsfs-pack/subversion/libsvn_client/mergeinfo.h
   M /branches/fsfs-pack/subversion/libsvn_client/ra.c
   M /branches/fsfs-pack/subversion/libsvn_client/repos_diff.c
   M /branches/fsfs-pack/subversion/libsvn_fs/fs-loader.c
   M /branches/fsfs-pack/subversion/libsvn_fs/fs-loader.h
   M /branches/fsfs-pack/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/bdb/checksum-reps-table.h
   M /branches/fsfs-pack/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/dag.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/dag.h
   M /branches/fsfs-pack/subversion/libsvn_fs_base/err.h
   M /branches/fsfs-pack/subversion/libsvn_fs_base/fs.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/fs.h
   M /branches/fsfs-pack/subversion/libsvn_fs_base/notes/structure
   M /branches/fsfs-pack/subversion/libsvn_fs_base/reps-strings.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/reps-strings.h
   M /branches/fsfs-pack/subversion/libsvn_fs_base/tree.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/tree.h
   M /branches/fsfs-pack/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/dag.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/dag.h
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/lock.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/tree.c
   M /branches/fsfs-pack/subversion/libsvn_ra/compat.c
   M /branches/fsfs-pack/subversion/libsvn_ra/deprecated.c
   M /branches/fsfs-pack/subversion/libsvn_ra/ra_loader.c
   M /branches/fsfs-pack/subversion/libsvn_ra/ra_loader.h
   M /branches/fsfs-pack/subversion/libsvn_ra_local/ra_plugin.c
   A /branches/fsfs-pack/subversion/libsvn_ra_neon/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_neon/get_deleted_rev.c:34024)
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/log.c
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/session.c
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/util.c
   A /branches/fsfs-pack/subversion/libsvn_ra_serf/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_serf/get_deleted_rev.c:34024)
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/log.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/serf.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/update.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/util.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/win32_auth_sspi.c
   M /branches/fsfs-pack/subversion/libsvn_ra_svn/client.c
   M /branches/fsfs-pack/subversion/libsvn_ra_svn/protocol
   M /branches/fsfs-pack/subversion/libsvn_repos/commit.c
   M /branches/fsfs-pack/subversion/libsvn_repos/hooks.c
   M /branches/fsfs-pack/subversion/libsvn_repos/log.c
   M /branches/fsfs-pack/subversion/libsvn_repos/repos.h
   M /branches/fsfs-pack/subversion/libsvn_subr
   M /branches/fsfs-pack/subversion/libsvn_subr/checksum.c
   M /branches/fsfs-pack/subversion/libsvn_subr/cmdline.c
   M /branches/fsfs-pack/subversion/libsvn_subr/config_auth.c
   M /branches/fsfs-pack/subversion/libsvn_subr/config_file.c
   M /branches/fsfs-pack/subversion/libsvn_subr/config_win.c
   M /branches/fsfs-pack/subversion/libsvn_subr/dirent_uri.c
   M /branches/fsfs-pack/subversion/libsvn_subr/dso.c
   M /branches/fsfs-pack/subversion/libsvn_subr/io.c
   M /branches/fsfs-pack/subversion/libsvn_subr/macos_keychain.c
   M /branches/fsfs-pack/subversion/libsvn_subr/nls.c
   M /branches/fsfs-pack/subversion/libsvn_subr/simple_providers.c
   M /branches/fsfs-pack/subversion/libsvn_subr/sqlite.c
   M /branches/fsfs-pack/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/fsfs-pack/subversion/libsvn_subr/stream.c
   M /branches/fsfs-pack/subversion/libsvn_subr/win32_crypto.c
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_ops.c
   M /branches/fsfs-pack/subversion/libsvn_wc/deprecated.c
   M /branches/fsfs-pack/subversion/libsvn_wc/diff.c
   M /branches/fsfs-pack/subversion/libsvn_wc/lock.c
   M /branches/fsfs-pack/subversion/libsvn_wc/props.c
   M /branches/fsfs-pack/subversion/libsvn_wc/status.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.h
   M /branches/fsfs-pack/subversion/libsvn_wc/update_editor.c
   M /branches/fsfs-pack/subversion/libsvn_wc/util.c
   M /branches/fsfs-pack/subversion/libsvn_wc/wc_db.h
   M /branches/fsfs-pack/subversion/mod_dav_svn/dav_svn.h
   A /branches/fsfs-pack/subversion/mod_dav_svn/reports/deleted-rev.c (from /trunk/subversion/mod_dav_svn/reports/deleted-rev.c:34024)
   M /branches/fsfs-pack/subversion/mod_dav_svn/version.c
   M /branches/fsfs-pack/subversion/po/fr.po
   M /branches/fsfs-pack/subversion/svn/cl.h
   M /branches/fsfs-pack/subversion/svn/main.c
   M /branches/fsfs-pack/subversion/svn/notify.c
   M /branches/fsfs-pack/subversion/svn/propedit-cmd.c
   M /branches/fsfs-pack/subversion/svn/propget-cmd.c
   M /branches/fsfs-pack/subversion/svn/status-cmd.c
   M /branches/fsfs-pack/subversion/svn/tree-conflicts.c
   M /branches/fsfs-pack/subversion/svn/util.c
   M /branches/fsfs-pack/subversion/svndumpfilter/main.c
   M /branches/fsfs-pack/subversion/svnlook/main.c
   M /branches/fsfs-pack/subversion/svnserve/main.c
   M /branches/fsfs-pack/subversion/svnserve/serve.c
   M /branches/fsfs-pack/subversion/svnsync/main.c
   M /branches/fsfs-pack/subversion/tests/cmdline/autoprop_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/basic_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/checkout_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/commit_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/copy_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/diff_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/getopt_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/info_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/lock_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/log_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/merge_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/prop_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/revert_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/schedule_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/stat_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svneditor.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svnlook_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/actions.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/entry.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/main.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/testcase.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/tree.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/verify.py
   M /branches/fsfs-pack/subversion/tests/cmdline/switch_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/trans_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/fsfs-pack/subversion/tests/cmdline/update_tests.py
   M /branches/fsfs-pack/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_repos/repos-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/checksum-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/path-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/target-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/fsfs-pack/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/fsfs-pack/tools/dist/dist.sh
   M /branches/fsfs-pack/tools/examples/svnlook.py
   M /branches/fsfs-pack/tools/server-side/svn_server_log_parse.py
   M /branches/fsfs-pack/tools/server-side/test_svn_server_log_parse.py
   M /branches/fsfs-pack/win-tests.py
   M /branches/fsfs-pack/www/development.html
   M /branches/fsfs-pack/www/faq.html
   M /branches/fsfs-pack/www/issue-tracker.html
   M /branches/fsfs-pack/www/svn_1.6_releasenotes.html
   M /branches/fsfs-pack/www/tasks.html

On the fsfs-pack branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r34028 | julianfoad | 2008-11-03 16:45:46 +0100 (Mon, 03 Nov 2008) | 2 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_diff_callbacks3_t): Document the 'tree_conflicted' argument.
------------------------------------------------------------------------
r34029 | julianfoad | 2008-11-03 16:51:36 +0100 (Mon, 03 Nov 2008) | 2 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_diff_callbacks2_t): Update the doc string.
------------------------------------------------------------------------
r34030 | hwright | 2008-11-03 16:52:13 +0100 (Mon, 03 Nov 2008) | 19 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/EnumMapper.cpp
   M /trunk/subversion/bindings/javahl/native/Notify2.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java

JavaHL follow up to r33999: Fix the Windows buildbot, and update Java
datastructures to mirror changes to svn_wc.h.

[ in subversion/bindings/javahl/ ]
* native/EnumMapper.cpp
  (mapNotifyAction): Map the new action.

* native/Notify2.cpp
  (onNotify): Don't use a non-existant member when creating the Java object.

* src/org/tigris/subversion/javahl/NotifyAction.java
  (tree_conflict): New.
  (actionNames): Update.

* src/org/tigris/subversion/javahl/NotifyInformation.java
  (treeConflicted): Remove.
  (NotifyInformation): Update parameters.
  (getTreeConflicted): Remove.

------------------------------------------------------------------------
r34031 | julianfoad | 2008-11-03 17:11:15 +0100 (Mon, 03 Nov 2008) | 10 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.py

Remove six unimplemented tests for the handling of obstructions in tree-
conflict scenarios, because we no longer intend for obstructions to be
handled as tree conflicts.

* subversion/tests/cmdline/tree_conflict_tests.py
  (up_sw_file_mod_onto_obstr, up_sw_file_del_onto_obstr,
   up_sw_file_add_onto_obstr, up_sw_dir_mod_onto_obstr,
   up_sw_dir_del_onto_obstr, up_sw_dir_add_onto_obstr): Delete.
  (test_list): Remove the deleted tests.

------------------------------------------------------------------------
r34032 | julianfoad | 2008-11-03 18:22:11 +0100 (Mon, 03 Nov 2008) | 3 lines
Changed paths:
   M /trunk/notes/tree-conflicts/all-tests.sh

* notes/tree-conflicts/all-tests.sh
  Allow command-line parameters to be passed to the tests.

------------------------------------------------------------------------
r34033 | julianfoad | 2008-11-03 20:53:18 +0100 (Mon, 03 Nov 2008) | 3 lines
Changed paths:
   M /trunk/notes/tree-conflicts/resolution.txt

* notes/tree-conflicts/resolution.txt
  Add a note that this file reflects what I'd like, not what Subversion does.

------------------------------------------------------------------------
r34034 | pburba | 2008-11-03 22:40:28 +0100 (Mon, 03 Nov 2008) | 6 lines
Changed paths:
   M /branches/reintegrate-improvements/subversion/tests/cmdline/merge_tests.py

On the reintegrate-improvements branch: Add a new reintegrate test.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_with_subtree_mergeinfo): New
  (test_list): Add XFailing reintegrate_with_subtree_mergeinfo.

------------------------------------------------------------------------
r34035 | julianfoad | 2008-11-03 23:56:06 +0100 (Mon, 03 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/switch_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

Fix some tests failing since r33989.

* subversion/tests/cmdline/switch_tests.py
  (forced_switch_failures): Adjust for new tree conflict notifications.

* subversion/tests/cmdline/update_tests.py
  (update_delete_modified_files, update_deleted_missing_dir,
   another_hudson_problem): Adjust for new tree conflict notifications.

------------------------------------------------------------------------
r34036 | kameshj | 2008-11-04 09:35:52 +0100 (Tue, 04 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_neon/get_deleted_rev.c

* subversion/libsvn_ra_neon/get_deleted_rev.c
  (svn_ra_neon__get_deleted_rev): Remove unused variable.

------------------------------------------------------------------------
r34037 | kameshj | 2008-11-04 10:01:51 +0100 (Tue, 04 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_ra/compat.c

* subversion/libsvn_ra/compat.c
  (log_path_del_receiver): Mark it as static.

------------------------------------------------------------------------
r34038 | julianfoad | 2008-11-04 11:14:31 +0100 (Tue, 04 Nov 2008) | 13 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.py

Make some tree conflict tests more configurable and a bit more comprehensive.

* subversion/tests/cmdline/tree_conflict_tests.py
  Update some comments about what we're testing.
  (ensure_tree_conflict): Make each part of the test conditional so that we
    can configure (by editing a list) which parts will be active. This is to
    make it easier to isolate testing of one part of the behaviour. Activate
    the 'commit expects out-of-date error' and 'status after resolved' parts
    that were previously commented out. Make the 'notification' part check
    for the desired notification, instead of just any output.
  (test_list): Mark test 4 'up_sw_file_add_onto_add' as XFail, as it fails
    the new 'notification' part of the test.

------------------------------------------------------------------------
r34039 | kameshj | 2008-11-04 14:46:50 +0100 (Tue, 04 Nov 2008) | 5 lines
Changed paths:
   A /branches/issue-2897-take2/README.branch

On issue-2897-take2 branch:

* README.branch
   New file having the plan for this branch.

------------------------------------------------------------------------
r34040 | kameshj | 2008-11-04 14:55:53 +0100 (Tue, 04 Nov 2008) | 12 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.h

On issue-2897-take2 branch:

Implement 'get_commit_and_merge_ranges' using 'svn client log -g' code.

* subversion/libsvn_client/mergeinfo.h
  (svn_client__get_commit_and_merge_ranges): New Prototype.

* subversion/libsvn_client/mergeinfo.c
  (struct log_receiver_baton): New structure.
  (log_entry_receiver, get_commit_and_merge_ranges,
   svn_client__get_commit_and_merge_ranges): New function.

------------------------------------------------------------------------
r34041 | julianfoad | 2008-11-04 15:27:58 +0100 (Tue, 04 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h

Non-functional tweaks to tree conflicts code.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__read_tree_conflicts_from_entry): Remove a redundant line.
  (svn_wc__tree_conflict_exists): Rename 'victim_path' to 'victim_basename'
    for clarity.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__tree_conflict_exists): Rename 'victim_path' to 'victim_basename'
    for clarity.

------------------------------------------------------------------------
r34042 | kameshj | 2008-11-04 15:42:48 +0100 (Tue, 04 Nov 2008) | 10 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.c

On issue-2897-take2 branch:

child commit revisions numbers are always given in descending order of 
revisions by 'log -g'. Descending order of merge_ranges is not acceptable by
mergeinfo APIs so reverse them.

* subversion/libsvn_client/mergeinfo.c
  (log_entry_receiver, get_commit_and_merge_ranges):
   Reverse the last_merged_ranges_list.

------------------------------------------------------------------------
r34043 | julianfoad | 2008-11-04 17:10:00 +0100 (Tue, 04 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h

Add a private API for deleting the record of one tree conflict from the WC.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__del_tree_conflict_data, svn_wc__loggy_del_tree_conflict_data):
    New functions.
  (array_remove_unordered): New function.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__del_tree_conflict_data, svn_wc__loggy_del_tree_conflict_data):
    New functions.

------------------------------------------------------------------------
r34044 | julianfoad | 2008-11-04 17:10:48 +0100 (Tue, 04 Nov 2008) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/log.c

Don't clear the tree conflicts data in an entry in the WC when committing
that node, because that data relates to conflicts on other nodes (children).
Although we do not currently see any reason to allow this node to be
committed while a child is a victim of a tree conflict, there is no strict
requirement at the implementation level that this should be so.

* subversion/libsvn_wc/log.c
  (log_do_committed): Don't clear the entry's 'tree_conflict_data' field.
    Add comments explaining why.

------------------------------------------------------------------------
r34045 | hwright | 2008-11-04 18:12:43 +0100 (Tue, 04 Nov 2008) | 6 lines
Changed paths:
   M /branches/ignore-mergeinfo/subversion/libsvn_client/delete.c

On the ignore-mergeinfo branch:
Update caller to svn_client_status4().

* subversion/libsvn_client/delete.c
  (svn_client__can_delete): Add extra argument for svn_client_status4().

------------------------------------------------------------------------
r34046 | hwright | 2008-11-04 18:19:57 +0100 (Tue, 04 Nov 2008) | 14 lines
Changed paths:
   M /branches/ignore-mergeinfo/subversion/libsvn_client/externals.c

On the ignore-mergeinfo branch:
Pass a boolean where a boolean is requested.

Note: This isn't optimal, in that it means we recreate the ignored_props
hash when descending into externals.  But, it doesn't happen often, and the
benefit of using the public API outweighs the minor cost of recreating the
internal ignored_props hash.

* subversion/libsvn_client/externals.c
  (svn_client__do_external_status): If we have an ignored props hash, it
    must mean that we're ignoring mergeinfo, since that's the only prop
    ignore we expose externally.  Use that to correctly call the
    svn_client_status4() API.

------------------------------------------------------------------------
r34047 | hwright | 2008-11-04 18:31:56 +0100 (Tue, 04 Nov 2008) | 7 lines
Changed paths:
   M /branches/ignore-mergeinfo
   M /branches/ignore-mergeinfo/CHANGES
   M /branches/ignore-mergeinfo/COMMITTERS
   M /branches/ignore-mergeinfo/INSTALL
   M /branches/ignore-mergeinfo/Makefile.in
   A /branches/ignore-mergeinfo/TODO-1.6 (from /trunk/TODO-1.6:33900)
   M /branches/ignore-mergeinfo/build/ac-macros/sqlite.m4
   M /branches/ignore-mergeinfo/build/generator/gen_base.py
   M /branches/ignore-mergeinfo/build/generator/gen_make.py
   M /branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py
   M /branches/ignore-mergeinfo/build/generator/gen_win.py
   M /branches/ignore-mergeinfo/build/generator/neon.vcproj.ezt
   M /branches/ignore-mergeinfo/build/generator/serf.vcproj.ezt
   M /branches/ignore-mergeinfo/build/generator/svn_config.vcproj.ezt
   M /branches/ignore-mergeinfo/build/generator/svn_locale.vcproj.ezt
   M /branches/ignore-mergeinfo/build/generator/swig/header_wrappers.py
   M /branches/ignore-mergeinfo/build/generator/vc2005_sln.ezt
   M /branches/ignore-mergeinfo/build/generator/zlib.vcproj.ezt
   M /branches/ignore-mergeinfo/build/run_tests.py
   M /branches/ignore-mergeinfo/build/strip-po-charset.py
   M /branches/ignore-mergeinfo/build.conf
   M /branches/ignore-mergeinfo/configure.ac
   M /branches/ignore-mergeinfo/contrib/client-side/emacs/psvn.el
   M /branches/ignore-mergeinfo/contrib/hook-scripts/enforcer/enforcer
   M /branches/ignore-mergeinfo/gen-make.py
   M /branches/ignore-mergeinfo/notes/http-protocol-v2.txt
   M /branches/ignore-mergeinfo/notes/l10n-problems
   A /branches/ignore-mergeinfo/notes/tree-conflicts/all-tests.sh (from /trunk/notes/tree-conflicts/all-tests.sh:33900)
   M /branches/ignore-mergeinfo/notes/tree-conflicts/design-overview.txt
   M /branches/ignore-mergeinfo/notes/tree-conflicts/requirements.txt
   M /branches/ignore-mergeinfo/notes/wc-ng-design
   M /branches/ignore-mergeinfo/packages/windows-WiX/BuildSubversion/Bitmaps/svn_bck.png
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/TODO
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/wc.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/example.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/log.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/setup.py
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.h
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/InfoCallback.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.h
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
   M /branches/ignore-mergeinfo/subversion/bindings/swig/core.i
   M /branches/ignore-mergeinfo/subversion/bindings/swig/include/svn_global.swg
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/svn/core.py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/auth.py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/ignore-mergeinfo/subversion/bindings/swig/ruby/svn/commit-mailer.rb
   M /branches/ignore-mergeinfo/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/ignore-mergeinfo/subversion/bindings/swig/svn_client.i
   M /branches/ignore-mergeinfo/subversion/include
   M /branches/ignore-mergeinfo/subversion/include/private/svn_auth_private.h
   A /branches/ignore-mergeinfo/subversion/include/private/svn_cache.h (from /trunk/subversion/include/private/svn_cache.h:33900)
   M /branches/ignore-mergeinfo/subversion/include/private/svn_dep_compat.h
   M /branches/ignore-mergeinfo/subversion/include/svn_auth.h
   D /branches/ignore-mergeinfo/subversion/include/svn_cache.h
   M /branches/ignore-mergeinfo/subversion/include/svn_client.h
   M /branches/ignore-mergeinfo/subversion/include/svn_delta.h
   M /branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h
   M /branches/ignore-mergeinfo/subversion/include/svn_error.h
   M /branches/ignore-mergeinfo/subversion/include/svn_error_codes.h
   M /branches/ignore-mergeinfo/subversion/include/svn_fs.h
   M /branches/ignore-mergeinfo/subversion/include/svn_io.h
   M /branches/ignore-mergeinfo/subversion/include/svn_path.h
   M /branches/ignore-mergeinfo/subversion/include/svn_time.h
   M /branches/ignore-mergeinfo/subversion/include/svn_utf.h
   M /branches/ignore-mergeinfo/subversion/include/svn_wc.h
   M /branches/ignore-mergeinfo/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/ignore-mergeinfo/subversion/libsvn_client/add.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/cat.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/changelist.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/checkout.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/cleanup.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/commit.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/commit_util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/copy.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/delete.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/diff.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/export.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/externals.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/info.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/locking_commands.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/merge.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/mergeinfo.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/prop_commands.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/ra.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/relocate.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/resolved.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/revert.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/revisions.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/status.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/switch.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/update.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/url.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_delta/text_delta.c
   A /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.c (from /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.c:33900)
   A /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.h (from /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.h:33900)
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.h
   D /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/metadata-table.c
   D /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/metadata-table.h
   A /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/miscellaneous-table.c (from /trunk/subversion/libsvn_fs_base/bdb/miscellaneous-table.c:33900)
   A /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/miscellaneous-table.h (from /trunk/subversion/libsvn_fs_base/bdb/miscellaneous-table.h:33900)
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/dag.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/dag.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/err.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/err.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fs.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fs.h
   A /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fsguid.c (from /trunk/subversion/libsvn_fs_base/fsguid.c:33900)
   A /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fsguid.h (from /trunk/subversion/libsvn_fs_base/fsguid.h:33900)
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/key-gen.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/notes/structure
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/reps-strings.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/tree.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/tree.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/caching.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/dag.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.h
   A /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/rep-cache.c (from /trunk/subversion/libsvn_fs_fs/rep-cache.c:33900)
   A /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/rep-cache.h (from /trunk/subversion/libsvn_fs_fs/rep-cache.h:33900)
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/tree.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra/ra_loader.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_local/ra_plugin.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/blame.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/commit.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getdate.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocations.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocationsegments.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocks.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/locks.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/merge.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/mergeinfo.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/options.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/replay.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/update.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/xml.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_svn/internal_auth.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_svn/ra_svn.h
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/auth.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/cache-inprocess.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/cache-memcache.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/cache.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/cache.h
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/dso.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/genctype.py
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/io.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/path.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/simple_providers.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/sqlite.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/stream.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/subst.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/time.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/utf.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_crawler.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_ops.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/copy.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/entries.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/lock.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/lock.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/log.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/merge.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/props.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/props.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/questions.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/revision_status.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/status.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/update_editor.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/ignore-mergeinfo/subversion/po/de.po
   M /branches/ignore-mergeinfo/subversion/po/fr.po
   M /branches/ignore-mergeinfo/subversion/po/pl.po
   M /branches/ignore-mergeinfo/subversion/svn/cl.h
   M /branches/ignore-mergeinfo/subversion/svn/commit-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/copy-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/delete-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/diff-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/import-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/info-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/main.c
   M /branches/ignore-mergeinfo/subversion/svn/mkdir-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/move-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/notify.c
   M /branches/ignore-mergeinfo/subversion/svn/propedit-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/schema/info.rnc
   M /branches/ignore-mergeinfo/subversion/svn/schema/status.rnc
   M /branches/ignore-mergeinfo/subversion/svn/status.c
   M /branches/ignore-mergeinfo/subversion/svn/tree-conflicts.c
   M /branches/ignore-mergeinfo/subversion/svn/util.c
   M /branches/ignore-mergeinfo/subversion/svn_private_config.hw
   M /branches/ignore-mergeinfo/subversion/svnlook/main.c
   M /branches/ignore-mergeinfo/subversion/svnserve/main.c
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/changelist_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/checkout_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/copy_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/getopt_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/import_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/info_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/log_tests.py
   A /branches/ignore-mergeinfo/subversion/tests/cmdline/log_tests_data/merge_history_repo.png (from /trunk/subversion/tests/cmdline/log_tests_data/merge_history_repo.png:33900)
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/merge_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/special_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/stat_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/actions.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/main.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/tree.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/verify.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/wc.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/switch_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/update_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_delta
   A /branches/ignore-mergeinfo/subversion/tests/libsvn_delta/window-test.c (from /trunk/subversion/tests/libsvn_delta/window-test.c:33900)
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_repos/repos-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/cache-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/ignore-mergeinfo/tools/bdb/skel.py
   D /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp VS2005
   A /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005 (from /trunk/tools/buildbot/slaves/win32-xp-VS2005:33900)
   R /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/config.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/config.bat:33900)
   R /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat:33900)
   R /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat:33900)
   R /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat:33900)
   R /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat:33900)
   R /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat:33900)
   M /branches/ignore-mergeinfo/tools/client-side/change-svn-wc-format.py
   M /branches/ignore-mergeinfo/tools/dev/contribulyze.py
   M /branches/ignore-mergeinfo/tools/dev/graph-dav-servers.py
   M /branches/ignore-mergeinfo/tools/dev/iz/find-fix.py
   M /branches/ignore-mergeinfo/tools/dev/svn-merge-revs.py
   M /branches/ignore-mergeinfo/tools/dist/construct-rolling-environment.sh
   M /branches/ignore-mergeinfo/tools/dist/post-to-tigris.py
   M /branches/ignore-mergeinfo/tools/dist/write-announcement.py
   M /branches/ignore-mergeinfo/tools/examples/revplist.py
   M /branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py
   M /branches/ignore-mergeinfo/tools/server-side/svn_server_log_parse.py
   M /branches/ignore-mergeinfo/tools/server-side/test_svn_server_log_parse.py
   M /branches/ignore-mergeinfo/win-tests.py
   M /branches/ignore-mergeinfo/www/commercial-support.html
   M /branches/ignore-mergeinfo/www/development.html
   M /branches/ignore-mergeinfo/www/faq.html
   M /branches/ignore-mergeinfo/www/getting.html
   M /branches/ignore-mergeinfo/www/hacking.html
   M /branches/ignore-mergeinfo/www/images/svn-dav-securityspace-survey.png
   M /branches/ignore-mergeinfo/www/index.html
   M /branches/ignore-mergeinfo/www/issue-tracker.html
   M /branches/ignore-mergeinfo/www/release-history.html
   M /branches/ignore-mergeinfo/www/roadmap.html
   M /branches/ignore-mergeinfo/www/svn-dav-securityspace-survey.html
   M /branches/ignore-mergeinfo/www/svn_1.6_releasenotes.html
   M /branches/ignore-mergeinfo/www/tasks.html

On the ignore-mergeinfo branch:
Bring up-to-date with trunk at r33900.

Due to some funniness with tree conflicts and merge, I had to manually remove
subversion/libsvn_fs/base/metadata-table.[ch], which wasn't removed as part of
the merge.

------------------------------------------------------------------------
r34048 | hwright | 2008-11-04 18:56:31 +0100 (Tue, 04 Nov 2008) | 3 lines
Changed paths:
   M /branches/ignore-mergeinfo
   M /branches/ignore-mergeinfo/TODO-1.6
   M /branches/ignore-mergeinfo/build/generator/extractor.py
   M /branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py
   M /branches/ignore-mergeinfo/build/generator/gen_win.py
   M /branches/ignore-mergeinfo/build.conf
   M /branches/ignore-mergeinfo/configure.ac
   M /branches/ignore-mergeinfo/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/ignore-mergeinfo/notes/tree-conflicts/all-tests.sh
   M /branches/ignore-mergeinfo/notes/tree-conflicts/design-overview.txt
   M /branches/ignore-mergeinfo/notes/tree-conflicts/requirements.txt
   M /branches/ignore-mergeinfo/notes/tree-conflicts/resolution.txt
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/wc.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/setup.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/localrepos.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/remoterepos.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/run_all.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/svntypes.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/wc.py
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/EnumMapper.h
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   A /branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java:34047)
   M /branches/ignore-mergeinfo/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/ignore-mergeinfo/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/ignore-mergeinfo/subversion/include
   M /branches/ignore-mergeinfo/subversion/include/private/svn_auth_private.h
   M /branches/ignore-mergeinfo/subversion/include/private/svn_cache.h
   M /branches/ignore-mergeinfo/subversion/include/private/svn_sqlite.h
   M /branches/ignore-mergeinfo/subversion/include/private/svn_wc_private.h
   M /branches/ignore-mergeinfo/subversion/include/svn_auth.h
   M /branches/ignore-mergeinfo/subversion/include/svn_checksum.h
   M /branches/ignore-mergeinfo/subversion/include/svn_client.h
   M /branches/ignore-mergeinfo/subversion/include/svn_cmdline.h
   M /branches/ignore-mergeinfo/subversion/include/svn_config.h
   M /branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h
   M /branches/ignore-mergeinfo/subversion/include/svn_fs.h
   M /branches/ignore-mergeinfo/subversion/include/svn_path.h
   M /branches/ignore-mergeinfo/subversion/include/svn_props.h
   M /branches/ignore-mergeinfo/subversion/include/svn_ra.h
   M /branches/ignore-mergeinfo/subversion/include/svn_wc.h
   M /branches/ignore-mergeinfo/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/ignore-mergeinfo/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/ignore-mergeinfo/subversion/libsvn_client/add.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/blame.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/commit.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/commit_util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/copy.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/ctx.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/delete.c
   A /branches/ignore-mergeinfo/subversion/libsvn_client/deprecated.c (from /trunk/subversion/libsvn_client/deprecated.c:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_client/diff.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/export.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/externals.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/info.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/list.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/merge.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/mergeinfo.h
   M /branches/ignore-mergeinfo/subversion/libsvn_client/prop_commands.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/ra.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/repos_diff.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/status.c
   A /branches/ignore-mergeinfo/subversion/libsvn_diff/deprecated.c (from /trunk/subversion/libsvn_diff/deprecated.c:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_diff/diff_file.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/checksum-reps-table.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/node-origins-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/dag.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/dag.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/err.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fs.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fs.h
   D /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fsguid.c
   D /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fsguid.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/notes/structure
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/reps-strings.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/reps-strings.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/tree.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/tree.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/dag.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/dag.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/lock.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/tree.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra/compat.c
   A /branches/ignore-mergeinfo/subversion/libsvn_ra/deprecated.c (from /trunk/subversion/libsvn_ra/deprecated.c:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_ra/ra_loader.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra/ra_loader.h
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_local/ra_plugin.c
   A /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_neon/get_deleted_rev.c:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/session.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/util.c
   A /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_serf/get_deleted_rev.c:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/serf.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/update.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/win32_auth_sspi.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_svn/protocol
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/commit.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/delta.c
   A /branches/ignore-mergeinfo/subversion/libsvn_repos/deprecated.c (from /trunk/subversion/libsvn_repos/deprecated.c:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/fs-wrap.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/hooks.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/load.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/replay.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/reporter.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/repos.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/repos.h
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/rev_hunt.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/checksum.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/cmdline.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/config_auth.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/config_file.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/config_win.c
   A /branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c (from /trunk/subversion/libsvn_subr/deprecated.c:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/dso.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/io.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/macos_keychain.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/nls.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/opt.c
   A /branches/ignore-mergeinfo/subversion/libsvn_subr/opt.h (from /trunk/subversion/libsvn_subr/opt.h:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/simple_providers.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/sqlite.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/stream.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/subst.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/win32_crypto.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_crawler.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_ops.c
   A /branches/ignore-mergeinfo/subversion/libsvn_wc/deprecated.c (from /trunk/subversion/libsvn_wc/deprecated.c:34047)
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/diff.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/entries.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/lock.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/props.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/questions.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/status.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/update_editor.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db.h
   M /branches/ignore-mergeinfo/subversion/mod_dav_svn/dav_svn.h
   A /branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/deleted-rev.c (from /trunk/subversion/mod_dav_svn/reports/deleted-rev.c:34047)
   M /branches/ignore-mergeinfo/subversion/mod_dav_svn/version.c
   M /branches/ignore-mergeinfo/subversion/po/fr.po
   M /branches/ignore-mergeinfo/subversion/svn/cl.h
   M /branches/ignore-mergeinfo/subversion/svn/main.c
   M /branches/ignore-mergeinfo/subversion/svn/notify.c
   M /branches/ignore-mergeinfo/subversion/svn/propedit-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/propget-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/status-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/tree-conflicts.c
   M /branches/ignore-mergeinfo/subversion/svn/util.c
   M /branches/ignore-mergeinfo/subversion/svnadmin/main.c
   M /branches/ignore-mergeinfo/subversion/svndumpfilter/main.c
   M /branches/ignore-mergeinfo/subversion/svnlook/main.c
   M /branches/ignore-mergeinfo/subversion/svnserve/main.c
   M /branches/ignore-mergeinfo/subversion/svnserve/serve.c
   M /branches/ignore-mergeinfo/subversion/svnsync/main.c
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/autoprop_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/basic_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/checkout_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/commit_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/copy_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/getopt_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/info_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/lock_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/log_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/merge_authz_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/merge_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/prop_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/revert_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/schedule_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/stat_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svneditor.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnlook_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/actions.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/entry.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/main.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/testcase.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/tree.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/verify.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/switch_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/trans_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/update_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_repos/repos-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/checksum-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/path-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/target-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/ignore-mergeinfo/tools/dist/dist.sh
   M /branches/ignore-mergeinfo/tools/examples/svnlook.py
   M /branches/ignore-mergeinfo/tools/server-side/svn_server_log_parse.py
   M /branches/ignore-mergeinfo/tools/server-side/test_svn_server_log_parse.py
   M /branches/ignore-mergeinfo/win-tests.py
   M /branches/ignore-mergeinfo/www/development.html
   M /branches/ignore-mergeinfo/www/faq.html
   M /branches/ignore-mergeinfo/www/issue-tracker.html
   M /branches/ignore-mergeinfo/www/links.html
   M /branches/ignore-mergeinfo/www/svn_1.6_releasenotes.html
   M /branches/ignore-mergeinfo/www/tasks.html

On the ignore-mergeinfo branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r34049 | julianfoad | 2008-11-04 19:39:05 +0100 (Tue, 04 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Fix a failing test: merge_tests 3.

* subversion/tests/cmdline/merge_tests.py
  (delete_file_and_dir): Remove the last part of this test, where it was
    trying to get a merge to delete modified nodes, because we no longer
    want such deletes to go ahead silently and there are separate tests in
    in the realm of tree conflicts to cover this.

------------------------------------------------------------------------
r34050 | cmpilato | 2008-11-04 21:31:28 +0100 (Tue, 04 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Add XFAILing regression test for not-yet-fixed bug: files added via merge
from a foreign repository shouldn't keep the UUID of the foreign repository.

* subversion/tests/cmdline/merge_tests.py
  (foreign_repos_uuid): New test.
  (test_list): Add reference to new test.

Patch by: jszakmeister
(Tweaked by me.)
------------------------------------------------------------------------
r34051 | cmpilato | 2008-11-04 21:33:07 +0100 (Tue, 04 Nov 2008) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/tests/cmdline/merge_tests.py

Don't inherit the UUID of a foreign repository when merging additions
from such.

* subversion/libsvn_client/merge.c
  (merge_file_added): Only allow regular props when merging from a
    foreign repository.
 
* subversion/tests/cmdline/merge_tests.py
  (test_list): No longer expect foreign_repos_uuid() test to fail.

------------------------------------------------------------------------
r34052 | cmpilato | 2008-11-04 21:39:40 +0100 (Tue, 04 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Recommend r34050-51 for backport (and fix indentation of another grouping).
------------------------------------------------------------------------
r34053 | cmpilato | 2008-11-04 22:10:08 +0100 (Tue, 04 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

* subversion/tests/cmdline/merge_tests.py
  (foreign_repos_uuid): Expand test to cover a directory case, too.

------------------------------------------------------------------------
r34054 | cmpilato | 2008-11-04 22:12:40 +0100 (Tue, 04 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Add r34053 to the r34050 group.
------------------------------------------------------------------------
r34055 | danielsh | 2008-11-04 22:21:49 +0100 (Tue, 04 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Vote for the r34050 group.
------------------------------------------------------------------------
r34056 | julianfoad | 2008-11-05 00:47:45 +0100 (Wed, 05 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_ops.c

* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_entry): Note that this function should be loggy.

------------------------------------------------------------------------
r34057 | julianfoad | 2008-11-05 01:12:43 +0100 (Wed, 05 Nov 2008) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/tests/cmdline/revert_tests.py

Make "revert" handle tree conflicts per victim rather than per parent.

* subversion/libsvn_wc/adm_ops.c
  (revert_admin_things): Do not clear tree conflicts recorded in this entry.
  (revert_entry): Do not send a notification, but instead report (through a
    new boolean output parameter) whether something was reverted.
  (revert_internal): Allow an unversioned item (with no entry) to be
    processed, if it is a tree conflict victim. Clear any tree conflict for
    this victim. Send a notification if either a tree conflict or any other
    state was reverted. Recurse into unversioned tree conflict victims as
    well as all versioned children.

* subversion/tests/cmdline/revert_tests.py
  (revert_tree_conflicts_in_updated_file): Adjust for per-victim reverting.

------------------------------------------------------------------------
r34058 | pburba | 2008-11-05 01:56:24 +0100 (Wed, 05 Nov 2008) | 33 lines
Changed paths:
   M /branches/reintegrate-improvements/subversion/libsvn_client/merge.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/mergeinfo.c
   M /branches/reintegrate-improvements/subversion/tests/cmdline/merge_tests.py

On the reintegrate-improvements branch: Make reintegrate merges tolerate
subtree mergeinfo on the source as long as it indicates the same ranges were
previously merged from the target to the source across the entire source 
tree.

* subversion/libsvn_client/merge.c
  (remove_irrelevant_ranges): Provide a more thorough doc string. Handle as
  hash of segment arrays for each subtree rather than a single array for the
  root only.
  (calculate_left_hand_side): Clear an old TODO(reint) and add a doc string.
  Consider *all* the subtrees with mergeinfo in the target.  If subtree
  mergeinfo is thwarting reintegrate then provide a more detailed error
  message spelling out which subtrees are the problem.
  (subtree_mergeinfo_walk_baton): New baton for 
  get_subtree_mergeinfo_walk_cb.
  (get_subtree_mergeinfo_walk_cb): New svn_wc_entry_callbacks2_t found_entry
  callback.
  (svn_client_merge_reintegrate): Walk the reintegrate target to find all
  subtrees with explicit mergeinfo and pass that to
  calculate_left_hand_side() as a hash.

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo_intersect): This API promises a deep copy, but did so only
  for the rangelists, not the mergeinfo path keys.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_with_subtree_mergeinfo): Expand this test to check that the
  new and improved error message identifies the specific subtrees with
  mergeinfo that are stopping reintegrate from working.
  (reintegrate_with_rename,
  reintegrate_branch_never_merged_to,
  reintegrate_with_subtree_mergeinfo): Remove XFails.

------------------------------------------------------------------------
r34059 | pburba | 2008-11-05 02:15:02 +0100 (Wed, 05 Nov 2008) | 1 line
Changed paths:
   M /branches/reintegrate-improvements
   M /branches/reintegrate-improvements/build.conf
   M /branches/reintegrate-improvements/notes/tree-conflicts/all-tests.sh
   M /branches/reintegrate-improvements/notes/tree-conflicts/design-overview.txt
   M /branches/reintegrate-improvements/notes/tree-conflicts/requirements.txt
   M /branches/reintegrate-improvements/notes/tree-conflicts/resolution.txt
   M /branches/reintegrate-improvements/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/reintegrate-improvements/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/reintegrate-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/reintegrate-improvements/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/reintegrate-improvements/subversion/include
   M /branches/reintegrate-improvements/subversion/include/private/svn_auth_private.h
   M /branches/reintegrate-improvements/subversion/include/svn_wc.h
   M /branches/reintegrate-improvements/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/reintegrate-improvements/subversion/libsvn_client/merge.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra/compat.c
   M /branches/reintegrate-improvements/subversion/libsvn_ra_neon/get_deleted_rev.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr
   M /branches/reintegrate-improvements/subversion/libsvn_wc/adm_ops.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/log.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/tree_conflicts.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/tree_conflicts.h
   M /branches/reintegrate-improvements/subversion/tests/cmdline/merge_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/revert_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/switch_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/update_tests.py
   M /branches/reintegrate-improvements/subversion/tests/libsvn_subr
   M /branches/reintegrate-improvements/tools/server-side/svn_server_log_parse.py
   M /branches/reintegrate-improvements/tools/server-side/test_svn_server_log_parse.py
   M /branches/reintegrate-improvements/www/development.html
   M /branches/reintegrate-improvements/www/issue-tracker.html
   M /branches/reintegrate-improvements/www/links.html
   M /branches/reintegrate-improvements/www/tasks.html

On the reintegrate-improvements branch: Merge r34024-34058 from trunk.
------------------------------------------------------------------------
r34060 | neels | 2008-11-05 03:20:59 +0100 (Wed, 05 Nov 2008) | 28 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/tests/cmdline/merge_tests.py

Fix default return values for *TREE_CONFLICTED in the merge callbacks.
Partly fix merge_props_changed() w.r.t. tree-conflicts.

* subversion/libsvn_client/merge.c
  (merge_props_changed):
    Set *TREE_CONFLICTED to FALSE by default (was missing). Report one
    new tree-conflict. Add a TODO comment to detect other tree-conflicts.
  (merge_file_changed):
    Properly propagate possible tree-conflicts from merge_props_changed().
  (merge_file_deleted):
    Set *TREE_CONFLICTED to FALSE by default (was missing).
  (merge_dir_added): Set the default of *TREE_CONFLICTED at the top (moved).
  (merge_dir_deleted):
    Set the default of *TREE_CONFLICTED at the top (moved), and set to
    FALSE instead of TRUE. This removes loads of false conflicts, on
    directories that are to be deleted on a merge.

* subversion/tests/cmdline/merge_tests.py
  (delete_file_and_dir, tree_conflicts_on_merge_local_ci_5_1,
   tree_conflicts_on_merge_local_ci_5_2,
   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_5_1,
   tree_conflicts_on_merge_no_local_ci_5_2):
    Fix up some tests, in essence undoing previous fix ups that made the tests
    look better than they deserved.


------------------------------------------------------------------------
r34061 | neels | 2008-11-05 05:06:38 +0100 (Wed, 05 Nov 2008) | 14 lines
Changed paths:
   M /trunk/subversion/libsvn_client/repos_diff.c
   M /trunk/subversion/tests/cmdline/merge_tests.py

A tree-conflict notification fix.

* subversion/libsvn_client/repos_diff.c
  (close_directory): Don't let prop changes on tree-conflicted directories
    overwrite the tree-conflicted flag, thus don't omit notification.
  (close_file): Remove misleading check of tree-conflicts flag when notifying
    about a skip due to lock failure. Tree-conflict detection comes only
    after this notification.

* subversion/tests/cmdline/merge_tests.py
  (tree_conflicts_on_merge_no_local_ci_4_1,
   tree_conflicts_on_merge_no_local_ci_4_2): Apply fix in expected output.


------------------------------------------------------------------------
r34062 | cauchy | 2008-11-05 12:04:25 +0100 (Wed, 05 Nov 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.

------------------------------------------------------------------------
r34063 | julianfoad | 2008-11-05 12:08:40 +0100 (Wed, 05 Nov 2008) | 10 lines
Changed paths:
   M /trunk/subversion/include/svn_xml.h
   M /trunk/subversion/libsvn_subr/xml.c

Make svn_xml doc strings consistent in their description of how they append
the result to a stringbuf or allocate a new one.

* subversion/include/svn_xml.h
  (svn_xml_escape_cdata_stringbuf, svn_xml_escape_attr_stringbuf,
   svn_xml_make_open_tag, svn_xml_make_close_tag): Tweak doc strings.

* subversion/libsvn_subr/xml.c
  (xml_escape_cdata): Add a (partial) doc string.

------------------------------------------------------------------------
r34064 | julianfoad | 2008-11-05 12:38:08 +0100 (Wed, 05 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/log.h

* subversion/libsvn_wc/log.h
  Add a note about how stringbuf output parameters are handled by all
  of the loggy functions.

------------------------------------------------------------------------
r34065 | danielsh | 2008-11-05 12:58:58 +0100 (Wed, 05 Nov 2008) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/log.h

* subversion/libsvn_wc/log.h:
  Tweak doc string for readability, and fix typo.
------------------------------------------------------------------------
r34066 | julianfoad | 2008-11-05 13:17:08 +0100 (Wed, 05 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/tree_conflicts.c

* subversion/libsvn_wc/tree_conflicts.c
  (array_remove_unordered): Improve documentation, removing a bogus claim.

------------------------------------------------------------------------
r34067 | julianfoad | 2008-11-05 13:20:58 +0100 (Wed, 05 Nov 2008) | 41 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h
   M /trunk/subversion/libsvn_wc/update_editor.c

Make the tree conflicts WC API more consistent.
  - When appending log commands to a stringbug, take a pointer-to-pointer
    and allocate a new buffer if required, like other loggy functions do.
  - Remove the suffix "_data" from the function names.

* subversion/include/svn_wc.h
  (svn_wc_add_tree_conflict_data): Rename to ...
  (svn_wc_add_tree_conflict): ... this, and improve the doc string.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__del_tree_conflict_data): Rename to ...
  (svn_wc__del_tree_conflict): ... this.
  (svn_wc__loggy_del_tree_conflict_data): Rename to ...
  (svn_wc__loggy_del_tree_conflict): ... this, and add a level of indirection
    to the stringbuf output parameter.
  (svn_wc__loggy_add_tree_conflict_data): Rename to ...
  (svn_wc__loggy_add_tree_conflict): ... this, and add a level of indirection
    to the stringbuf output parameter.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__del_tree_conflict_data): Rename to ...
  (svn_wc__del_tree_conflict): ... this, and adjust for the other changes.
  (svn_wc_add_tree_conflict_data): Rename to ...
  (svn_wc_add_tree_conflict): ... this, and adjust for the other changes.
  (svn_wc__loggy_del_tree_conflict_data): Rename to ...
  (svn_wc__loggy_del_tree_conflict): ... this, and add a level of indirection
    to the stringbuf output parameter.
  (svn_wc__loggy_add_tree_conflict_data): Rename to ...
  (svn_wc__loggy_add_tree_conflict): ... this, and add a level of indirection
    to the stringbuf output parameter.

* subversion/libsvn_client/merge.c
  (tree_conflict): Adjust calls accordingly.

* subversion/libsvn_wc/adm_ops.c
  (revert_internal): Adjust calls accordingly.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Adjust calls accordingly.
  (add_file): Adjust commented-out code accordingly.

------------------------------------------------------------------------
r34068 | cauchy | 2008-11-05 14:41:54 +0100 (Wed, 05 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/po/zh_CN.po

Simplified chinese translation update.

* subversion/po/zh_CN.po: Update to r34061, translate some new strings.

------------------------------------------------------------------------
r34069 | sbutler | 2008-11-05 15:43:55 +0100 (Wed, 05 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/info_tests.py

Add a recursion scenario to the 'svn info' tree conflict tests.  Fails
because my hack for info on nonexistent victims doesn't work for the
recursive case.  The recursion finds only victims that have entries.

* subversion/tests/cmdline/info_tests.py
  (info_with_tree_conflicts): Check that '-R' finds all victims.
  (test_list): Set XFail() on info_with_tree_conflicts.

------------------------------------------------------------------------
r34070 | sussman | 2008-11-05 17:56:16 +0100 (Wed, 05 Nov 2008) | 13 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/repos.c

Add mod_dav_svn support for a 'public' rev-path query syntax:

  /repos/file?r=REV
  /repos/dir/?r=REV

Note the trailing slash on the directory;  that's a webdav requirement
we've been enforcing for years (via 301 redirects.)

* subversion/mod_dav_svn/repos.c (get_resource): look for a query
  string on REGULAR public URIs;  if parseable, treat resource just
  like a baseline collection.


------------------------------------------------------------------------
r34071 | sbutler | 2008-11-06 12:14:03 +0100 (Thu, 06 Nov 2008) | 33 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/commit_tests.py
   M /trunk/subversion/tests/cmdline/merge_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

Make tree conflict tests check unversioned/nonexistent victims by default
in the verify-status step.

* subversion/tests/cmdline/svntest/actions.py
  (deep_trees_run_tests_scheme_for_update,
   deep_trees_run_tests_scheme_for_switch,
   deep_trees_run_tests_scheme_for_merge): Verify operation with
   "unquiet" status check.

* subversion/tests/cmdline/switch_tests.py
  (tree_conflicts_on_switch_1_2,
   tree_conflicts_on_switch_2_1,
   tree_conflicts_on_switch_2_2,
   tree_conflicts_on_switch_3): Put unversioned/nonexistent victims
   in expected_status.

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_1_2,
   tree_conflicts_on_update_2_1,
   tree_conflicts_on_update_2_2,
   tree_conflicts_on_update_3): Put unversioned/nonexistent victims
   in expected_status.

* subversion/tests/cmdline/merge_tests.py
  (tree_conflicts_on_merge_local_ci_4_1,
   tree_conflicts_on_merge_local_ci_4_2,
   tree_conflicts_on_merge_local_ci_5_2,
   tree_conflicts_on_merge_local_ci_6): Put unversioned/nonexistent
   victims in expected_status.

* subversion/tests/cmdline/commit_tests.py
  (test_list): Accidental change reverted in r34073.

------------------------------------------------------------------------
r34072 | kameshj | 2008-11-06 12:45:15 +0100 (Thu, 06 Nov 2008) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/CHANGES
   M /branches/issue-2897-take2/Makefile.in
   M /branches/issue-2897-take2/aclocal.m4
   M /branches/issue-2897-take2/build/ac-macros/aprutil.m4
   A /branches/issue-2897-take2/build/ac-macros/ctypesgen.m4 (from /trunk/build/ac-macros/ctypesgen.m4:33535)
   M /branches/issue-2897-take2/build/ac-macros/neon.m4
   M /branches/issue-2897-take2/build/ac-macros/sqlite.m4
   M /branches/issue-2897-take2/build/generator/extractor.py
   M /branches/issue-2897-take2/build/generator/ezt.py
   M /branches/issue-2897-take2/build/generator/gen_base.py
   M /branches/issue-2897-take2/build/generator/gen_make.py
   M /branches/issue-2897-take2/build/generator/gen_msvc_dsp.py
   M /branches/issue-2897-take2/build/generator/gen_vcnet_vcproj.py
   M /branches/issue-2897-take2/build/generator/gen_win.py
   M /branches/issue-2897-take2/build/generator/neon.vcproj.ezt
   M /branches/issue-2897-take2/build/generator/serf.vcproj.ezt
   M /branches/issue-2897-take2/build/generator/svn_config.vcproj.ezt
   M /branches/issue-2897-take2/build/generator/svn_locale.vcproj.ezt
   M /branches/issue-2897-take2/build/generator/swig/__init__.py
   M /branches/issue-2897-take2/build/generator/swig/checkout_swig_header.py
   M /branches/issue-2897-take2/build/generator/swig/external_runtime.py
   M /branches/issue-2897-take2/build/generator/swig/header_wrappers.py
   M /branches/issue-2897-take2/build/generator/util/executable.py
   M /branches/issue-2897-take2/build/generator/vc2005_sln.ezt
   M /branches/issue-2897-take2/build/generator/vcnet_vcproj.ezt
   M /branches/issue-2897-take2/build/generator/zlib.vcproj.ezt
   M /branches/issue-2897-take2/build/get-py-info.py
   M /branches/issue-2897-take2/build/getversion.py
   M /branches/issue-2897-take2/build/run_tests.py
   M /branches/issue-2897-take2/build/strip-po-charset.py
   M /branches/issue-2897-take2/build/win32/make_dist.py
   M /branches/issue-2897-take2/build/win32/svn.rc
   M /branches/issue-2897-take2/build.conf
   M /branches/issue-2897-take2/configure.ac
   M /branches/issue-2897-take2/contrib/client-side/emacs/psvn.el
   M /branches/issue-2897-take2/gen-make.py
   A /branches/issue-2897-take2/notes/http-protocol-v2.txt (from /trunk/notes/http-protocol-v2.txt:33535)
   M /branches/issue-2897-take2/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2897-take2/notes/tree-conflicts/detection.txt
   M /branches/issue-2897-take2/notes/tree-conflicts/requirements.txt
   M /branches/issue-2897-take2/notes/wc-ng-design
   A /branches/issue-2897-take2/subversion/bindings/ctypes-python (from /trunk/subversion/bindings/ctypes-python:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/README (from /trunk/subversion/bindings/ctypes-python/README:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/TODO (from /trunk/subversion/bindings/ctypes-python/TODO:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn (from /trunk/subversion/bindings/ctypes-python/csvn:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/__init__.py (from /trunk/subversion/bindings/ctypes-python/csvn/__init__.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/auth.py (from /trunk/subversion/bindings/ctypes-python/csvn/auth.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/core (from /trunk/subversion/bindings/ctypes-python/csvn/core:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/core/__init__.py (from /trunk/subversion/bindings/ctypes-python/csvn/core/__init__.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/core/functions.py.in (from /trunk/subversion/bindings/ctypes-python/csvn/core/functions.py.in:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/ext (from /trunk/subversion/bindings/ctypes-python/csvn/ext:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/ext/__init__.py (from /trunk/subversion/bindings/ctypes-python/csvn/ext/__init__.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py (from /trunk/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/ext/listmixin.py (from /trunk/subversion/bindings/ctypes-python/csvn/ext/listmixin.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/repos.py (from /trunk/subversion/bindings/ctypes-python/csvn/repos.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/txn.py (from /trunk/subversion/bindings/ctypes-python/csvn/txn.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/types.py (from /trunk/subversion/bindings/ctypes-python/csvn/types.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/wc.py (from /trunk/subversion/bindings/ctypes-python/csvn/wc.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples (from /trunk/subversion/bindings/ctypes-python/examples:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/example.py (from /trunk/subversion/bindings/ctypes-python/examples/example.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/log.py (from /trunk/subversion/bindings/ctypes-python/examples/log.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/mucc.py (from /trunk/subversion/bindings/ctypes-python/examples/mucc.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/trunkify.py (from /trunk/subversion/bindings/ctypes-python/examples/trunkify.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/setup.py (from /trunk/subversion/bindings/ctypes-python/setup.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/test (from /trunk/subversion/bindings/ctypes-python/test:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/localrepos.py (from /trunk/subversion/bindings/ctypes-python/test/localrepos.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/remoterepos.py (from /trunk/subversion/bindings/ctypes-python/test/remoterepos.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/run_all.py (from /trunk/subversion/bindings/ctypes-python/test/run_all.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/setup_path.py (from /trunk/subversion/bindings/ctypes-python/test/setup_path.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/svntypes.py (from /trunk/subversion/bindings/ctypes-python/test/svntypes.py:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/test.dumpfile (from /trunk/subversion/bindings/ctypes-python/test/test.dumpfile:33535)
   R /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/wc.py (from /trunk/subversion/bindings/ctypes-python/test/wc.py:33535)
   M /branches/issue-2897-take2/subversion/bindings/swig/python/svn/repos.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/trac/versioncontrol/main.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py
   M /branches/issue-2897-take2/subversion/include
   M /branches/issue-2897-take2/subversion/include/private/svn_auth_private.h
   M /branches/issue-2897-take2/subversion/include/private/svn_opt_private.h
   M /branches/issue-2897-take2/subversion/include/svn_auth.h
   D /branches/issue-2897-take2/subversion/include/svn_auth_dso.h
   M /branches/issue-2897-take2/subversion/include/svn_base64.h
   M /branches/issue-2897-take2/subversion/include/svn_checksum.h
   M /branches/issue-2897-take2/subversion/include/svn_client.h
   M /branches/issue-2897-take2/subversion/include/svn_cmdline.h
   M /branches/issue-2897-take2/subversion/include/svn_compat.h
   M /branches/issue-2897-take2/subversion/include/svn_ctype.h
   M /branches/issue-2897-take2/subversion/include/svn_delta.h
   M /branches/issue-2897-take2/subversion/include/svn_diff.h
   A /branches/issue-2897-take2/subversion/include/svn_dirent_uri.h (from /trunk/subversion/include/svn_dirent_uri.h:33535)
   M /branches/issue-2897-take2/subversion/include/svn_error.h
   M /branches/issue-2897-take2/subversion/include/svn_error_codes.h
   M /branches/issue-2897-take2/subversion/include/svn_io.h
   M /branches/issue-2897-take2/subversion/include/svn_md5.h
   M /branches/issue-2897-take2/subversion/include/svn_nls.h
   M /branches/issue-2897-take2/subversion/include/svn_path.h
   M /branches/issue-2897-take2/subversion/include/svn_pools.h
   M /branches/issue-2897-take2/subversion/include/svn_props.h
   M /branches/issue-2897-take2/subversion/include/svn_quoprint.h
   D /branches/issue-2897-take2/subversion/include/svn_sha1.h
   M /branches/issue-2897-take2/subversion/include/svn_sorts.h
   M /branches/issue-2897-take2/subversion/include/svn_subst.h
   M /branches/issue-2897-take2/subversion/include/svn_time.h
   M /branches/issue-2897-take2/subversion/include/svn_types.h
   M /branches/issue-2897-take2/subversion/include/svn_version.h
   M /branches/issue-2897-take2/subversion/include/svn_wc.h
   M /branches/issue-2897-take2/subversion/include/svn_xml.h
   M /branches/issue-2897-take2/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   A /branches/issue-2897-take2/subversion/libsvn_auth_gnome_keyring/version.c (from /trunk/subversion/libsvn_auth_gnome_keyring/version.c:33535)
   M /branches/issue-2897-take2/subversion/libsvn_auth_kwallet/kwallet.cpp
   A /branches/issue-2897-take2/subversion/libsvn_auth_kwallet/version.c (from /trunk/subversion/libsvn_auth_kwallet/version.c:33535)
   M /branches/issue-2897-take2/subversion/libsvn_client/add.c
   M /branches/issue-2897-take2/subversion/libsvn_client/cat.c
   M /branches/issue-2897-take2/subversion/libsvn_client/cmdline.c
   M /branches/issue-2897-take2/subversion/libsvn_client/commit.c
   M /branches/issue-2897-take2/subversion/libsvn_client/commit_util.c
   M /branches/issue-2897-take2/subversion/libsvn_client/copy.c
   M /branches/issue-2897-take2/subversion/libsvn_client/delete.c
   M /branches/issue-2897-take2/subversion/libsvn_client/diff.c
   M /branches/issue-2897-take2/subversion/libsvn_client/export.c
   M /branches/issue-2897-take2/subversion/libsvn_client/externals.c
   M /branches/issue-2897-take2/subversion/libsvn_client/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.h
   M /branches/issue-2897-take2/subversion/libsvn_delta/text_delta.c
   M /branches/issue-2897-take2/subversion/libsvn_fs/fs-loader.c
   A /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/metadata-table.c (from /trunk/subversion/libsvn_fs_base/bdb/metadata-table.c:33535)
   A /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/metadata-table.h (from /trunk/subversion/libsvn_fs_base/bdb/metadata-table.h:33535)
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/err.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/err.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/reps-strings.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/tree.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/tree.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/lock.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/tree.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/fetch.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/get_dated_rev.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/get_location_segments.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/get_locations.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/README
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/property.c
   D /branches/issue-2897-take2/subversion/libsvn_ra_serf/propfind_buckets.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/update.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/util.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/client.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/editorp.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/load.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/reporter.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/repos.c
   M /branches/issue-2897-take2/subversion/libsvn_subr
   M /branches/issue-2897-take2/subversion/libsvn_subr/cache-memcache.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/checksum.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/cmdline.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/config_auth.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/config_file.c
   A /branches/issue-2897-take2/subversion/libsvn_subr/dirent_uri.c (from /trunk/subversion/libsvn_subr/dirent_uri.c:33535)
   M /branches/issue-2897-take2/subversion/libsvn_subr/genctype.py
   M /branches/issue-2897-take2/subversion/libsvn_subr/io.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/md5.c
   A /branches/issue-2897-take2/subversion/libsvn_subr/md5.h (from /trunk/subversion/libsvn_subr/md5.h:33535)
   M /branches/issue-2897-take2/subversion/libsvn_subr/opt.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/path.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/sha1.c
   A /branches/issue-2897-take2/subversion/libsvn_subr/sha1.h (from /trunk/subversion/libsvn_subr/sha1.h:33535)
   M /branches/issue-2897-take2/subversion/libsvn_subr/sorts.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/sqlite.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/stream.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/subst.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/svn_base64.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/svn_string.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/target.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_crawler.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_files.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_files.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/copy.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/diff.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/entries.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/lock.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/log.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/log.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/props.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/questions.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/revision_status.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/translate.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/update_editor.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/util.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc.h
   A /branches/issue-2897-take2/subversion/libsvn_wc/wc_db.c (from /trunk/subversion/libsvn_wc/wc_db.c:33535)
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc_db.h
   M /branches/issue-2897-take2/subversion/mod_dav_svn/activity.c
   M /branches/issue-2897-take2/subversion/mod_dav_svn/liveprops.c
   M /branches/issue-2897-take2/subversion/mod_dav_svn/reports/mergeinfo.c
   M /branches/issue-2897-take2/subversion/mod_dav_svn/reports/replay.c
   M /branches/issue-2897-take2/subversion/mod_dav_svn/reports/update.c
   M /branches/issue-2897-take2/subversion/po/fr.po
   M /branches/issue-2897-take2/subversion/po/ko.po
   M /branches/issue-2897-take2/subversion/po/nb.po
   M /branches/issue-2897-take2/subversion/po/pl.po
   M /branches/issue-2897-take2/subversion/po/zh_CN.po
   M /branches/issue-2897-take2/subversion/svn/main.c
   M /branches/issue-2897-take2/subversion/svn/notify.c
   M /branches/issue-2897-take2/subversion/svn/props.c
   M /branches/issue-2897-take2/subversion/svn/resolve-cmd.c
   M /branches/issue-2897-take2/subversion/svn/resolved-cmd.c
   M /branches/issue-2897-take2/subversion/svn/status.c
   M /branches/issue-2897-take2/subversion/svn/util.c
   M /branches/issue-2897-take2/subversion/svnadmin/main.c
   M /branches/issue-2897-take2/subversion/svnserve/serve.c
   M /branches/issue-2897-take2/subversion/svnsync/main.c
   M /branches/issue-2897-take2/subversion/tests/cmdline/basic_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/blame_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/commit_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/copy_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/depth_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/diff_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/externals_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/log_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/revert_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/special_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/stat_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/actions.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/tree.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/wc.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs_base/fs-base-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_repos/repos-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr
   A /branches/issue-2897-take2/subversion/tests/libsvn_subr/dirent_uri-test.c (from /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c:33535)
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/path-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/target-test.c
   D /branches/issue-2897-take2/subversion/tests/libsvn_subr/target-test.py
   M /branches/issue-2897-take2/tools/backup/hot-backup.py.in
   M /branches/issue-2897-take2/tools/dev/graph-dav-servers.py
   M /branches/issue-2897-take2/tools/dev/iz/find-fix.py
   M /branches/issue-2897-take2/tools/dev/normalize-dump.py
   M /branches/issue-2897-take2/tools/dev/verify-history.py
   M /branches/issue-2897-take2/tools/examples/get-location-segments.py
   M /branches/issue-2897-take2/tools/examples/svnshell.py
   M /branches/issue-2897-take2/tools/hook-scripts/mailer/mailer.py
   M /branches/issue-2897-take2/tools/hook-scripts/mailer/tests/mailer-t1.sh
   M /branches/issue-2897-take2/tools/hook-scripts/svnperms.py
   M /branches/issue-2897-take2/tools/server-side/fsfs-reshard.py
   M /branches/issue-2897-take2/tools/server-side/svn-backup-dumps.py
   M /branches/issue-2897-take2/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2897-take2/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2897-take2/win-tests.py
   M /branches/issue-2897-take2/www/development.html
   M /branches/issue-2897-take2/www/images/svn-dav-securityspace-survey.png
   M /branches/issue-2897-take2/www/issue-tracker.html
   M /branches/issue-2897-take2/www/links.html
   M /branches/issue-2897-take2/www/svn-dav-securityspace-survey.html
   M /branches/issue-2897-take2/www/svn_1.6_releasenotes.html
   M /branches/issue-2897-take2/www/tasks.html

On issue-2897-take2 branch:

Merge r33235 through r33535 from trunk.

------------------------------------------------------------------------
r34073 | sbutler | 2008-11-06 13:09:43 +0100 (Thu, 06 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/commit_tests.py

Tidy up r34071.  Should not have touched commit_tests.py

* subversion/tests/cmdline/commit_tests.py
  (test_list): Revert r34071


------------------------------------------------------------------------
r34074 | kameshj | 2008-11-06 13:56:23 +0100 (Thu, 06 Nov 2008) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/build.conf
   M /branches/issue-2897-take2/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2897-take2/notes/tree-conflicts/requirements.txt
   M /branches/issue-2897-take2/subversion/include
   M /branches/issue-2897-take2/subversion/include/private/svn_auth_private.h
   M /branches/issue-2897-take2/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2897-take2/subversion/libsvn_subr
   M /branches/issue-2897-take2/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr
   D /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp VS2005
   A /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005 (from /trunk/tools/buildbot/slaves/win32-xp-VS2005:33536)
   R /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005/config.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/config.bat:33536)
   R /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat:33536)
   R /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat:33536)
   R /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat:33536)
   R /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat:33536)
   R /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat (from /trunk/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat:33536)
   M /branches/issue-2897-take2/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2897-take2/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2897-take2/www/development.html
   M /branches/issue-2897-take2/www/issue-tracker.html
   M /branches/issue-2897-take2/www/tasks.html

On issue-2897-take2 branch:

Merge r33536 from trunk.

------------------------------------------------------------------------
r34075 | kameshj | 2008-11-06 15:11:28 +0100 (Thu, 06 Nov 2008) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/CHANGES
   M /branches/issue-2897-take2/COMMITTERS
   M /branches/issue-2897-take2/INSTALL
   A /branches/issue-2897-take2/TODO-1.6 (from /trunk/TODO-1.6:34074)
   M /branches/issue-2897-take2/build/generator/extractor.py
   M /branches/issue-2897-take2/build/generator/gen_base.py
   M /branches/issue-2897-take2/build/generator/gen_make.py
   M /branches/issue-2897-take2/build/generator/gen_vcnet_vcproj.py
   M /branches/issue-2897-take2/build/generator/gen_win.py
   M /branches/issue-2897-take2/build/generator/swig/header_wrappers.py
   M /branches/issue-2897-take2/build/run_tests.py
   M /branches/issue-2897-take2/build/strip-po-charset.py
   M /branches/issue-2897-take2/build.conf
   M /branches/issue-2897-take2/configure.ac
   M /branches/issue-2897-take2/contrib/client-side/emacs/psvn.el
   M /branches/issue-2897-take2/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/issue-2897-take2/contrib/hook-scripts/enforcer/enforcer
   M /branches/issue-2897-take2/gen-make.py
   M /branches/issue-2897-take2/notes/http-protocol-v2.txt
   M /branches/issue-2897-take2/notes/l10n-problems
   A /branches/issue-2897-take2/notes/tree-conflicts/all-tests.sh (from /trunk/notes/tree-conflicts/all-tests.sh:34074)
   M /branches/issue-2897-take2/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2897-take2/notes/tree-conflicts/requirements.txt
   M /branches/issue-2897-take2/notes/tree-conflicts/resolution.txt
   M /branches/issue-2897-take2/notes/wc-ng-design
   M /branches/issue-2897-take2/packages/windows-WiX/BuildSubversion/Bitmaps/svn_bck.png
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/wc.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/example.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/log.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/setup.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/localrepos.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/remoterepos.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/run_all.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/svntypes.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/wc.py
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/ConflictResolverCallback.h
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/EnumMapper.h
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/InfoCallback.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/SVNClient.h
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/StatusCallback.h
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   A /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java:34074)
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
   M /branches/issue-2897-take2/subversion/bindings/swig/core.i
   M /branches/issue-2897-take2/subversion/bindings/swig/include/svn_global.swg
   M /branches/issue-2897-take2/subversion/bindings/swig/python/svn/core.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/auth.py
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/svn/commit-mailer.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/svn_client.i
   M /branches/issue-2897-take2/subversion/include
   M /branches/issue-2897-take2/subversion/include/private/svn_auth_private.h
   A /branches/issue-2897-take2/subversion/include/private/svn_cache.h (from /trunk/subversion/include/private/svn_cache.h:34074)
   M /branches/issue-2897-take2/subversion/include/private/svn_dep_compat.h
   M /branches/issue-2897-take2/subversion/include/private/svn_sqlite.h
   M /branches/issue-2897-take2/subversion/include/private/svn_wc_private.h
   M /branches/issue-2897-take2/subversion/include/svn_auth.h
   D /branches/issue-2897-take2/subversion/include/svn_cache.h
   M /branches/issue-2897-take2/subversion/include/svn_checksum.h
   M /branches/issue-2897-take2/subversion/include/svn_client.h
   M /branches/issue-2897-take2/subversion/include/svn_cmdline.h
   M /branches/issue-2897-take2/subversion/include/svn_config.h
   M /branches/issue-2897-take2/subversion/include/svn_delta.h
   M /branches/issue-2897-take2/subversion/include/svn_dirent_uri.h
   M /branches/issue-2897-take2/subversion/include/svn_error.h
   M /branches/issue-2897-take2/subversion/include/svn_error_codes.h
   M /branches/issue-2897-take2/subversion/include/svn_fs.h
   M /branches/issue-2897-take2/subversion/include/svn_io.h
   M /branches/issue-2897-take2/subversion/include/svn_path.h
   M /branches/issue-2897-take2/subversion/include/svn_props.h
   M /branches/issue-2897-take2/subversion/include/svn_ra.h
   M /branches/issue-2897-take2/subversion/include/svn_time.h
   M /branches/issue-2897-take2/subversion/include/svn_utf.h
   M /branches/issue-2897-take2/subversion/include/svn_wc.h
   M /branches/issue-2897-take2/subversion/include/svn_xml.h
   M /branches/issue-2897-take2/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/issue-2897-take2/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2897-take2/subversion/libsvn_client/add.c
   M /branches/issue-2897-take2/subversion/libsvn_client/blame.c
   M /branches/issue-2897-take2/subversion/libsvn_client/cat.c
   M /branches/issue-2897-take2/subversion/libsvn_client/changelist.c
   M /branches/issue-2897-take2/subversion/libsvn_client/checkout.c
   M /branches/issue-2897-take2/subversion/libsvn_client/cleanup.c
   M /branches/issue-2897-take2/subversion/libsvn_client/commit.c
   M /branches/issue-2897-take2/subversion/libsvn_client/commit_util.c
   M /branches/issue-2897-take2/subversion/libsvn_client/copy.c
   M /branches/issue-2897-take2/subversion/libsvn_client/ctx.c
   M /branches/issue-2897-take2/subversion/libsvn_client/delete.c
   A /branches/issue-2897-take2/subversion/libsvn_client/deprecated.c (from /trunk/subversion/libsvn_client/deprecated.c:34074)
   M /branches/issue-2897-take2/subversion/libsvn_client/diff.c
   M /branches/issue-2897-take2/subversion/libsvn_client/export.c
   M /branches/issue-2897-take2/subversion/libsvn_client/externals.c
   M /branches/issue-2897-take2/subversion/libsvn_client/info.c
   M /branches/issue-2897-take2/subversion/libsvn_client/list.c
   M /branches/issue-2897-take2/subversion/libsvn_client/locking_commands.c
   M /branches/issue-2897-take2/subversion/libsvn_client/log.c
   M /branches/issue-2897-take2/subversion/libsvn_client/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.h
   M /branches/issue-2897-take2/subversion/libsvn_client/prop_commands.c
   M /branches/issue-2897-take2/subversion/libsvn_client/ra.c
   M /branches/issue-2897-take2/subversion/libsvn_client/relocate.c
   M /branches/issue-2897-take2/subversion/libsvn_client/repos_diff.c
   M /branches/issue-2897-take2/subversion/libsvn_client/resolved.c
   M /branches/issue-2897-take2/subversion/libsvn_client/revert.c
   M /branches/issue-2897-take2/subversion/libsvn_client/revisions.c
   M /branches/issue-2897-take2/subversion/libsvn_client/status.c
   M /branches/issue-2897-take2/subversion/libsvn_client/switch.c
   M /branches/issue-2897-take2/subversion/libsvn_client/update.c
   M /branches/issue-2897-take2/subversion/libsvn_client/url.c
   M /branches/issue-2897-take2/subversion/libsvn_client/util.c
   M /branches/issue-2897-take2/subversion/libsvn_delta/text_delta.c
   A /branches/issue-2897-take2/subversion/libsvn_diff/deprecated.c (from /trunk/subversion/libsvn_diff/deprecated.c:34074)
   M /branches/issue-2897-take2/subversion/libsvn_diff/diff_file.c
   M /branches/issue-2897-take2/subversion/libsvn_fs/fs-loader.c
   M /branches/issue-2897-take2/subversion/libsvn_fs/fs-loader.h
   A /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/checksum-reps-table.c (from /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.c:34074)
   A /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/checksum-reps-table.h (from /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.h:34074)
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/dbt.h
   D /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/metadata-table.c
   D /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/metadata-table.h
   A /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/miscellaneous-table.c (from /trunk/subversion/libsvn_fs_base/bdb/miscellaneous-table.c:34074)
   A /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/miscellaneous-table.h (from /trunk/subversion/libsvn_fs_base/bdb/miscellaneous-table.h:34074)
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/node-origins-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/dag.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/err.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/err.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/key-gen.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/notes/structure
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/reps-strings.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/reps-strings.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/tree.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/tree.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/caching.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/dag.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/lock.c
   A /branches/issue-2897-take2/subversion/libsvn_fs_fs/rep-cache.c (from /trunk/subversion/libsvn_fs_fs/rep-cache.c:34074)
   A /branches/issue-2897-take2/subversion/libsvn_fs_fs/rep-cache.h (from /trunk/subversion/libsvn_fs_fs/rep-cache.h:34074)
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/tree.c
   M /branches/issue-2897-take2/subversion/libsvn_ra/compat.c
   A /branches/issue-2897-take2/subversion/libsvn_ra/deprecated.c (from /trunk/subversion/libsvn_ra/deprecated.c:34074)
   M /branches/issue-2897-take2/subversion/libsvn_ra/ra_loader.c
   M /branches/issue-2897-take2/subversion/libsvn_ra/ra_loader.h
   M /branches/issue-2897-take2/subversion/libsvn_ra_local/ra_plugin.c
   A /branches/issue-2897-take2/subversion/libsvn_ra_neon/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_neon/get_deleted_rev.c:34074)
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/log.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/session.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/util.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/blame.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/commit.c
   A /branches/issue-2897-take2/subversion/libsvn_ra_serf/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_serf/get_deleted_rev.c:34074)
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/getdate.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/getlocations.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/getlocationsegments.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/getlocks.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/locks.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/log.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/mergeinfo.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/options.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/replay.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/serf.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/update.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/util.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/win32_auth_sspi.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/xml.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/client.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/internal_auth.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/protocol
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/ra_svn.h
   M /branches/issue-2897-take2/subversion/libsvn_repos/commit.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/delta.c
   A /branches/issue-2897-take2/subversion/libsvn_repos/deprecated.c (from /trunk/subversion/libsvn_repos/deprecated.c:34074)
   M /branches/issue-2897-take2/subversion/libsvn_repos/dump.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/fs-wrap.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/hooks.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/load.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/log.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/replay.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/reporter.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/repos.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/repos.h
   M /branches/issue-2897-take2/subversion/libsvn_repos/rev_hunt.c
   M /branches/issue-2897-take2/subversion/libsvn_subr
   M /branches/issue-2897-take2/subversion/libsvn_subr/auth.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/cache-inprocess.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/cache-memcache.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/cache.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/cache.h
   M /branches/issue-2897-take2/subversion/libsvn_subr/checksum.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/cmdline.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/config_auth.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/config_file.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/config_win.c
   A /branches/issue-2897-take2/subversion/libsvn_subr/deprecated.c (from /trunk/subversion/libsvn_subr/deprecated.c:34074)
   M /branches/issue-2897-take2/subversion/libsvn_subr/dirent_uri.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/dso.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/genctype.py
   M /branches/issue-2897-take2/subversion/libsvn_subr/io.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/macos_keychain.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/nls.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/opt.c
   A /branches/issue-2897-take2/subversion/libsvn_subr/opt.h (from /trunk/subversion/libsvn_subr/opt.h:34074)
   M /branches/issue-2897-take2/subversion/libsvn_subr/path.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/simple_providers.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/sqlite.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/stream.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/subst.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/time.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/utf.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/win32_crypto.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/xml.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_crawler.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_files.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_files.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/copy.c
   A /branches/issue-2897-take2/subversion/libsvn_wc/deprecated.c (from /trunk/subversion/libsvn_wc/deprecated.c:34074)
   M /branches/issue-2897-take2/subversion/libsvn_wc/diff.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/entries.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/lock.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/lock.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/log.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/log.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/props.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/props.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/questions.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/revision_status.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/status.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/translate.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/tree_conflicts.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/update_editor.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/util.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc_db.h
   M /branches/issue-2897-take2/subversion/mod_dav_svn/dav_svn.h
   A /branches/issue-2897-take2/subversion/mod_dav_svn/reports/deleted-rev.c (from /trunk/subversion/mod_dav_svn/reports/deleted-rev.c:34074)
   M /branches/issue-2897-take2/subversion/mod_dav_svn/repos.c
   M /branches/issue-2897-take2/subversion/mod_dav_svn/version.c
   M /branches/issue-2897-take2/subversion/po/de.po
   M /branches/issue-2897-take2/subversion/po/fr.po
   M /branches/issue-2897-take2/subversion/po/pl.po
   M /branches/issue-2897-take2/subversion/po/zh_CN.po
   M /branches/issue-2897-take2/subversion/svn/cl.h
   M /branches/issue-2897-take2/subversion/svn/commit-cmd.c
   M /branches/issue-2897-take2/subversion/svn/copy-cmd.c
   M /branches/issue-2897-take2/subversion/svn/delete-cmd.c
   M /branches/issue-2897-take2/subversion/svn/diff-cmd.c
   M /branches/issue-2897-take2/subversion/svn/import-cmd.c
   M /branches/issue-2897-take2/subversion/svn/info-cmd.c
   M /branches/issue-2897-take2/subversion/svn/main.c
   M /branches/issue-2897-take2/subversion/svn/mkdir-cmd.c
   M /branches/issue-2897-take2/subversion/svn/move-cmd.c
   M /branches/issue-2897-take2/subversion/svn/notify.c
   M /branches/issue-2897-take2/subversion/svn/propedit-cmd.c
   M /branches/issue-2897-take2/subversion/svn/propget-cmd.c
   M /branches/issue-2897-take2/subversion/svn/schema/info.rnc
   M /branches/issue-2897-take2/subversion/svn/schema/status.rnc
   M /branches/issue-2897-take2/subversion/svn/status-cmd.c
   M /branches/issue-2897-take2/subversion/svn/status.c
   M /branches/issue-2897-take2/subversion/svn/tree-conflicts.c
   M /branches/issue-2897-take2/subversion/svn/util.c
   M /branches/issue-2897-take2/subversion/svn_private_config.hw
   M /branches/issue-2897-take2/subversion/svnadmin/main.c
   M /branches/issue-2897-take2/subversion/svndumpfilter/main.c
   M /branches/issue-2897-take2/subversion/svnlook/main.c
   M /branches/issue-2897-take2/subversion/svnserve/main.c
   M /branches/issue-2897-take2/subversion/svnserve/serve.c
   M /branches/issue-2897-take2/subversion/svnsync/main.c
   M /branches/issue-2897-take2/subversion/tests/cmdline/autoprop_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/basic_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/changelist_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/checkout_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/commit_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/copy_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/diff_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/getopt_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/import_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/info_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/lock_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/log_tests.py
   A /branches/issue-2897-take2/subversion/tests/cmdline/log_tests_data/merge_history_repo.png (from /trunk/subversion/tests/cmdline/log_tests_data/merge_history_repo.png:34074)
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_authz_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/prop_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/revert_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/schedule_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/special_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/stat_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svneditor.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnlook_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/actions.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/entry.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/testcase.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/tree.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/verify.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/wc.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/switch_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/trans_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-2897-take2/subversion/tests/cmdline/update_tests.py
   M /branches/issue-2897-take2/subversion/tests/libsvn_delta
   A /branches/issue-2897-take2/subversion/tests/libsvn_delta/window-test.c (from /trunk/subversion/tests/libsvn_delta/window-test.c:34074)
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_repos/repos-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/cache-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/checksum-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/path-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/target-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/issue-2897-take2/tools/bdb/skel.py
   M /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
   M /branches/issue-2897-take2/tools/client-side/change-svn-wc-format.py
   M /branches/issue-2897-take2/tools/dev/contribulyze.py
   M /branches/issue-2897-take2/tools/dev/graph-dav-servers.py
   M /branches/issue-2897-take2/tools/dev/iz/find-fix.py
   M /branches/issue-2897-take2/tools/dev/svn-merge-revs.py
   M /branches/issue-2897-take2/tools/dist/construct-rolling-environment.sh
   M /branches/issue-2897-take2/tools/dist/dist.sh
   M /branches/issue-2897-take2/tools/dist/post-to-tigris.py
   M /branches/issue-2897-take2/tools/dist/write-announcement.py
   M /branches/issue-2897-take2/tools/examples/revplist.py
   M /branches/issue-2897-take2/tools/examples/svnlook.py
   M /branches/issue-2897-take2/tools/hook-scripts/mailer/mailer.py
   M /branches/issue-2897-take2/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2897-take2/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2897-take2/win-tests.py
   M /branches/issue-2897-take2/www/commercial-support.html
   M /branches/issue-2897-take2/www/development.html
   M /branches/issue-2897-take2/www/faq.html
   M /branches/issue-2897-take2/www/getting.html
   M /branches/issue-2897-take2/www/hacking.html
   M /branches/issue-2897-take2/www/images/svn-dav-securityspace-survey.png
   M /branches/issue-2897-take2/www/index.html
   M /branches/issue-2897-take2/www/issue-tracker.html
   M /branches/issue-2897-take2/www/links.html
   M /branches/issue-2897-take2/www/release-history.html
   M /branches/issue-2897-take2/www/roadmap.html
   M /branches/issue-2897-take2/www/svn-dav-securityspace-survey.html
   M /branches/issue-2897-take2/www/svn_1.6_releasenotes.html
   M /branches/issue-2897-take2/www/tasks.html

On issue-2897-take2 branch:

Merge r33537 through r34074 from trunk.

------------------------------------------------------------------------
r34076 | sussman | 2008-11-06 17:06:41 +0100 (Thu, 06 Nov 2008) | 12 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/repos.c

Augment mod_dav_svn support for a 'public' rev-path query syntax:

  path?[p=PEGREV][&r=REV]

Both 'p' and 'r' arguments are optional: they can both be present, or
only one may be present.  Just like the commandline client, an absent
pegrev defaults to HEAD, and an absent working rev defaults to pegrev.

* subversion/mod_dav_svn/repos.c 
  (get_resource):  move code into parse_querystring().
  (parse_querystring, querystring_to_table): new functions.

------------------------------------------------------------------------
r34077 | julianfoad | 2008-11-06 20:17:48 +0100 (Thu, 06 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c

* subversion/libsvn_wc/entries.c
  (walker_helper): Add comments.

------------------------------------------------------------------------
r34078 | sussman | 2008-11-06 20:20:22 +0100 (Thu, 06 Nov 2008) | 2 lines
Changed paths:
   M /trunk/notes/http-protocol-v2.txt

* notes/http-protocol-v2.txt: rewrite based on New Orleans meeting.

------------------------------------------------------------------------
r34079 | hwright | 2008-11-06 21:16:01 +0100 (Thu, 06 Nov 2008) | 14 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/caching.c
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c
   M /trunk/subversion/libsvn_fs_fs/fs_fs.h

Unconditionally load the FSFS configuration when creating/opening the
filesystem.

* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__get_config): Remove.
  (svn_fs_fs__open, svn_fs_fs__create): Read the fsfs.conf file.

* subversion/libsvn_fs_fs/fs_fs.h
  (svn_fs_fs__get_config): Remove.

* subversion/libsvn_fs_fs/caching.c
  (read_config): Don't worry about loading the config, since it's already
    loaded by opening the FS.

------------------------------------------------------------------------
r34080 | pburba | 2008-11-06 21:18:04 +0100 (Thu, 06 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/repos.c

Follow-up to r34076, make variable declarations C89 friendly.

* subversion/mod_dav_svn/repos.c
  (parse_querystring):
  Move variable declarations to start of code block.
------------------------------------------------------------------------
r34081 | pburba | 2008-11-06 21:37:35 +0100 (Thu, 06 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Follow-up to r34047, add a new merge test that demonstrates yet another
merge bug.

* subversion/tests/cmdline/merge_tests.py
  (merge_range_prior_to_rename_source_existence):
  (test_list): Add XFailing merge_range_prior_to_rename_source_existence.

------------------------------------------------------------------------
r34082 | cmpilato | 2008-11-06 21:44:19 +0100 (Thu, 06 Nov 2008) | 18 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/mirror.c

Fix issue #3275 by teaching the mod_dav_svn proxy logic to hand off
GET and PROPFIND requests that are aimed at working resource URIs to
the proxy instead of trying to field them in the slave server.

WARNING: I'm relying on my compiler and the testimony of the
         attributed tester to determine the legitimacy of this patch.
         Developers familiar with the proxy code are encouraged to
         review this commit!

* subversion/mod_dav_svn/mirror.c
  (proxy_request_fixup): New helper function, cored from
    dav_svn__proxy_merge_fixup().
  (dav_svn__proxy_merge_fixup): Look for GET and PROPFIND requests
    aimed at working resource URIs, and proxy those away, too.

Tested by: Kylo Ginsberg <kylo{_AT_}kylo.net>
Reviewed by: jerenkrantz

------------------------------------------------------------------------
r34083 | cmpilato | 2008-11-06 21:48:41 +0100 (Thu, 06 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Propose r34082 for backport.
------------------------------------------------------------------------
r34084 | julianfoad | 2008-11-06 22:02:19 +0100 (Thu, 06 Nov 2008) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c

Correct a bug in the WC entries walker. In "show_hidden" mode, it tried to
recurse into a 'deleted' or 'absent' directory.

There is no regression test. I tested by modifying svn_client_info() to use
"show_hidden=TRUE" in the call to svn_wc_walk_entries3(), and modifying
tree_conflicts_tests.py to run "svn info -R <target>" before resolving. It
failed on test 13.

* subversion/libsvn_wc/entries.c
  (walker_helper): Do not try to recurse into a 'deleted' or 'absent'
    directory.

------------------------------------------------------------------------
r34085 | jwhitlock | 2008-11-06 22:06:14 +0100 (Thu, 06 Nov 2008) | 52 lines
Changed paths:
   M /trunk/build.conf
   M /trunk/subversion/bindings/ctypes-python/setup.py
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp
   M /trunk/subversion/bindings/swig/core.i
   M /trunk/subversion/bindings/swig/include/svn_global.swg
   M /trunk/subversion/bindings/swig/python/tests/auth.py
   M /trunk/subversion/bindings/swig/svn_client.i
   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
   A /trunk/subversion/tests/libsvn_subr/auth-test.c

Refactor how Subversion accesses platform-specific auth providers.

* build.conf
  (auth-test): New section for the auth tests.
  (__LIBS__): Added auth-test to lib.

* subversion/libsvn_subr/cmdline.c
  (get_auth_provider): Removed.
  (svn_cmdline_create_auth_baton): Use the new API to access
   platform-specific auth providers.

* subversion/libsvn_subr/auth.c
  (svn_auth_get_platform_specific_provider): Added.

* subversion/tests/libsvn_subr
  (svn:ignore): Ignore auth-test.

* subversion/tests/libsvn_subr/auth-test.c: Added.

* subversion/bindings/javahl/native/SVNClient.cpp
  (get_auth_provider): Removed.
  (SVNClient::getContext): Use the new API to access platform-specific
   auth providers.

* subversion/bindings/ctypes-python/setup.py
  (build.get_apr_config): Removed the libsvn_auth_gnome_keyring and
   libsvn_auth_kwallet libs.

* subversion/bindings/swig/core.i,
* subversion/bindings/swig/svn_client.i: Add explicit ignores for all
   platform-specific auth providers.

* subversion/bindings/swig/python/tests/auth.py
  (test_conditional_auth_provider_support): Removed.

* subversion/bindings/swig/include/svn_global.swg
  (PLATFORM_SPECIFIC_WRAPPER): Removed.

* subversion/include/svn_auth.h
  (svn_auth_get_platform_specific_provider): Added.
  (svn_auth_get_windows_simple_provider,
   svn_auth_get_windows_ssl_server_trust_provider,
   svn_auth_get_keychain_simple_provider,
   svn_auth_get_keychain_ssl_client_cert_pw_provider,
   svn_auth_gnome_keyring_version,
   svn_auth_get_gnome_keyring_simple_provider,
   svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider,
   svn_auth_kwallet_version,
   svn_auth_get_kwallet_simple_provider,
   svn_auth_get_kwallet_ssl_client_cert_pw_provider): Removed exposure to
    swig and ctypesgen.

------------------------------------------------------------------------
r34086 | sussman | 2008-11-06 22:15:00 +0100 (Thu, 06 Nov 2008) | 1 line
Changed paths:
   M /trunk/notes/http-protocol-v2.txt

* notes/http-protocol-v2.txt: rename 'revprop stub' to 'revision stub'
------------------------------------------------------------------------
r34087 | jwhitlock | 2008-11-06 22:23:48 +0100 (Thu, 06 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/auth.c

* subversion/libsvn_subr/auth.c
  (svn_auth_get_platform_specific_provider): Use proper syntax when checking for
   GNOME Keyring and KWallet services.  Follow-up to r34085.

Found by: hwright

------------------------------------------------------------------------
r34088 | hwright | 2008-11-06 22:43:15 +0100 (Thu, 06 Nov 2008) | 20 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

Allow FSFS rep-caching to be configurable.

* subversion/libsvn_fs_fs/fs_fs.c
  (write_config): Add section for rep-sharing, currently disabled by default.
  (svn_fs_fs__open, svn_fs_fs__create): Check the config before opening or
    creating rep cache.

* subversion/libsvn_fs_fs/fs.h
  (CONFIG_SECTION_REP_SHARING, CONFIG_OPTION_ENABLE_REP_SHARING): New.

* subversion/libsvn_fs_fs/rep-cache.c
  (svn_fs_fs__get_rep_reference): If the database isn't open, just return a
    NULL rep, meaning we didn't find a match.
  (svn_fs_fs__inc_rep_reference, svn_fs_fs__set_rep_reference): If the database
    isn't open, just no op.

* subversion/libsvn_fs_fs/rep-cache.h
  (svn_fs_fs__set_rep_reference, svn_fs_fs__get_rep_reference,
   svn_fs_fs__inc_rep_reuse): Document new behaviors.

------------------------------------------------------------------------
r34089 | julianfoad | 2008-11-06 23:52:43 +0100 (Thu, 06 Nov 2008) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/wc.h

Implement a WC entries walker like svn_wc_walk_entries3() but that also
visits unversioned tree conflict victims.

This may well want to become public, perhaps as a new revision of
svn_wc_walk_entries3(). It could do with a better name than ..._and_tc().

* subversion/libsvn_wc/wc.h
  (svn_wc__walk_entries_and_tc): New function.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_baton_t): New type.
  (visit_tc_too_callbacks): New constant.
  (visit_tc_too_found_entry, visit_tc_too_error_handler,
   svn_wc__walk_entries_and_tc): New functions.

------------------------------------------------------------------------
r34090 | pburba | 2008-11-07 00:38:15 +0100 (Fri, 07 Nov 2008) | 1 line
Changed paths:
   M /branches/reintegrate-improvements
   M /branches/reintegrate-improvements/build.conf
   M /branches/reintegrate-improvements/notes/http-protocol-v2.txt
   M /branches/reintegrate-improvements/notes/tree-conflicts/design-overview.txt
   M /branches/reintegrate-improvements/notes/tree-conflicts/requirements.txt
   M /branches/reintegrate-improvements/subversion/bindings/ctypes-python/setup.py
   M /branches/reintegrate-improvements/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/reintegrate-improvements/subversion/bindings/swig/core.i
   M /branches/reintegrate-improvements/subversion/bindings/swig/include/svn_global.swg
   M /branches/reintegrate-improvements/subversion/bindings/swig/python/tests/auth.py
   M /branches/reintegrate-improvements/subversion/bindings/swig/svn_client.i
   M /branches/reintegrate-improvements/subversion/include
   M /branches/reintegrate-improvements/subversion/include/private/svn_auth_private.h
   M /branches/reintegrate-improvements/subversion/include/svn_auth.h
   M /branches/reintegrate-improvements/subversion/include/svn_wc.h
   M /branches/reintegrate-improvements/subversion/include/svn_xml.h
   M /branches/reintegrate-improvements/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/reintegrate-improvements/subversion/libsvn_client/merge.c
   M /branches/reintegrate-improvements/subversion/libsvn_client/repos_diff.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/caching.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/fs.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/reintegrate-improvements/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/reintegrate-improvements/subversion/libsvn_subr
   M /branches/reintegrate-improvements/subversion/libsvn_subr/auth.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/cmdline.c
   M /branches/reintegrate-improvements/subversion/libsvn_subr/xml.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/adm_ops.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/entries.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/log.h
   M /branches/reintegrate-improvements/subversion/libsvn_wc/tree_conflicts.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/tree_conflicts.h
   M /branches/reintegrate-improvements/subversion/libsvn_wc/update_editor.c
   M /branches/reintegrate-improvements/subversion/libsvn_wc/wc.h
   M /branches/reintegrate-improvements/subversion/mod_dav_svn/mirror.c
   M /branches/reintegrate-improvements/subversion/mod_dav_svn/repos.c
   M /branches/reintegrate-improvements/subversion/po/zh_CN.po
   M /branches/reintegrate-improvements/subversion/tests/cmdline/info_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/merge_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/switch_tests.py
   M /branches/reintegrate-improvements/subversion/tests/cmdline/update_tests.py
   M /branches/reintegrate-improvements/subversion/tests/libsvn_subr
   A /branches/reintegrate-improvements/subversion/tests/libsvn_subr/auth-test.c (from /trunk/subversion/tests/libsvn_subr/auth-test.c:34089)
   M /branches/reintegrate-improvements/tools/server-side/svn_server_log_parse.py
   M /branches/reintegrate-improvements/tools/server-side/test_svn_server_log_parse.py
   M /branches/reintegrate-improvements/www/development.html
   M /branches/reintegrate-improvements/www/issue-tracker.html
   M /branches/reintegrate-improvements/www/tasks.html

On the reintegrate-improvements branch: Merge r34059-34089 from trunk.
------------------------------------------------------------------------
r34091 | pburba | 2008-11-07 02:23:51 +0100 (Fri, 07 Nov 2008) | 1 line
Changed paths:
   M /trunk
   M /trunk/build.conf
   M /trunk/notes/tree-conflicts/design-overview.txt
   M /trunk/notes/tree-conflicts/requirements.txt
   M /trunk/subversion/include
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/private/svn_cache.h
   M /trunk/subversion/include/private/svn_mergeinfo_private.h
   M /trunk/subversion/include/svn_mergeinfo.h
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_subr
   M /trunk/subversion/libsvn_subr/mergeinfo.c
   M /trunk/subversion/tests/cmdline/merge_tests.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.txt
   M /trunk/subversion/tests/libsvn_subr
   M /trunk/tools/buildbot/slaves/win32-xp-VS2005
   M /trunk/tools/server-side/svn_server_log_parse.py
   M /trunk/tools/server-side/test_svn_server_log_parse.py
   M /trunk/www/development.html
   M /trunk/www/issue-tracker.html
   M /trunk/www/tasks.html

Reintegrate the reintegrate-improvements branch back to trunk.
------------------------------------------------------------------------
r34092 | pburba | 2008-11-07 02:29:19 +0100 (Fri, 07 Nov 2008) | 1 line
Changed paths:
   D /branches/reintegrate-improvements

Delete the reintegrate-improvements branch, it was merged back to trunk.
------------------------------------------------------------------------
r34093 | julianfoad | 2008-11-07 15:24:32 +0100 (Fri, 07 Nov 2008) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c

Fix the entries walker again: allow it to walk into a deleted-but-re-added
directory. This is a follow-up to r34084 which fixed a similar bug but broke
this case. Also factor out the test used here and in several other places to
make it easier to keep it consistent.

* subversion/libsvn_wc/entries.c
  (entry_is_hidden): New function.
  (handle_start_tag, read_entries): Use it. (No functional change.)
  (walker_helper, visit_tc_too_found_entry): Use it, fixing the bug mentioned.

------------------------------------------------------------------------
r34094 | pburba | 2008-11-07 16:07:01 +0100 (Fri, 07 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Follow-up to r34091, adjust expected output in a merge test to work with
debug builds.

Suggested by: cmpilato

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_with_subtree_mergeinfo): Debug builds also output the
  file/lineno of the error, so expect that.

------------------------------------------------------------------------
r34095 | sussman | 2008-11-07 16:25:11 +0100 (Fri, 07 Nov 2008) | 2 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/repos.c

* subversion/mod_dav_svn/repos.c
  (parse_querystring): use authz_read_func when tracing node locations.
------------------------------------------------------------------------
r34096 | cmpilato | 2008-11-07 16:38:32 +0100 (Fri, 07 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/mirror.c

Minor follow-up to r34082.

* subversion/mod_dav_svn/mirror.c
  (dav_svn__proxy_merge_fixup): Move a return statement to avoid unnecessary 
    processing when a GET or PROPFIND is not proxied through.

Suggested by: jerenkrantz

------------------------------------------------------------------------
r34097 | cmpilato | 2008-11-07 16:40:23 +0100 (Fri, 07 Nov 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

Add r34096 to the r34082 group, and remove note about needing extra eyes --
I got the best eyes possible on it already.
------------------------------------------------------------------------
r34098 | kfogel | 2008-11-07 20:25:27 +0100 (Fri, 07 Nov 2008) | 9 lines
Changed paths:
   M /branches/issue-2843-dev
   M /branches/issue-2843-dev/TODO-1.6
   M /branches/issue-2843-dev/build.conf
   M /branches/issue-2843-dev/notes/http-protocol-v2.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/all-tests.sh
   M /branches/issue-2843-dev/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/requirements.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/resolution.txt
   M /branches/issue-2843-dev/subversion
   M /branches/issue-2843-dev/subversion/bindings/ctypes-python/setup.py
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/issue-2843-dev/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/issue-2843-dev/subversion/bindings/swig/core.i
   M /branches/issue-2843-dev/subversion/bindings/swig/include/svn_global.swg
   M /branches/issue-2843-dev/subversion/bindings/swig/python/tests/auth.py
   M /branches/issue-2843-dev/subversion/bindings/swig/svn_client.i
   M /branches/issue-2843-dev/subversion/include
   M /branches/issue-2843-dev/subversion/include/private/svn_auth_private.h
   M /branches/issue-2843-dev/subversion/include/private/svn_cache.h
   M /branches/issue-2843-dev/subversion/include/private/svn_mergeinfo_private.h
   M /branches/issue-2843-dev/subversion/include/svn_auth.h
   M /branches/issue-2843-dev/subversion/include/svn_mergeinfo.h
   M /branches/issue-2843-dev/subversion/include/svn_ra.h
   M /branches/issue-2843-dev/subversion/include/svn_wc.h
   M /branches/issue-2843-dev/subversion/include/svn_xml.h
   M /branches/issue-2843-dev/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2843-dev/subversion/libsvn_client/diff.c
   M /branches/issue-2843-dev/subversion/libsvn_client/merge.c
   M /branches/issue-2843-dev/subversion/libsvn_client/repos_diff.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/caching.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/fs.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/issue-2843-dev/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/issue-2843-dev/subversion/libsvn_ra/compat.c
   M /branches/issue-2843-dev/subversion/libsvn_ra/ra_loader.c
   M /branches/issue-2843-dev/subversion/libsvn_ra/ra_loader.h
   M /branches/issue-2843-dev/subversion/libsvn_ra_local/ra_plugin.c
   A /branches/issue-2843-dev/subversion/libsvn_ra_neon/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_neon/get_deleted_rev.c:34097)
   M /branches/issue-2843-dev/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/issue-2843-dev/subversion/libsvn_ra_neon/session.c
   A /branches/issue-2843-dev/subversion/libsvn_ra_serf/get_deleted_rev.c (from /trunk/subversion/libsvn_ra_serf/get_deleted_rev.c:34097)
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/issue-2843-dev/subversion/libsvn_ra_serf/serf.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_svn/client.c
   M /branches/issue-2843-dev/subversion/libsvn_ra_svn/protocol
   M /branches/issue-2843-dev/subversion/libsvn_subr
   M /branches/issue-2843-dev/subversion/libsvn_subr/auth.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/cmdline.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/mergeinfo.c
   M /branches/issue-2843-dev/subversion/libsvn_subr/xml.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/deprecated.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/entries.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/log.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/log.h
   M /branches/issue-2843-dev/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/tree_conflicts.h
   M /branches/issue-2843-dev/subversion/libsvn_wc/update_editor.c
   M /branches/issue-2843-dev/subversion/libsvn_wc/wc.h
   M /branches/issue-2843-dev/subversion/mod_dav_svn/dav_svn.h
   M /branches/issue-2843-dev/subversion/mod_dav_svn/mirror.c
   A /branches/issue-2843-dev/subversion/mod_dav_svn/reports/deleted-rev.c (from /trunk/subversion/mod_dav_svn/reports/deleted-rev.c:34097)
   M /branches/issue-2843-dev/subversion/mod_dav_svn/repos.c
   M /branches/issue-2843-dev/subversion/mod_dav_svn/version.c
   M /branches/issue-2843-dev/subversion/po/zh_CN.po
   M /branches/issue-2843-dev/subversion/svnserve/serve.c
   M /branches/issue-2843-dev/subversion/tests/cmdline/info_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/revert_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/svntest/actions.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/switch_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/issue-2843-dev/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-2843-dev/subversion/tests/cmdline/update_tests.py
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr
   A /branches/issue-2843-dev/subversion/tests/libsvn_subr/auth-test.c (from /trunk/subversion/tests/libsvn_subr/auth-test.c:34097)
   M /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2843-dev/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2843-dev/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2843-dev/www/development.html
   M /branches/issue-2843-dev/www/issue-tracker.html
   M /branches/issue-2843-dev/www/links.html
   M /branches/issue-2843-dev/www/tasks.html

On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34097):

   svn merge https://svn.collab.net/repos/svn/trunk

There was one conflict.  I am committing it with conflict markers
intact, to be resolved in a separate revision:

   subversion/libsvn_wc/entries.c

------------------------------------------------------------------------
r34099 | hwright | 2008-11-07 21:04:18 +0100 (Fri, 07 Nov 2008) | 3 lines
Changed paths:
   M /branches/fsfs-pack
   M /branches/fsfs-pack/build.conf
   M /branches/fsfs-pack/notes/http-protocol-v2.txt
   M /branches/fsfs-pack/notes/tree-conflicts/all-tests.sh
   M /branches/fsfs-pack/notes/tree-conflicts/design-overview.txt
   M /branches/fsfs-pack/notes/tree-conflicts/requirements.txt
   M /branches/fsfs-pack/notes/tree-conflicts/resolution.txt
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/setup.py
   M /branches/fsfs-pack/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/fsfs-pack/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/fsfs-pack/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/fsfs-pack/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/fsfs-pack/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/fsfs-pack/subversion/bindings/swig/core.i
   M /branches/fsfs-pack/subversion/bindings/swig/include/svn_global.swg
   M /branches/fsfs-pack/subversion/bindings/swig/python/tests/auth.py
   M /branches/fsfs-pack/subversion/bindings/swig/svn_client.i
   M /branches/fsfs-pack/subversion/include
   M /branches/fsfs-pack/subversion/include/private/svn_auth_private.h
   M /branches/fsfs-pack/subversion/include/private/svn_cache.h
   M /branches/fsfs-pack/subversion/include/private/svn_mergeinfo_private.h
   M /branches/fsfs-pack/subversion/include/svn_auth.h
   M /branches/fsfs-pack/subversion/include/svn_mergeinfo.h
   M /branches/fsfs-pack/subversion/include/svn_wc.h
   M /branches/fsfs-pack/subversion/include/svn_xml.h
   M /branches/fsfs-pack/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/fsfs-pack/subversion/libsvn_client/merge.c
   M /branches/fsfs-pack/subversion/libsvn_client/repos_diff.c
   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
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/fsfs-pack/subversion/libsvn_ra/compat.c
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/get_deleted_rev.c
   M /branches/fsfs-pack/subversion/libsvn_subr
   M /branches/fsfs-pack/subversion/libsvn_subr/auth.c
   M /branches/fsfs-pack/subversion/libsvn_subr/cmdline.c
   M /branches/fsfs-pack/subversion/libsvn_subr/mergeinfo.c
   M /branches/fsfs-pack/subversion/libsvn_subr/xml.c
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_ops.c
   M /branches/fsfs-pack/subversion/libsvn_wc/entries.c
   M /branches/fsfs-pack/subversion/libsvn_wc/log.c
   M /branches/fsfs-pack/subversion/libsvn_wc/log.h
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.h
   M /branches/fsfs-pack/subversion/libsvn_wc/update_editor.c
   M /branches/fsfs-pack/subversion/libsvn_wc/wc.h
   M /branches/fsfs-pack/subversion/mod_dav_svn/mirror.c
   M /branches/fsfs-pack/subversion/mod_dav_svn/repos.c
   M /branches/fsfs-pack/subversion/po/zh_CN.po
   M /branches/fsfs-pack/subversion/tests/cmdline/info_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/merge_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/revert_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/actions.py
   M /branches/fsfs-pack/subversion/tests/cmdline/switch_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/fsfs-pack/subversion/tests/cmdline/update_tests.py
   M /branches/fsfs-pack/subversion/tests/libsvn_subr
   A /branches/fsfs-pack/subversion/tests/libsvn_subr/auth-test.c (from /trunk/subversion/tests/libsvn_subr/auth-test.c:34098)
   M /branches/fsfs-pack/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/fsfs-pack/tools/server-side/svn_server_log_parse.py
   M /branches/fsfs-pack/tools/server-side/test_svn_server_log_parse.py
   M /branches/fsfs-pack/www/development.html
   M /branches/fsfs-pack/www/issue-tracker.html
   M /branches/fsfs-pack/www/links.html
   M /branches/fsfs-pack/www/tasks.html

On the fsfs-pack branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r34100 | kfogel | 2008-11-07 22:27:51 +0100 (Fri, 07 Nov 2008) | 5 lines
Changed paths:
   M /branches/issue-2843-dev/subversion/libsvn_wc/entries.c

On the issue-2843-dev branch: resolve conflicts from the r34098 merge.

* subversion/libsvn_wc/entries.c
  (read_entries): Resolve conflict between r31713 and r34093.

------------------------------------------------------------------------
r34101 | kfogel | 2008-11-07 22:32:48 +0100 (Fri, 07 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/commit_tests.py

* subversion/tests/cmdline/commit_tests.py
  (test_list): Expect commit_out_of_date_deletions to pass over DAV now.
    I'm not sure when it started XPASSing; it seems to have been doing
    so at least since r34008, but it may have started long before then.

------------------------------------------------------------------------
r34102 | kfogel | 2008-11-07 22:34:48 +0100 (Fri, 07 Nov 2008) | 2 lines
Changed paths:
   M /branches/issue-2843-dev
   M /branches/issue-2843-dev/build.conf
   M /branches/issue-2843-dev/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/requirements.txt
   M /branches/issue-2843-dev/subversion
   M /branches/issue-2843-dev/subversion/include
   M /branches/issue-2843-dev/subversion/include/private/svn_auth_private.h
   M /branches/issue-2843-dev/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2843-dev/subversion/libsvn_subr
   M /branches/issue-2843-dev/subversion/tests/cmdline/commit_tests.py
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr
   M /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2843-dev/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2843-dev/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2843-dev/www/development.html
   M /branches/issue-2843-dev/www/issue-tracker.html
   M /branches/issue-2843-dev/www/tasks.html

On the issue-2843-dev branch: bring up-to-date with latest trunk (r34101).

------------------------------------------------------------------------
r34103 | kfogel | 2008-11-07 22:36:06 +0100 (Fri, 07 Nov 2008) | 5 lines
Changed paths:
   M /branches/issue-2843-dev/subversion/tests/cmdline/depth_tests.py

On the issue-2843-dev branch:

* subversion/tests/cmdline/depth_tests.py
  (test_list): Expect excluded_receive_remote_removal to pass now.

------------------------------------------------------------------------
r34104 | kfogel | 2008-11-07 22:42:18 +0100 (Fri, 07 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/commit_tests.py

* subversion/tests/cmdline/commit_tests.py
  (test_list): Expect commit_out_of_date_deletions to fail over ra_svn.
    I'm not sure why it wasn't marked this way originally.  See r34101
    and r34073 for more context; I think there was just a multi-way
    confusion here and that it is now un-confused.

Found by: danielsh
(He noticed my IRC inquiries and pointed out that ra_svn failure persists.)

------------------------------------------------------------------------
r34105 | kfogel | 2008-11-07 22:43:51 +0100 (Fri, 07 Nov 2008) | 2 lines
Changed paths:
   M /branches/issue-2843-dev
   M /branches/issue-2843-dev/build.conf
   M /branches/issue-2843-dev/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/requirements.txt
   M /branches/issue-2843-dev/subversion
   M /branches/issue-2843-dev/subversion/include
   M /branches/issue-2843-dev/subversion/include/private/svn_auth_private.h
   M /branches/issue-2843-dev/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2843-dev/subversion/libsvn_subr
   M /branches/issue-2843-dev/subversion/tests/cmdline/commit_tests.py
   M /branches/issue-2843-dev/subversion/tests/libsvn_subr
   M /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2843-dev/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2843-dev/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2843-dev/www/development.html
   M /branches/issue-2843-dev/www/issue-tracker.html
   M /branches/issue-2843-dev/www/tasks.html

On the issue-2843-dev branch: bring up-to-date with latest trunk (r34104).

------------------------------------------------------------------------
r34106 | danielsh | 2008-11-07 23:28:47 +0100 (Fri, 07 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_repos/fs-wrap.c

Fix issue #3313 by validating all eligible properties (and among them,
svn:author) for being valid UTF-8.

* subversion/libsvn_repos/fs-wrap.c
  (validate_prop):
    Apply the "is UTF-8 and LF" check whenever svn_prop_needs_translation()
    is true (that is the very definition of the latter).
------------------------------------------------------------------------
r34107 | pburba | 2008-11-08 00:41:58 +0100 (Sat, 08 Nov 2008) | 2 lines
Changed paths:
   M /branches/issue-2843-dev/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2843-dev/notes/tree-conflicts/requirements.txt
   M /branches/issue-2843-dev/subversion/include/private/svn_cache.h
   M /branches/issue-2843-dev/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-2843-dev/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2843-dev/www/development.html
   M /branches/issue-2843-dev/www/issue-tracker.html
   M /branches/issue-2843-dev/www/tasks.html

Do a --record-only merge of -r31357:34104 from trunk so this branch will
reintegrate back to trunk cleanly.
------------------------------------------------------------------------
r34108 | pburba | 2008-11-08 04:14:59 +0100 (Sat, 08 Nov 2008) | 16 lines
Changed paths:
   M /trunk
   M /trunk/build.conf
   M /trunk/subversion/include
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/private/svn_cache.h
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_client/commit_util.c
   M /trunk/subversion/libsvn_client/copy.c
   M /trunk/subversion/libsvn_client/diff.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/ra.c
   M /trunk/subversion/libsvn_client/status.c
   M /trunk/subversion/libsvn_client/switch.c
   M /trunk/subversion/libsvn_client/update.c
   M /trunk/subversion/libsvn_repos/reporter.c
   M /trunk/subversion/libsvn_subr
   M /trunk/subversion/libsvn_wc/README
   M /trunk/subversion/libsvn_wc/adm_crawler.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c
   M /trunk/subversion/libsvn_wc/copy.c
   A /trunk/subversion/libsvn_wc/crop.c (from /branches/issue-2843-dev/subversion/libsvn_wc/crop.c:34105)
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/lock.c
   M /trunk/subversion/libsvn_wc/log.c
   M /trunk/subversion/libsvn_wc/props.c
   M /trunk/subversion/libsvn_wc/relocate.c
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/svn/main.c
   M /trunk/subversion/tests/cmdline/depth_tests.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.txt
   M /trunk/subversion/tests/libsvn_subr
   M /trunk/tools/buildbot/slaves/win32-xp-VS2005
   M /trunk/tools/server-side/svn_server_log_parse.py
   M /trunk/tools/server-side/test_svn_server_log_parse.py
   M /trunk/www/development.html
   M /trunk/www/issue-tracker.html
   M /trunk/www/tasks.html

Merge the issue-2843 branch back to trunk.

I wasn't able to use reintegrate, see 
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=145078.  So 
this was done the old-fashioned way, with a 2-URL merge:
http://svn.collab.net/repos/svn/trunk@34105
http://svn.collab.net/repos/svn/branches/issue-2843-dev@34105.

Note: This merge added mergeinfo on the subversion directory.  This
mergeinfo originated in r31940 on the issue-2843 branch, but there is no
obvious reason why it was there.  r31940 was a merge of r31359-31939 from
trunk, but there is no mergeinfo diff between those revs, so where this came
from is a complete mystery.  In that light I removed this mergeinfo prior to
the commit.


------------------------------------------------------------------------
r34109 | pburba | 2008-11-08 04:33:30 +0100 (Sat, 08 Nov 2008) | 1 line
Changed paths:
   D /branches/issue-2843-dev

Deleting the issue-2843-dev branch, it was merged back to trunk in r34108.
------------------------------------------------------------------------
r34110 | jwhitlock | 2008-11-08 07:14:54 +0100 (Sat, 08 Nov 2008) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/auth.c

* subversion/libsvn_subr/auth.c: Include svn_dso.h.  Follow-up to r34085.

------------------------------------------------------------------------
r34111 | pynoos | 2008-11-08 15:39:51 +0100 (Sat, 08 Nov 2008) | 2 lines
Changed paths:
   M /trunk/subversion/po/ko.po

 * subversion/po/ko.po: More work in korean translation (133 untranslated messages remained)

------------------------------------------------------------------------
r34112 | steveking | 2008-11-08 16:43:39 +0100 (Sat, 08 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/util.c

Initialize all members when creating a svn_wc_conflict_description_t struct.

* subversion/libsvn_wc/util.c
  (svn_wc_conflict_description_create_tree): Use apr_pcalloc instead
    of apr_palloc to allocate memory.
------------------------------------------------------------------------
r34113 | kfogel | 2008-11-09 03:03:33 +0100 (Sun, 09 Nov 2008) | 4 lines
Changed paths:
   M /trunk/www/links.html

* www/links.html (hosting): Fix Assembla entry.

Found by: Ryan Holbrook <rholbrook1@gmail.com>

------------------------------------------------------------------------
r34114 | arfrever | 2008-11-09 16:13:57 +0100 (Sun, 09 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/include/svn_dirent_uri.h
   M /trunk/subversion/include/svn_fs.h
   M /trunk/subversion/include/svn_opt.h
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_dirent_uri.h:
* subversion/include/svn_fs.h:
* subversion/include/svn_opt.h:
* subversion/include/svn_wc.h: Place function types on separate lines.

------------------------------------------------------------------------
r34115 | arfrever | 2008-11-09 17:47:50 +0100 (Sun, 09 Nov 2008) | 24 lines
Changed paths:
   M /trunk/subversion/include/svn_auth.h
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_ra_neon/session.c
   M /trunk/subversion/libsvn_ra_serf/serf.c
   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

Improve names and values of 2 definitions.

* subversion/include/svn_auth.h
  (SVN_AUTH_PARAM_CONFIG_CATEGORY_CONFIG): Renamed from
   SVN_AUTH_PARAM_CONFIG_CLIENT.
  (SVN_AUTH_PARAM_CONFIG_CATEGORY_SERVERS): Renamed from
   SVN_AUTH_PARAM_CONFIG.
  (SVN_AUTH_PARAM_CONFIG): Provide for compatibility with the 1.5 API.
  (SVN_AUTH_CRED_SIMPLE, SVN_AUTH_CRED_SSL_CLIENT_CERT,
   SVN_AUTH_CRED_SSL_CLIENT_CERT_PW, SVN_AUTH_CRED_SSL_SERVER_TRUST): Update
   documentation.
* subversion/libsvn_auth_kwallet/kwallet.cpp
  (get_wallet_name):
* subversion/libsvn_ra_neon/session.c
  (svn_ra_neon__open):
* subversion/libsvn_ra_serf/serf.c
  (load_config):
* subversion/libsvn_subr/simple_providers.c
  (svn_auth__simple_first_creds_helper, prompt_for_simple_creds):
* subversion/libsvn_subr/ssl_client_cert_providers.c
  (ssl_client_cert_file_first_credentials):
* subversion/libsvn_subr/ssl_client_cert_pw_providers.c
  (svn_auth__ssl_client_cert_pw_file_first_creds_helper): Update.

------------------------------------------------------------------------
r34116 | arfrever | 2008-11-09 18:08:37 +0100 (Sun, 09 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/svn/log-cmd.c

* subversion/svn/log-cmd.c
  (log_entry_receiver): Mark 2 strings for translation.

------------------------------------------------------------------------
r34117 | neels | 2008-11-10 03:34:12 +0100 (Mon, 10 Nov 2008) | 23 lines
Changed paths:
   A /branches/tc-resolve (from /trunk:34116)

Creating lightweight branch tc-resolve.
Aim: to fix some tree-conflicts resolve semantics.

Quoting julianf (mentioned patch will be checked in next):

It would be great if you could advance the per-victim semantics, by
making "svn resolved" work per victim.

I recommend first converting "svn revert" or "svn info" (or both) to use
svn_wc__walk_entries_and_tc(), and check that they still work, to prove
that that new walker function works. "svn revert" and "svn info"
currently both do their own recursion in order to get correct per-victim
behaviour.

Then convert "svn resolved" to use it. The attached patch mostly does
this, but there's still a problem with it trying to get the adm_access
for an unversioned dir, the same kind of error you pointed out for me a
few days ago. update_tests 15 shows that error ("warning: Directory
                                                '[...]/A/D/G' is missing").
Another error shows up in
tree_conflict_tests.py 1: it fails to resolve a tree conflict.


------------------------------------------------------------------------
r34118 | neels | 2008-11-10 03:39:10 +0100 (Mon, 10 Nov 2008) | 27 lines
Changed paths:
   M /branches/tc-resolve/subversion/libsvn_wc/adm_ops.c
   M /branches/tc-resolve/subversion/tests/cmdline/log_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/update_tests.py

On *lightweight* branch: tc-resolve
*** Checking in julianf's current patch state. ***

Make "resolved" handle tree conflicts per victim rather than per parent.

### update_tests.py 15 fails
### tree_conflict_tests.py all tests fail

* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_entry): Do not clear tree conflicts that are recorded
    in this entry. Do not send a notification, but instead report (through a
    new boolean output parameter) whether something was resolved.
  (resolve_found_entry_callback): Resolve any tree conflict for this victim.
    Send a notification if any conflict was resolved.
  (svn_wc_resolved_conflict4): Use an entries-walker function that visits
    unversioned tree conflict victims as well as ordinary entries.

* subversion/tests/cmdline/log_tests.py
  (merge_history_repos): Resolve the victim, not the parent.

* subversion/tests/cmdline/tree_conflict_tests.py
  (ensure_tree_conflict): Resolve the victim, not the parent.

* subversion/tests/cmdline/update_tests.py
  (another_hudson_problem): Resolve the victim, not the parent.


------------------------------------------------------------------------
r34119 | neels | 2008-11-10 06:00:23 +0100 (Mon, 10 Nov 2008) | 25 lines
Changed paths:
   M /branches/tc-resolve/subversion/libsvn_wc/adm_ops.c
   M /branches/tc-resolve/subversion/libsvn_wc/entries.c
   M /branches/tc-resolve/subversion/libsvn_wc/tree_conflicts.c

On *lightweight* branch tc-resolve:

Allow sched-deleted nodes to be resolved (fixes update_tests.py 15).
Also avoid a segmentation fault when svn_wc__loggy_del_tree_conflict() didn't
write anything to the log.

* subversion/libsvn_wc/adm_ops.c
  (resolve_found_entry_callback):
    Allow sched-deleted nodes to be resolved.
    Comment a debugging printf that would fail update_tests.py 15.
    ### Have some other debugging printfs, have to be removed again.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_found_entry): 
    Only try to retrieve the ADM_ACCESS in presence of tree-conflicts.
  (visit_tc_too_error_handler): 
    Get the ADM_ACCESS on the parent instead of on the node itself, thus
    avoid an error upon an unversioned tree-conflict victim.
    ### TODO: check for greater subdir depths.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__del_tree_conflict): 
    Only write and run the log if LOG_ACCUM is not NULL.


------------------------------------------------------------------------
r34120 | neels | 2008-11-10 06:42:22 +0100 (Mon, 10 Nov 2008) | 28 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/diff.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/repos_diff.c
   M /trunk/subversion/libsvn_wc/deprecated.c

Undo r34018 which removed the dir_closed() diff callback from
svn_wc_diff_callbacks3_t. The dir_closed() callback will, after all, be
needed to be able to notify about an added directory with property
modifications. This is done  in wise foresight (cough) of the new
"diff --summarize" implementation waiting on branch diff-repos-wc.
Note that the dir_closed() callback is currently never used, and that
the code in subversion/libsvn_client/diff.c still fails to call dir_opened()
and dir_closed() callbacks altogether.

* subversion/include/svn_wc.h (svn_wc_diff_callbacks3_t):
    Re-add the dir_closed() diff callback.

* subversion/libsvn_client/merge.c
  (merge_dir_closed): Re-add this diff callback.
  (merge_callbacks): Re-add use of merge_dir_closed().

* subversion/libsvn_client/diff.c
  (diff_dir_closed): Re-add this diff callback.
  (svn_client_diff4, svn_client_diff_peg4): Re-add use of diff_dir_closed().

* subversion/libsvn_client/repos_diff.c (close_directory):
    Call the dir_closed() callback again.

* subversion/libsvn_wc/deprecated.c
  (dir_closed, callbacks_wrapper, callbacks2_wrapper):
    Apply re-addition of dir_closed() diff callback.


------------------------------------------------------------------------
r34121 | neels | 2008-11-10 07:30:27 +0100 (Mon, 10 Nov 2008) | 32 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/diff.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/repos_diff.c
   M /trunk/subversion/libsvn_wc/deprecated.c

Mend the re-addition of the dir_closed callback into
svn_wc_diff_callbacks3_t. Principally, there's a need for this callback
to be able to notify all changes at once on a directory. Thus, put
dir_closed() in a position to give complete notification information.
Anticipating to return svn_wc_notify_state_unknown in other callback
functions to skip notification there if needed, to return a complete state
via dir_closed().

The callers of the diff callbacks don't handle that yet, though. Future
users of dir_closed() will determine detailed behaviour and still have to
implement it.

* subversion/include/svn_wc.h
  (svn_wc_diff_callbacks3_t): Have both *CONTENTSTATE and *PROPSTATE return
    values in the function signature. Fix the comment.

* subversion/libsvn_client/repos_diff.c
  (close_directory):
    Apply dir_closed() signature change. Don't pass any pointers to
    dir_closed() yet, to avoid overwriting previous states. Future
    users of dir_closed() will have to decide what to do here.

* subversion/libsvn_client/diff.c
  (diff_dir_closed): Apply dir_closed() signature change. 

* subversion/libsvn_client/merge.c
  (merge_dir_closed): Apply dir_closed() signature change. 

* subversion/libsvn_wc/deprecated.c
  (dir_closed): Apply dir_closed() signature change. 


------------------------------------------------------------------------
r34122 | julianfoad | 2008-11-10 12:02:05 +0100 (Mon, 10 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/log.c
   M /trunk/subversion/libsvn_wc/log.h

Rename a function parameter for clarity.

* subversion/libsvn_wc/log.c,
  subversion/libsvn_wc/log.h
  (svn_wc__loggy_entry_modify): Rename 'name' to 'path', because it is a path.

------------------------------------------------------------------------
r34123 | julianfoad | 2008-11-10 12:28:14 +0100 (Mon, 10 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_wc/tree_conflicts.h

Doc string corrections and additions.

* subversion/include/svn_wc.h
  (svn_wc_add_tree_conflict): Warn that it doesn't update the cached entry.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__loggy_add_tree_conflict): Correct a cross-reference.
  (svn_wc__del_tree_conflict): Warn that it doesn't update the cached
    entry. State more clearly that the adm access baton must be for the
    parent directory. State a successful return code when nothing happens.

------------------------------------------------------------------------
r34124 | julianfoad | 2008-11-10 13:17:22 +0100 (Mon, 10 Nov 2008) | 1 line
Changed paths:
   M /branches/tc-resolve
   M /branches/tc-resolve/build.conf
   M /branches/tc-resolve/notes/tree-conflicts/design-overview.txt
   M /branches/tc-resolve/notes/tree-conflicts/requirements.txt
   M /branches/tc-resolve/subversion/include
   M /branches/tc-resolve/subversion/include/private/svn_auth_private.h
   M /branches/tc-resolve/subversion/include/svn_wc.h
   M /branches/tc-resolve/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/tc-resolve/subversion/libsvn_client/diff.c
   M /branches/tc-resolve/subversion/libsvn_client/merge.c
   M /branches/tc-resolve/subversion/libsvn_client/repos_diff.c
   M /branches/tc-resolve/subversion/libsvn_subr
   M /branches/tc-resolve/subversion/libsvn_wc/deprecated.c
   M /branches/tc-resolve/subversion/libsvn_wc/log.c
   M /branches/tc-resolve/subversion/libsvn_wc/log.h
   M /branches/tc-resolve/subversion/libsvn_wc/tree_conflicts.h
   M /branches/tc-resolve/subversion/tests/libsvn_subr
   M /branches/tc-resolve/tools/server-side/svn_server_log_parse.py
   M /branches/tc-resolve/tools/server-side/test_svn_server_log_parse.py
   M /branches/tc-resolve/www/development.html
   M /branches/tc-resolve/www/issue-tracker.html
   M /branches/tc-resolve/www/tasks.html

On the tc-resolve branch: Merge changes from trunk up to r34123.
------------------------------------------------------------------------
r34125 | hwright | 2008-11-10 16:10:26 +0100 (Mon, 10 Nov 2008) | 13 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/util.c
   M /trunk/subversion/svn/notify.c
   M /trunk/subversion/svnlook/main.c
   M /trunk/subversion/tests/libsvn_subr/translate-test.c

Fix some warnings regarding the use of non-literal format strings.  For a brief
discussion on this, see: http://svn.haxx.se/dev/archive-2008-11/0328.shtml

* subversion/mod_dav_svn/util.c
  (dav_svn__sanitize_error),
* subversion/tests/libsvn_subr/translate-test.c
  (create_file),
* subversion/svn/notify.c
  (print_conflict_stats),
* subversion/svnlook/main.c
  (print_diff_tree):
  Add a string literal format when directly printing a string variable.

------------------------------------------------------------------------
r34126 | gstein | 2008-11-10 16:23:43 +0100 (Mon, 10 Nov 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

Fine weather today.

------------------------------------------------------------------------
r34127 | julianfoad | 2008-11-10 16:25:43 +0100 (Mon, 10 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c

* subversion/libsvn_wc/entries.c
  (visit_tc_too_error_handler): Tweak a comment.

------------------------------------------------------------------------
r34128 | julianfoad | 2008-11-10 17:24:22 +0100 (Mon, 10 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

Fix Doxygen mark-up.

* subversion/include/svn_wc.h
  (svn_wc_conflicted_p2): '@path' -> '@a path'.

------------------------------------------------------------------------
r34129 | julianfoad | 2008-11-10 17:31:15 +0100 (Mon, 10 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_entry_t): Explain the 'deleted' flag better.

Thanks to gstein and cmpilato for helping to explain it to me.

------------------------------------------------------------------------
r34130 | arfrever | 2008-11-10 17:39:54 +0100 (Mon, 10 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

Don't reopen already opened wallet.

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (wallet): New.
  (kwallet_password_get, kwallet_password_set): Open wallet only when wallet
   wasn't opened earlier.
  (kwallet_disconnect): New.

------------------------------------------------------------------------
r34131 | rhuijben | 2008-11-10 18:00:10 +0100 (Mon, 10 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/include/private/svn_fs_util.h
   M /trunk/subversion/libsvn_fs_base/tree.c
   M /trunk/subversion/libsvn_fs_fs/tree.c

Convert repository path in SVN_ERR_FS_ALREADY_EXISTS template to local style.

* subversion/include/private/svn_fs_util.h
  (SVN_FS__ALREADY_EXISTS): Add pool argument to allow translating repository 
    path to local style.

* subversion/libsvn_fs_base/tree.c
  (txn_body_make_dir, txn_body_make_file)
* subversion/libsvn_fs_fs/tree.c
  (fs_make_dir, fs_make_file): Pass valid pool to SVN_FS__ALREADY_EXISTS.

------------------------------------------------------------------------
r34132 | rhuijben | 2008-11-10 18:14:36 +0100 (Mon, 10 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/include/private/svn_fs_util.h

* subversion/include/private/svn_fs_util.h
  (SVN_FS__ALREADY_EXISTS): Following up on r34131, actually use the pool
    argument for the path conversion.

------------------------------------------------------------------------
r34133 | neels | 2008-11-11 05:04:21 +0100 (Tue, 11 Nov 2008) | 35 lines
Changed paths:
   M /branches/tc-resolve/subversion/include/svn_client.h
   M /branches/tc-resolve/subversion/libsvn_client/resolved.c
   M /branches/tc-resolve/subversion/libsvn_wc/adm_ops.c
   M /branches/tc-resolve/subversion/libsvn_wc/tree_conflicts.c
   M /branches/tc-resolve/subversion/libsvn_wc/tree_conflicts.h

On *lightweight* branch tc-resolve:

Fix per-victim "resolved" on directory tree-conflict victims.

* subversion/libsvn_client/resolved.c
  (svn_client_resolve):
    Get the ADM_ACCESS on the target's parent directory to be able to resolve
    tree-conflicted directories. Extend the ADM_LOCK_LEVEL to still be able
    to lock the target node for text/prop conflicts.

* subversion/include/svn_client.h
  (svn_client_resolve): Comment.

* subversion/libsvn_wc/adm_ops.c
  (resolve_found_entry_callback): 
    Completely split tree-conflict resolution from text and prop conflicts,
    because tree-conflicts need a different ADM_ACCESS when handling
    directories. Change use of RESOLVED to already reflect the sanity-check,
    and sanity-check separately for tree-conflicts. Clarify some conditions.
    Also remove the debugging conditions that exited prematurely.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__loggy_del_tree_conflict):
    Extend an assertion by a NULL check. Add another assertion to make sure
    the VICTIM_PATH is a child node of the ADM_ACCESS' path.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__loggy_add_tree_conflict,
   svn_wc__loggy_del_tree_conflict,
   svn_wc__del_tree_conflict,
   svn_wc__write_tree_conflicts_to_entry,
   svn_wc__tree_conflict_exists):
    Comments, add "@since New in 1.6.".


------------------------------------------------------------------------
r34134 | psamuelson | 2008-11-11 06:00:22 +0100 (Tue, 11 Nov 2008) | 6 lines
Changed paths:
   M /trunk/contrib/hook-scripts/commit-email.pl.in

* contrib/hook-scripts/commit-email.pl.in
  (toplevel): test '$stdout', not 'defined $stdout';
   the latter is always true here.

Patch by: Michiel Holtkamp <michiel@elfstone.nl>

------------------------------------------------------------------------
r34135 | julianfoad | 2008-11-11 16:09:42 +0100 (Tue, 11 Nov 2008) | 13 lines
Changed paths:
   M /branches/tc-resolve/subversion/libsvn_client/resolved.c
   M /branches/tc-resolve/subversion/libsvn_wc/adm_ops.c
   M /branches/tc-resolve/subversion/tests/cmdline/commit_tests.py

On the 'tc-resolve' branch:
Continue with resolving per victim.

* subversion/libsvn_client/resolved.c
  Include a required header file.
  (svn_client_resolve): Correct the levels-to-lock calculation.

* subversion/libsvn_wc/adm_ops.c
  (resolve_found_entry_callback): Remove an unused variable.

* subversion/tests/cmdline/commit_tests.py
  (tree_conflicts_resolved): Adjust for resolving per victim.

------------------------------------------------------------------------
r34136 | arfrever | 2008-11-11 16:21:37 +0100 (Tue, 11 Nov 2008) | 13 lines
Changed paths:
   M /trunk/subversion/libsvn_client/switch.c
   M /trunk/subversion/libsvn_subr/io.c
   M /trunk/subversion/libsvn_wc/crop.c
   M /trunk/subversion/svn/main.c

Improve some messages.

* subversion/libsvn_client/switch.c
  (svn_client__switch_internal): 's/Can not/Cannot/'.

* subversion/libsvn_wc/crop.c
  (svn_wc_crop_tree): Don't end error messages with '.'.

* subversion/libsvn_subr/io.c
  (entry_name_to_utf8):
* subversion/svn/main.c
  (main): 's/UTF8/UTF-8/'.

------------------------------------------------------------------------
r34137 | julianfoad | 2008-11-11 17:30:28 +0100 (Tue, 11 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_authz_tests.py

* subversion/tests/cmdline/merge_authz_tests.py
  (mergeinfo_and_skipped_paths): Tweak tree conflict expectations so it passes.

------------------------------------------------------------------------
r34138 | julianfoad | 2008-11-11 18:33:53 +0100 (Tue, 11 Nov 2008) | 8 lines
Changed paths:
   M /branches/tc-resolve/subversion/libsvn_wc/entries.c
   M /branches/tc-resolve/subversion/libsvn_wc/wc.h

Make the tree-conflict-enabled WC walker cope with an unversioned target.
This fixes the single test that was failing, commit_tests.py 60.

* subversion/libsvn_wc/entries.c,
  subversion/libsvn_wc/wc.h
  (svn_wc__walk_entries_and_tc): Allow the target to be unversioned, and
    allow adm_access to be null.

------------------------------------------------------------------------
r34139 | julianfoad | 2008-11-11 19:09:54 +0100 (Tue, 11 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/include/private/svn_fs_util.h

Fix a compile error introduced in r34131.

* subversion/include/private/svn_fs_util.h
  (SVN_FS__ALREADY_EXISTS): Remove a duplicated argument.

------------------------------------------------------------------------
r34140 | julianfoad | 2008-11-11 19:14:00 +0100 (Tue, 11 Nov 2008) | 2 lines
Changed paths:
   M /branches/tc-resolve
   M /branches/tc-resolve/TODO-1.6
   M /branches/tc-resolve/build.conf
   M /branches/tc-resolve/contrib/hook-scripts/commit-email.pl.in
   M /branches/tc-resolve/notes/tree-conflicts/design-overview.txt
   M /branches/tc-resolve/notes/tree-conflicts/requirements.txt
   M /branches/tc-resolve/subversion/include
   M /branches/tc-resolve/subversion/include/private/svn_auth_private.h
   M /branches/tc-resolve/subversion/include/private/svn_fs_util.h
   M /branches/tc-resolve/subversion/include/svn_wc.h
   M /branches/tc-resolve/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/tc-resolve/subversion/libsvn_client/switch.c
   M /branches/tc-resolve/subversion/libsvn_fs_base/tree.c
   M /branches/tc-resolve/subversion/libsvn_fs_fs/tree.c
   M /branches/tc-resolve/subversion/libsvn_subr
   M /branches/tc-resolve/subversion/libsvn_subr/io.c
   M /branches/tc-resolve/subversion/libsvn_wc/crop.c
   M /branches/tc-resolve/subversion/libsvn_wc/entries.c
   M /branches/tc-resolve/subversion/mod_dav_svn/util.c
   M /branches/tc-resolve/subversion/svn/main.c
   M /branches/tc-resolve/subversion/svn/notify.c
   M /branches/tc-resolve/subversion/svnlook/main.c
   M /branches/tc-resolve/subversion/tests/cmdline/merge_authz_tests.py
   M /branches/tc-resolve/subversion/tests/libsvn_subr
   M /branches/tc-resolve/subversion/tests/libsvn_subr/translate-test.c
   M /branches/tc-resolve/tools/server-side/svn_server_log_parse.py
   M /branches/tc-resolve/tools/server-side/test_svn_server_log_parse.py
   M /branches/tc-resolve/www/development.html
   M /branches/tc-resolve/www/issue-tracker.html
   M /branches/tc-resolve/www/tasks.html

On the tc-resolve branch: Merge changes from trunk up to r34139.

------------------------------------------------------------------------
r34141 | arfrever | 2008-11-11 19:32:47 +0100 (Tue, 11 Nov 2008) | 23 lines
Changed paths:
   M /trunk/configure.ac
   M /trunk/subversion/svn/info-cmd.c
   M /trunk/subversion/svn/log-cmd.c
   M /trunk/subversion/svn_private_config.hw
   M /trunk/subversion/svnadmin/main.c
   M /trunk/subversion/svndumpfilter/main.c
   M /trunk/subversion/svnlook/main.c
   M /trunk/tools/po/po-update.sh

Use dngettext() for messages which require special handling of plural forms.

See http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html

* configure.ac
  (Q_): Define.
* subversion/svn_private_config.hw
  (Q_): Define.

* subversion/svn/info-cmd.c
  (print_info):
* subversion/svn/log-cmd.c
  (log_entry_receiver):
* subversion/svnadmin/main.c
  (subcommand_lslocks):
* subversion/svndumpfilter/main.c
  (do_filter):
* subversion/svnlook/main.c
  (subcommand_lock): Use Q_().

* tools/po/po-update.sh
  (make_pot): Update call to xgettext.

------------------------------------------------------------------------
r34142 | arfrever | 2008-11-11 19:40:43 +0100 (Tue, 11 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/po/pl.po

Polish translation update.

* subversion/po/pl.po: Polish translation update.

------------------------------------------------------------------------
r34143 | hwright | 2008-11-11 20:07:28 +0100 (Tue, 11 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_subr/sqlite.c

Add sqlite helper functions for transaction handling.

* subversion/include/private/svn_sqlite.h,
  subversion/libsvn_subr/sqlite.c
  (svn_sqlite__transaction_begin, svn_sqlite__transaction_commit,
   svn_sqlite__transaction_rollback): New.

------------------------------------------------------------------------
r34144 | hwright | 2008-11-11 20:31:48 +0100 (Tue, 11 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Followup to r34088: enable rep-sharing by default on FSFS.  For disscussion on
this topic, see: http://svn.haxx.se/dev/archive-2008-11/0227.shtml

* subversion/libsvn_fs_fs/fs_fs.c
  (write_config): Change the default for enabling rep-sharing to "true".

------------------------------------------------------------------------
r34145 | arfrever | 2008-11-11 20:39:17 +0100 (Tue, 11 Nov 2008) | 11 lines
Changed paths:
   M /trunk/configure.ac
   M /trunk/subversion/svn_private_config.hw
   M /trunk/www/hacking.html

Follow-up to r34141:

* www/hacking.html
  (l10n): Document Q_().

* configure.ac
  (Q_):
* subversion/svn_private_config.hw
  (Q_): Add parenthesis around definition for consistency with definitions
   of other macros.

------------------------------------------------------------------------
r34146 | hwright | 2008-11-11 20:46:27 +0100 (Tue, 11 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/fs_fs.c
  (write_config): Fix typo in the fsfs.conf file.

------------------------------------------------------------------------
r34147 | hwright | 2008-11-11 21:19:26 +0100 (Tue, 11 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

For FSFS rep-sharing: use SQLite transactions to ensure we don't commit bogus
representations to the rep cache.

* subversion/libsvn_fs_fs/fs_fs.c
  (commit_body): Wrap with sqlite transaction handling.

------------------------------------------------------------------------
r34148 | hwright | 2008-11-11 21:20:55 +0100 (Tue, 11 Nov 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove a todone item.

------------------------------------------------------------------------
r34149 | arfrever | 2008-11-11 21:53:51 +0100 (Tue, 11 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

Don't use deprecated functions in JavaHL.

* subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::getContext): Use svn_auth_get_simple_provider2() instead of
   svn_auth_get_simple_provider(). Use
   svn_auth_get_ssl_client_cert_pw_file_provider2() instead of
   svn_auth_get_ssl_client_cert_pw_file_provider().

------------------------------------------------------------------------
r34150 | arfrever | 2008-11-11 23:26:47 +0100 (Tue, 11 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (kwallet_disconnect): Delete this evil, unpredictable function.

------------------------------------------------------------------------
r34151 | arfrever | 2008-11-12 01:40:57 +0100 (Wed, 12 Nov 2008) | 9 lines
Changed paths:
   M /trunk/configure.ac
   M /trunk/subversion/svn_private_config.hw

Follow-up to r34145:

* configure.ac
  (Q_):
* subversion/svn_private_config.hw
  (Q_): Add additional parenthesis.

Suggested by: julianfoad

------------------------------------------------------------------------
r34152 | gstein | 2008-11-12 06:47:14 +0100 (Wed, 12 Nov 2008) | 41 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c
   M /trunk/subversion/libsvn_subr/io.c
   M /trunk/subversion/libsvn_subr/subst.c
   M /trunk/subversion/libsvn_wc/props.c

Fix the invocations of svn_io_write_unique(). The docstring states that a
directory path should be passed, but all callers were passing a file
pathname. This happened to work because of the internal implementation,
but broke after some refactoring.

Note: for now, the callers just use svn_path_dirname() to get the
directory name of whatever filepath they were about to pass. I assume
optimizations could be made later to have the dirpath handy.

Some internal changes were made to io.c as part of an upcoming change
around the (soon to be) deprecated svn_io_open_unique_file2() API. These
are documented here (insofar as they changed), but not in the API docs at
this time. It is these changes which discovered the bad call pattern to
svn_io_write_unique().

* subversion/libsvn_subr/io.c:
  (svn_io_open_unique_file2): the implementation was renamed to ...
  (svn_io_open_uniquely_named): ... this. the PATH parameter was broken up
    into a directory path and the filename in that directory. the single
    pool parameter was split into result and scratch pools. as a temp
    measure, the old parameter names are now local variables,
    reconstituted from the new params, in order to minimize change.
  (svn_io_open_unique_file3): new function similar to
    svn_stream_open_unique, but returns a plain file.
  (svn_io_open_unique_file2): new implementation for the original
    function, which simply calls svn_io_open_uniquely_named() with the
    appropriate set of parameters.
  (svn_io_open_unique_file): just param name changes. no functional change.
  (svn_io_write_unique): simplify, in terms of svn_io_open_unique_file3.
  (svn_io_file_move): add period to suffix in call to the
    svn_io_open_unique_file2() function.
  (svn_io_write_version_file): pass dirpath to svn_io_write_unique

* subversion/libsvn_subr/subst.c:
  (create_special_file_from_stringbuf): ...
* subversion/libsvn_wc/props.c:
  (maybe_generate_propconflict): ...
* subversion/libsvn_fs_fs/fs_fs.c:
  (write_format, get_and_increment_txn_key_body, write_current): pass
    dirpath to svn_io_write_unique

------------------------------------------------------------------------
r34153 | neels | 2008-11-12 07:01:26 +0100 (Wed, 12 Nov 2008) | 30 lines
Changed paths:
   M /branches/tc-resolve/subversion/libsvn_wc/entries.c
   M /branches/tc-resolve/subversion/tests/cmdline/depth_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/tree_conflict_tests.py

On branch tc-resolve:

Fix the behaviour of "resolved" that descends into unversioned
tree-conflicts even if the depth doesn't allow that.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_baton_t): Add TARGET and DEPTH fields.
  (visit_tc_too_found_entry):
    Use new TARGET and DEPTH fields in the baton to determine whether to
    descend into unversioned tree-conflicted children of a directory.
  (svn_wc__walk_entries_and_tc): Supply TARGET and DEPTH to the baton.

* subversion/tests/cmdline/tree_conflict_tests.py
  (ensure_tree_conflict): 
    Make a "resolved" test also try run "resolved" on the victim's
    parent first, to make sure it doesn't resolve its children.
    Remove comment about not supporting "resolved" per victim.

* subversion/tests/cmdline/depth_tests.py
  (tree_conflicts_resolved_depth_empty, tree_conflicts_resolved_depth_files,
   tree_conflicts_resolved_depth_immediates,
   tree_conflicts_resolved_depth_infinity, make_depth_tree_conflicts):
    Four new tests and a helper. The tests are XFAIL because the helper
    make_depth_tree_conflicts() exposes an error in update code that
    is not related to "resolved". Separate trials suggest that these
    tests will pass as soon as the update issue is resolved. See
    inline comment in make_depth_tree_conflicts() marked "##".
  (test_list): Add the new tests.


------------------------------------------------------------------------
r34154 | gstein | 2008-11-12 11:27:47 +0100 (Wed, 12 Nov 2008) | 21 lines
Changed paths:
   M /trunk/subversion/include/svn_io.h
   M /trunk/subversion/libsvn_subr/io.c
   M /trunk/subversion/libsvn_subr/stream.c

Update the implementation of svn_io_open_uniquely_named(), document it,
and also document the new svn_io_open_unique_file3().

svn_io_open_unique_file2() is deprecated by svn_io_open_uniquely_named().

* subversion/include/svn_io.h:
  (svn_io_open_uniquely_named): new function. docstring is derived from
    the old svn_io_open_unique_file2() docco.
  (svn_io_open_unique_file3): new function
  (svn_io_open_unique_file2): deprecated

* subversion/libsvn_subr/io.c:
  (svn_io_open_uniquely_named): update param names. do the right thing
    when dirpath, filename, and/or suffix are NULL. allocate stuff in the
    correct pool.
  (svn_io_open_unique_file3): special handling for NULL dirpath is no
    longer needed since uniquely_named does it now.

*subversion/libsvn_subr/stream.c:
  (svn_stream_open_unique): simplify with svn_io_open_unique_file3.

------------------------------------------------------------------------
r34155 | gstein | 2008-11-12 11:40:33 +0100 (Wed, 12 Nov 2008) | 34 lines
Changed paths:
   M /trunk/subversion/libsvn_client/blame.c
   M /trunk/subversion/libsvn_client/commit.c
   M /trunk/subversion/libsvn_client/export.c
   M /trunk/subversion/libsvn_client/repos_diff.c
   M /trunk/subversion/libsvn_ra_neon/util.c
   M /trunk/subversion/libsvn_repos/dump.c
   M /trunk/subversion/libsvn_repos/hooks.c
   M /trunk/subversion/libsvn_repos/reporter.c
   M /trunk/subversion/libsvn_wc/adm_files.c
   M /trunk/subversion/libsvn_wc/diff.c
   M /trunk/subversion/libsvn_wc/translate.c

Switch some uses of svn_io_open_unique_file2 over to open_unique_file3.
One case of switching to svn_stream_open_unique.

* subversion/libsvn_wc/adm_files.c:
  (svn_wc_create_tmp_file2): ...
* subversion/libsvn_wc/translate.c:
  (svn_wc_translated_file2): ...
* subversion/libsvn_wc/diff.c:
  (get_empty_file): ...
* subversion/libsvn_client/repos_diff.c:
  (create_empty_file): ...
* subversion/libsvn_client/blame.c:
  (file_rev_handler): ...
* subversion/libsvn_client/commit.c:
  (send_file_contents): ...
* subversion/libsvn_ra_neon/util.c:
  (parsed_request): ...
* subversion/libsvn_repos/reporter.c:
  (svn_repos_begin_report2): ...
* subversion/libsvn_repos/dump.c:
  (store_delta): ...
* subversion/libsvn_repos/hooks.c:
  (create_temp_file): ... switch to use svn_io_open_unique_file3() and
    simplify surrounding code, as appropriate.

* subversion/libsvn_client/export.c:
  (struct file_baton): store a stream rather than a file
  (window_handler): switch to svn_io_remove_file() since our path is in
    the internal style, and not appropriate for passing to APR.
  (apply_textdelta): open a unique stream rather than a file, and make
    sure to disown it before passing it along to svn_txdelta_apply().
  (close_file): close the stream, rather than the file.
  (svn_client_export4): open a unique stream instead of a file.

------------------------------------------------------------------------
r34156 | gstein | 2008-11-12 11:57:56 +0100 (Wed, 12 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/merge.c

Update the 600 line svn_wc__merge_internal. SIX HUNDRED LINES. It used
the old svn_io_open_unique_file2 seven times; these have been replaced by
calls to the new svn_io_open_uniquely_named(). We want the merge (unique)
files to have particular names.

* subversion/libsvn_wc/merge.c:
  (svn_wc__merge_internal): switch to uniquely_named

------------------------------------------------------------------------
r34157 | julianfoad | 2008-11-12 17:32:39 +0100 (Wed, 12 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Update.
------------------------------------------------------------------------
r34158 | sbutler | 2008-11-12 18:08:35 +0100 (Wed, 12 Nov 2008) | 92 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/cmdline/commit_tests.py
   M /trunk/subversion/tests/cmdline/info_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/svntest/tree.py
   M /trunk/subversion/tests/cmdline/switch_tests.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

Fix update/switch to skip all tree conflict victims and their
descendants.  Skip both newly-discovered and existing tree conflicts.

Create only one tree conflict at the root of each conflicted tree, not
a tree conflict in every directory.

Notify the user just once about any given tree conflict if the target
contains a tree conflict, is itself tree-conflicted, or is inside a
tree conflict.

Tweak test expectations to reflect these new features.  Add tests that
run update/switch in trees that already contain tree conflict victims.
Add tests that chdir into conflicted trees and attempt to update/switch.


* subversion/libsvn_wc/update_editor.c
  (edit_baton): Add field current_tree_conflict.
  (make_editor): Initialize new field.
  (dir_baton): Remove unused field tree_conflicted.
  (make_dir_baton): Track field removal.
  (open_root): TODO comment, for now.
  (check_tree_conflict): Thin out the comments a bit.  Remove useless
   checks for entry validity.  Remove the redundant (delete:obstructed)
   and (delete:missing) conflicts.
  (already_in_a_tree_conflict): New function.
  (do_entry_deletion
   add_directory,
   open_directory,
   add_file,
   open_file): Skip the operation if there is an existing or new tree
   conflict.  Notify the user once per tree conflict.
  (close_directory): Unset current_tree_conflict when returning to
   the victim dir.  Don't notify about tree conflicts.
  (complete_directory): Do nothing if inside a tree conflict.

* subversion/tests/cmdline/update_tests.py
  (update_deleted_missing_dir,
   another_hudson_problem): Don't treat a missing item as a tree
   conflict.
  (update_delete_modified_files,
   tree_conflicts_on_update_1_1,
   tree_conflicts_on_update_1_2,
   tree_conflicts_on_update_2_1,
   tree_conflicts_on_update_2_2,
   tree_conflicts_on_update_3): Tweak expected output and disk to
   reflect the consistent skipping.
  (tree_conflicts_on_update_2_3): New test function.
  (test_list): Add the new test function, make it XFail().

* subversion/tests/cmdline/switch_tests.py
  (failed_anchor_is_target,
   switch_with_obstructing_local_adds,
   tree_conflicts_on_switch_1_1,
   tree_conflicts_on_switch_1_2,
   tree_conflicts_on_switch_2_1,
   tree_conflicts_on_switch_2_2,
   tree_conflicts_on_switch_3): Tweak expected output and disk to
   reflect the consistent skipping.
  (test_list): XFail 3 tests due to problems with 'svn status':
     forced_switch_failures
     tree_conflicts_on_switch_2_1
     tree_conflicts_on_switch_3

* subversion/tests/cmdline/svntest/actions.py
  (deep_trees_conflict_output): Tweak expected output.
  (deep_trees_conflict_output_skipped, deep_trees_status_local_tree_del,
   deep_trees_status_local_leaf_edit): New.
  (deep_trees_run_tests_scheme_for_update): Allow status check to be
   optional.
  (deep_trees_skipping_on_update): New function.

* subversion/tests/cmdline/revert_tests.py
  (revert_tree_conflicts_in_updated_files): Tweak expected output and
   disk to reflect the consistent skipping.

* subversion/tests/cmdline/stat_tests.py
  (status_with_tree_conflicts): Tweak expected output and disk to
   reflect the consistent skipping.

* subversion/tests/cmdline/commit_tests.py
  (tree_conflicts_resolved): Tweak expected output and disk to
   reflect the consistent skipping.

* subversion/tests/cmdline/info_tests.py
  (test_list): Remove XFail from info_with_tree_conflicts.

* subversion/tests/cmdline/tree_conflict_tests.py
  (test_list): Remove XFail from up_sw_file_add_onto_add.

* subversion/tests/cmdline/svntest/tree.py
  (build_tree_from_checkout): Correct a comment.

------------------------------------------------------------------------
r34159 | gstein | 2008-11-12 21:09:48 +0100 (Wed, 12 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_client/export.c

When exporting, make sure the temp files go into the target directory,
rather than the system tempdir, since we plan to rename them into place.

Note: this was a regression that I introduced in r34155. On my system,
TMPDIR and the WC were on the same device, so it did not show up. I now
have a recipe for diff-device testing in order to watch out for this.

* subversion/libsvn_client/export.c:
  (apply_textdelta, svn_client_export4): create the temp file in the same
    directory as the target file since we plan to do renaming.

------------------------------------------------------------------------
r34160 | hwright | 2008-11-12 21:32:17 +0100 (Wed, 12 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Followup to r34147 by rolling back the FSFS sqlite transaction on a failed
commit.

If at any point we decide that we have more places to use wrapped sqlite
transactions, this could probably be generalized in the sqlite APIs.

* subversion/libsvn_fs_fs/fs_fs.c
  (commit_body): Remove transaction handling.
  (commit_body_wrapper): New.
  (svn_fs_fs__commit): Call the new wrapper.

------------------------------------------------------------------------
r34161 | kmradke | 2008-11-12 23:43:53 +0100 (Wed, 12 Nov 2008) | 12 lines
Changed paths:
   M /trunk/contrib/client-side/svnmucc/svnmucc-test.py
   M /trunk/contrib/client-side/svnmucc/svnmucc.c

Consistently log an error when copy targets exist and
add some expected failure tests.  This is a workaround
for mod_dav_svn issue number 3314.
* contrib/client-side/svnmucc/svnmucc.c
 (build): If copy target path exists log an error
* contrib/client-side/svnmucc/svnmucc-test.py
 (xrun_svnmucc): Added expected failure test function
 (main): Added cp failure tests

Patch by: me
Review by: philip

------------------------------------------------------------------------
r34162 | gstein | 2008-11-13 03:30:03 +0100 (Thu, 13 Nov 2008) | 22 lines
Changed paths:
   M /trunk/subversion/include/svn_ra.h
   M /trunk/subversion/libsvn_client/ra.c
   M /trunk/subversion/libsvn_ra_neon/commit.c
   M /trunk/subversion/libsvn_ra_neon/fetch.c
   M /trunk/subversion/libsvn_ra_serf/commit.c

Deprecate the RA->open_tmp_file callback. It was from a long time ago,
when we did have not temp file capabilities. Today, RA layers should just
use the available function for generating unique files (from svn_io.h)

* subversion/include/svn_ra.h:
  (svn_ra_callbacks2_t.open_tmp_file): deprecated

* subversion/libsvn_client/ra.c:
  (open_admin_tmp_file): removed
  (open_tmp_file): use svn_io_open_unique_file3 to always generate a temp
    file in the system temp area.
  (svn_client__open_ra_session_internal): always use open_tmp_file,
    ignoring the USE_ADMIN parameter.

* subversion/libsvn_ra_neon/commit.c:
  (commit_apply_txdelta): ...
* subversion/libsvn_ra_neon/fetch.c:
  (make_reporter): ...
* subversion/libsvn_ra_serf/commit.c:
  (apply_textdelta): ... use svn_io_open_unique_file3 rather than the
    open_tmp_file callback.

------------------------------------------------------------------------
r34163 | neels | 2008-11-13 04:17:32 +0100 (Thu, 13 Nov 2008) | 4 lines
Changed paths:
   M /branches/tc-resolve
   M /branches/tc-resolve/TODO-1.6
   M /branches/tc-resolve/build.conf
   M /branches/tc-resolve/configure.ac
   M /branches/tc-resolve/contrib/client-side/svnmucc/svnmucc-test.py
   M /branches/tc-resolve/contrib/client-side/svnmucc/svnmucc.c
   M /branches/tc-resolve/notes/tree-conflicts/design-overview.txt
   M /branches/tc-resolve/notes/tree-conflicts/requirements.txt
   M /branches/tc-resolve/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/tc-resolve/subversion/include
   M /branches/tc-resolve/subversion/include/private/svn_auth_private.h
   M /branches/tc-resolve/subversion/include/private/svn_sqlite.h
   M /branches/tc-resolve/subversion/include/svn_io.h
   M /branches/tc-resolve/subversion/include/svn_ra.h
   M /branches/tc-resolve/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/tc-resolve/subversion/libsvn_client/blame.c
   M /branches/tc-resolve/subversion/libsvn_client/commit.c
   M /branches/tc-resolve/subversion/libsvn_client/export.c
   M /branches/tc-resolve/subversion/libsvn_client/ra.c
   M /branches/tc-resolve/subversion/libsvn_client/repos_diff.c
   M /branches/tc-resolve/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/tc-resolve/subversion/libsvn_ra_neon/commit.c
   M /branches/tc-resolve/subversion/libsvn_ra_neon/fetch.c
   M /branches/tc-resolve/subversion/libsvn_ra_neon/util.c
   M /branches/tc-resolve/subversion/libsvn_ra_serf/commit.c
   M /branches/tc-resolve/subversion/libsvn_repos/dump.c
   M /branches/tc-resolve/subversion/libsvn_repos/hooks.c
   M /branches/tc-resolve/subversion/libsvn_repos/reporter.c
   M /branches/tc-resolve/subversion/libsvn_subr
   M /branches/tc-resolve/subversion/libsvn_subr/io.c
   M /branches/tc-resolve/subversion/libsvn_subr/sqlite.c
   M /branches/tc-resolve/subversion/libsvn_subr/stream.c
   M /branches/tc-resolve/subversion/libsvn_subr/subst.c
   M /branches/tc-resolve/subversion/libsvn_wc/adm_files.c
   M /branches/tc-resolve/subversion/libsvn_wc/diff.c
   M /branches/tc-resolve/subversion/libsvn_wc/merge.c
   M /branches/tc-resolve/subversion/libsvn_wc/props.c
   M /branches/tc-resolve/subversion/libsvn_wc/translate.c
   M /branches/tc-resolve/subversion/libsvn_wc/update_editor.c
   M /branches/tc-resolve/subversion/po/pl.po
   M /branches/tc-resolve/subversion/svn/info-cmd.c
   M /branches/tc-resolve/subversion/svn/log-cmd.c
   M /branches/tc-resolve/subversion/svn_private_config.hw
   M /branches/tc-resolve/subversion/svnadmin/main.c
   M /branches/tc-resolve/subversion/svndumpfilter/main.c
   M /branches/tc-resolve/subversion/svnlook/main.c
   M /branches/tc-resolve/subversion/tests/cmdline/commit_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/info_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/revert_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/stat_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/svntest/actions.py
   M /branches/tc-resolve/subversion/tests/cmdline/svntest/tree.py
   M /branches/tc-resolve/subversion/tests/cmdline/switch_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/tc-resolve/subversion/tests/cmdline/update_tests.py
   M /branches/tc-resolve/subversion/tests/libsvn_subr
   M /branches/tc-resolve/tools/po/po-update.sh
   M /branches/tc-resolve/tools/server-side/svn_server_log_parse.py
   M /branches/tc-resolve/tools/server-side/test_svn_server_log_parse.py
   M /branches/tc-resolve/www/development.html
   M /branches/tc-resolve/www/hacking.html
   M /branches/tc-resolve/www/issue-tracker.html
   M /branches/tc-resolve/www/tasks.html

On branch tc-resolve:
Merge in changes from trunk up to r34162.


------------------------------------------------------------------------
r34164 | neels | 2008-11-13 04:54:50 +0100 (Thu, 13 Nov 2008) | 14 lines
Changed paths:
   M /branches/tc-resolve/subversion/tests/cmdline/depth_tests.py

On branch tc-resolve:

Tweak the tree_conflicts_resolved_depth* tests to use separate directories
in one case. Not separating the case where the update currently fails to
report a tree-conflict properly, because it's nice to have a test for it.

* subversion/tests/cmdline/depth_tests.py
  (make_depth_tree_conflicts, tree_conflicts_resolved_depth_empty,
  tree_conflicts_resolved_depth_files,
  tree_conflicts_resolved_depth_immediates,
  tree_conflicts_resolved_depth_infinity):
    Instead of 'A/B/lambda', 'A/B/E' and 'A/B/E/alpha',
    rather use 'A/mu', 'A/B' and 'A/D/gamma'.

------------------------------------------------------------------------
r34165 | neels | 2008-11-13 05:31:15 +0100 (Thu, 13 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c


* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Add an assertion with comment.


------------------------------------------------------------------------
r34166 | julianfoad | 2008-11-13 12:27:42 +0100 (Thu, 13 Nov 2008) | 125 lines
Changed paths:
   M /trunk
   M /trunk/build.conf
   M /trunk/notes/tree-conflicts/design-overview.txt
   M /trunk/notes/tree-conflicts/requirements.txt
   M /trunk/subversion/include
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/private/svn_cache.h
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_client/resolved.c
   M /trunk/subversion/libsvn_subr
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h
   M /trunk/subversion/libsvn_wc/wc.h
   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/tree_conflict_tests.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.txt
   M /trunk/subversion/tests/libsvn_subr
   M /trunk/tools/buildbot/slaves/win32-xp-VS2005
   M /trunk/tools/server-side/svn_server_log_parse.py
   M /trunk/tools/server-side/test_svn_server_log_parse.py
   M /trunk/www/development.html
   M /trunk/www/issue-tracker.html
   M /trunk/www/tasks.html

Merge the "tc-resolve" branch to trunk. This makes "resolved" handle tree
conflicts per victim rather than per parent.

Below are all the pertinent parts of log messages on the branch, partially
edited for grouping and to remove some irrelevant details of intermediate
steps.

------------------------------------------------------------------------

* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_entry): Do not clear tree conflicts that are recorded
    in this entry. Do not send a notification, but instead report (through a
    new boolean output parameter) whether something was resolved.
  (resolve_found_entry_callback): Resolve any tree conflict for this victim.
    Send a notification if any conflict was resolved.
  (svn_wc_resolved_conflict4): Use an entries-walker function that visits
    unversioned tree conflict victims as well as ordinary entries.

------------------------------------------------------------------------

Allow sched-deleted nodes to be resolved (fixes update_tests.py 15).

* subversion/libsvn_wc/adm_ops.c
  (resolve_found_entry_callback):
    Allow sched-deleted nodes to be resolved.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_found_entry):
    Only try to retrieve the ADM_ACCESS in presence of tree-conflicts.
  (visit_tc_too_error_handler):
    Get the ADM_ACCESS on the parent instead of on the node itself, thus
    avoid an error upon an unversioned tree-conflict victim.
    ### TODO: check for greater subdir depths.

Fix a crash in del_tree_conflict().

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__del_tree_conflict):
    Only write and run the log if LOG_ACCUM is not NULL.

------------------------------------------------------------------------

Fix per-victim "resolved" on directory tree-conflict victims.

* subversion/libsvn_client/resolved.c
  (svn_client_resolve):
    Get the ADM_ACCESS on the target's parent directory to be able to resolve
    tree-conflicted directories. Extend the ADM_LOCK_LEVEL to still be able
    to lock the target node for text/prop conflicts.

* subversion/include/svn_client.h
  (svn_client_resolve): Comment.

* subversion/libsvn_wc/adm_ops.c
  (resolve_found_entry_callback):
    Completely split tree-conflict resolution from text and prop conflicts,
    because tree-conflicts need a different ADM_ACCESS when handling
    directories. Change use of RESOLVED to already reflect the sanity-check,
    and sanity-check separately for tree-conflicts. Clarify some conditions.
    Also remove the debugging conditions that exited prematurely.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__loggy_del_tree_conflict):
    Extend an assertion by a NULL check. Add another assertion to make sure
    the VICTIM_PATH is a child node of the ADM_ACCESS' path.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__loggy_add_tree_conflict,
   svn_wc__loggy_del_tree_conflict,
   svn_wc__del_tree_conflict,
   svn_wc__write_tree_conflicts_to_entry,
   svn_wc__tree_conflict_exists):
    Comments, add "@since New in 1.6.".

------------------------------------------------------------------------

Make the tree-conflict-enabled WC walker cope with an unversioned target.

* subversion/libsvn_wc/entries.c,
  subversion/libsvn_wc/wc.h
  (svn_wc__walk_entries_and_tc): Allow the target to be unversioned, and
    allow adm_access to be null.

------------------------------------------------------------------------

Fix the behaviour of "resolved" that descends into unversioned
tree-conflicts even if the depth doesn't allow that.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_baton_t): Add TARGET and DEPTH fields.
  (visit_tc_too_found_entry):
    Use new TARGET and DEPTH fields in the baton to determine whether to
    descend into unversioned tree-conflicted children of a directory.
  (svn_wc__walk_entries_and_tc): Supply TARGET and DEPTH to the baton.

------------------------------------------------------------------------

Tests.

* subversion/tests/cmdline/commit_tests.py
  (tree_conflicts_resolved): Adjust for resolving per victim.

* subversion/tests/cmdline/depth_tests.py
  (tree_conflicts_resolved_depth_empty, tree_conflicts_resolved_depth_files,
   tree_conflicts_resolved_depth_immediates,
   tree_conflicts_resolved_depth_infinity, make_depth_tree_conflicts):
    Four new tests and a helper. The tests are XFAIL because the helper
    make_depth_tree_conflicts() exposes an error in update code that
    is not related to "resolved". Separate trials suggest that these
    tests will pass as soon as the update issue is resolved. See
    inline comment in make_depth_tree_conflicts() marked "##".
  (test_list): Add the new tests.

* subversion/tests/cmdline/log_tests.py
  (merge_history_repos): Resolve the victim, not the parent.

* subversion/tests/cmdline/tree_conflict_tests.py
  (ensure_tree_conflict): Resolve the victim, not the parent.
    Make a "resolved" test also try run "resolved" on the victim's
    parent first, to make sure it doesn't resolve its children.
    Remove comment about not supporting "resolved" per victim.

* subversion/tests/cmdline/update_tests.py
  (another_hudson_problem): Resolve the victim, not the parent.

------------------------------------------------------------------------
r34167 | julianfoad | 2008-11-13 12:28:23 +0100 (Thu, 13 Nov 2008) | 1 line
Changed paths:
   D /branches/tc-resolve

Remove the tc-resolve branch, as it was merged to trunk in r34166.
------------------------------------------------------------------------
r34168 | julianfoad | 2008-11-13 12:53:36 +0100 (Thu, 13 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Tweak a comment for clarity.

Suggested by: stsp
(but written in my own words)

------------------------------------------------------------------------
r34169 | julianfoad | 2008-11-13 13:13:28 +0100 (Thu, 13 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove a done item.
------------------------------------------------------------------------
r34170 | julianfoad | 2008-11-13 13:15:17 +0100 (Thu, 13 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove a done item.
------------------------------------------------------------------------
r34171 | julianfoad | 2008-11-13 13:52:22 +0100 (Thu, 13 Nov 2008) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_diff/diff_file.c

Fix the character encoding of the default diff header that is currently used
by the "diff-full (df)" option of interactive resolving (but not by "svn
diff"). This previously errored out in locales such as zh_CN.GBK.

Patch by: Rock Sun <daijun@gmail.com>

* subversion/libsvn_diff/diff_file.c
  (output_unified_default_hdr): UTF-8-encode the date string from APR before
    using it as UTF-8.

------------------------------------------------------------------------
r34172 | julianfoad | 2008-11-13 14:36:17 +0100 (Thu, 13 Nov 2008) | 3 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Revert my removal of an item in r34170 as I didn't
check that Greg has finished it, although I checked that the original
problem is fixed.
------------------------------------------------------------------------
r34173 | hwright | 2008-11-13 15:31:29 +0100 (Thu, 13 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

A few followup improvements to r34160.

Suggested by: glasser
              gstein

* subversion/libsvn_fs_fs/fs_fs.c
  (commit_body_rep_cache): Renamed from commit_body_wrapper(), and don't
    allow sqlite rollback errors to override any commit errors.  Also, always
    use the sqlite transaction mechanism.
  (svn_fs_fs__commit): Conditionalize the retry function based upon rep caching.

------------------------------------------------------------------------
r34174 | julianfoad | 2008-11-13 15:52:51 +0100 (Thu, 13 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/switch_tests.py

Fix a test failure.

* subversion/tests/cmdline/switch_tests.py
  (failed_anchor_is_target): Adjust now that "svn resolved" acts on a tree
    conflict victim not the parent.

------------------------------------------------------------------------
r34175 | pburba | 2008-11-13 16:03:01 +0100 (Thu, 13 Nov 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add an item re WC-to-WC copy/moves.

------------------------------------------------------------------------
r34176 | julianfoad | 2008-11-13 16:33:55 +0100 (Thu, 13 Nov 2008) | 39 lines
Changed paths:
   M /trunk/subversion/include/private/svn_wc_private.h
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/info.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/questions.c
   M /trunk/subversion/libsvn_wc/status.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h

Make the tree-conflict WC APIs private to Subversion (but shared across
libraries). Previously, two were public and the third was private to
libsvn_wc. This is issue #3321.

* subversion/include/private/svn_wc_private.h
  (svn_wc__get_tree_conflict, svn_wc__add_tree_conflict): New, moved from
    svn_wc_get_tree_conflict and svn_wc_add_tree_conflict respectively in
    svn_wc.h.
  (svn_wc__del_tree_conflict): Moved from tree_conflicts.h.

* subversion/include/svn_wc.h
  (svn_wc_get_tree_conflict, svn_wc_add_tree_conflict): Rename and move
    to svn_wc_private.h.

* subversion/libsvn_client/info.c
  (info_found_entry_callback, info_error_handler): Adjust calls.

* subversion/libsvn_client/merge.c
  (tree_conflict): Adjust calls.

* subversion/libsvn_wc/adm_ops.c
  (revert_internal, resolve_found_entry_callback): Adjust calls.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_error_handler, svn_wc__walk_entries_and_tc): Adjust calls.

* subversion/libsvn_wc/questions.c
  (svn_wc_conflicted_p2): Adjust calls.

* subversion/libsvn_wc/status.c
  (get_dir_status): Adjust calls.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc_add_tree_conflict, svn_wc_get_tree_conflict): Rename to
    svn_wc__add_tree_conflict and svn_wc__get_tree_conflict respectively.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__del_tree_conflict): Rename and move to svn_wc_private.h.

------------------------------------------------------------------------
r34177 | sbutler | 2008-11-13 16:46:05 +0100 (Thu, 13 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add some tree conflict todo items.
------------------------------------------------------------------------
r34178 | gstein | 2008-11-13 21:05:08 +0100 (Thu, 13 Nov 2008) | 26 lines
Changed paths:
   M /trunk/subversion/libsvn_repos/dump.c
   M /trunk/subversion/libsvn_repos/hooks.c
   M /trunk/subversion/libsvn_repos/reporter.c
   M /trunk/subversion/libsvn_repos/repos.h
   M /trunk/subversion/svnsync/main.c

Remove uses of svn_io_file_del_on_close, since it is problematic with
(unpatched) versions of APR.

* subversion/svnsync/main.c:
  (open_tmp_file): simplify using svn_io_open_unique_file3 and switch to
    svn_io_file_del_on_pool_cleanup

* subversion/libsvn_repos/reporter.c:
  (svn_repos_begin_report2): switch to svn_io_file_del_on_pool_cleanup

* subversion/libsvn_repos/dump.c:
  (store_delta): switch to svn_io_file_del_on_pool_cleanup
  (dump_node): when wrapping a stream around the delta file, make sure the
    stream owns the file and will close it.

* subversion/libsvn_repos/repos.h:
  (svn_repos__hooks_start_commit, svn_repos__hooks_post_revprop_change,
      svn_repos__hooks_post_lock, svn_repos__hooks_post_unlock): add const
    to parameters, as appropriate

* subversion/libsvn_repos/hooks.c:
  (create_temp_file): switch to svn_io_file_del_on_pool_cleanup
  (svn_repos__hooks_start_commit, svn_repos__hooks_post_revprop_change,
      svn_repos__hooks_post_lock, svn_repos__hooks_post_unlock): add const
    to parameters, as appropriate

------------------------------------------------------------------------
r34179 | jerenkrantz | 2008-11-13 21:10:03 +0100 (Thu, 13 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_serf/util.c

ra_serf: Do not overwrite/munge the cert storage when OpenSSL/Serf asks to
validate the entire certificate chain.

* subversion/libsvn_ra_serf/util.c
  (ssl_server_cert): If present, use the certificate name as the key to the
  storage rather than the realm string.

------------------------------------------------------------------------
r34180 | gstein | 2008-11-13 21:10:23 +0100 (Thu, 13 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/io.c

Leave this one del_on_close with a comment.

* subversion/libsvn_subr/io.c:
  (get_default_file_perms): switch to svn_io_open_unique_file3() and leave
    a comment about why del_on_close is acceptable.

------------------------------------------------------------------------
r34181 | gstein | 2008-11-13 21:11:16 +0100 (Thu, 13 Nov 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

Yay. Fixed throughout svn.

------------------------------------------------------------------------
r34182 | jerenkrantz | 2008-11-13 21:11:40 +0100 (Thu, 13 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_serf/serf.c

ra_serf: Don't assume that the specified proxy is always an IPv4 address.

* subversion/libsvn_ra_serf/serf.c
  (load_config): Switch to APR_UNSPEC for processing proxy addresses.

------------------------------------------------------------------------
r34183 | gstein | 2008-11-13 21:18:38 +0100 (Thu, 13 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/io.c

Sigh. Switching to del_on_pool_cleanup. As Garrett notes, another thread
might fork a process at *just* the wrong time, and delete the file.

Found by: rooneg

* subversion/libsvn_subr/io.c:
  (get_default_file_perms): use del_on_pool_cleanup after all.

------------------------------------------------------------------------
r34184 | pburba | 2008-11-13 22:11:33 +0100 (Thu, 13 Nov 2008) | 22 lines
Changed paths:
   M /trunk/subversion/libsvn_client/copy.c
   M /trunk/subversion/tests/cmdline/copy_tests.py
   M /trunk/subversion/tests/cmdline/merge_tests.py
   M /trunk/subversion/tests/cmdline/revert_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

One small step towards mergeinfo sanity; no more explicit mergeinfo
on a WC-to-WC move/copy destination unless the source had some.

Discussed here: 
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=145213.

* subversion/libsvn_client/copy.c
  (propagate_mergeinfo_within_wc): Remove.
  (do_wc_to_wc_copies, do_wc_to_wc_moves): Don't set explicit mergeinfo on
  a cp/mv destination beyond what the source had.

* subversion/tests/cmdline/copy_tests.py
* subversion/tests/cmdline/merge_tests.py
* subversion/tests/cmdline/revert_tests.py
* subversion/tests/cmdline/update_tests.py
  Update test expectations to no longer expect WC-to-WC copy/move 
  destinations to always have explicit (usually empty) mergeinfo.  In a
  few cases where this mergeinfo was essential to the purpose of the test,
  the WC-to-WC cp/mv was replaced with a REPOS-to-REPOS cp/mv or empty
  mergeinfo was manually set on the destination.
  

------------------------------------------------------------------------
r34185 | pburba | 2008-11-14 00:03:26 +0100 (Fri, 14 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove a done todo.
------------------------------------------------------------------------
r34186 | neels | 2008-11-14 07:10:16 +0100 (Fri, 14 Nov 2008) | 29 lines
Changed paths:
   M /trunk/subversion/libsvn_client/resolved.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/entries.c
   A /trunk/subversion/tests/cmdline/resolved_tests.py

Fix some behaviour around "resolved" and tree-conflicts.

Take stsp's patch[*] and fix it: do not try to read entries from the parent
directory of a working copy root that was supplied as a target.

[*] See this post:
    http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=145293
    Date: Fri, 14 Nov 2008 00:25:02 +0000
    From: Stefan Sperling <stsp@elego.de>
    To: dev@subversion.tigris.org
    Message-ID: <20081114002502.GH6313@jack.stsp.name>
    Subject:  Re: Tree conflict bugs I've just been finding

Also fix missing resolving of deleted and committed files that became
tree-conflict victims during a merge.

* subversion/libsvn_client/resolved.c (svn_client_resolve),
* subversion/libsvn_wc/adm_ops.c (resolve_found_entry_callback):
    Ensure we do not end up trying to find tree conflict info in the
    parent directory of the working copy root.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_found_entry): Also visit tree-conflicts of deleted items.

* subversion/tests/cmdline/resolved_tests.py
  (resolved_on_wc_root, resolved_on_deleted_item):
    New tests file with two new tests for the issues fixed by this commit.


------------------------------------------------------------------------
r34187 | gstein | 2008-11-14 08:51:57 +0100 (Fri, 14 Nov 2008) | 37 lines
Changed paths:
   M /trunk/subversion/libsvn_client/externals.c
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c
   M /trunk/subversion/libsvn_subr/io.c
   M /trunk/subversion/libsvn_subr/subst.c
   M /trunk/subversion/libsvn_wc/props.c
   M /trunk/subversion/mod_dav_svn/activity.c
   M /trunk/subversion/svn/util.c
   M /trunk/subversion/tests/libsvn_repos/repos-test.c

Convert remaining uses of svn_io_open_unique_file2 to other function
calls, as appropriate.

* subversion/libsvn_subr/subst.c:
  (svn_subst_copy_and_translate3, svn_subst_create_translated): switch to
    svn_stream_open_unique

* subversion/libsvn_subr/io.c:
  (svn_io_copy_file, svn_io_file_move): switch to svn_io_open_unique_file3.
  (reown_file): switch param from PATH_APR to just PATH. all the calls
    were to SVN functions, so we should not be using an APR path. switch
    to svn_io_open_unique_file3.
  (io_set_file_perms): pass svn-internal path to reown_file.

* subversion/mod_dav_svn/activity.c:
  (dav_svn__store_activity): lose a bunch of code in favor of
    svn_io_write_unique().

* subversion/tests/libsvn_repos/repos-test.c:
  (authz_get_handle): revamp to use svn_io_write_unique and other
    svn-style IO functions.

* subversion/svn/util.c:
  (svn_cl__edit_string_externally): change parameter to FILENAME rather
    than PREFIX. switch to svn_io_open_uniquely_named.

* subversion/libsvn_wc/props.c:
  (open_reject_tmp_file, svn_wc__merge_props): switch to
    svn_io_open_uniquely_named.

* subversion/libsvn_client/externals.c:
  (relegate_dir_external): switch to svn_io_uniquely_named.

* subversion/libsvn_fs_fs/fs_fs.c:
  (svn_fs_fs__set_revision_proplist): switch to svn_stream_open_unique
  (svn_fs_fs__set_uuid): revamp to use svn_io_write_unique

------------------------------------------------------------------------
r34188 | rhuijben | 2008-11-14 16:28:13 +0100 (Fri, 14 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/auth.c

* subversion/libsvn_subr/auth.c
  (svn_auth_get_platform_specific_provider): Following up on r34085, load 
    windows ssl server trust provider when asked for the ssl server trust
    provider.

------------------------------------------------------------------------
r34189 | stsp | 2008-11-14 17:00:03 +0100 (Fri, 14 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/svn/tree-conflicts.c

* subversion/svn/tree-conflicts.c
  (new_tree_conflict_phrases): Tweak tree conflict phrases so that
   they do not have any parts in parentheses.
   Hopefully this is easier to parse. (No, I did not consult a human
   interface design expert prior to this change... If you know any,
   please give me their number, I think we could use some external
   help with the tree conflicts UI design.)

------------------------------------------------------------------------
r34190 | arfrever | 2008-11-14 17:55:26 +0100 (Fri, 14 Nov 2008) | 19 lines
Changed paths:
   M /trunk/subversion/bindings/ctypes-python/test/wc.py
   M /trunk/subversion/bindings/swig/python/tests/client.py
   M /trunk/subversion/libsvn_ra_neon/ra_neon.h
   M /trunk/www/faq.html

Fix some typos.

* subversion/bindings/ctypes-python/test/wc.py
  (WCTestCase._info_receiver): Renamed from ...
  (WCTestCase._info_reciever): ... this.
  (WCTestCase.test_info, WCTestCase.test_copy, WCTestCase.test_move,
   WCTestCase.test_delete, WCTestCase.test_mkdir, WCTestCase.test_add,
   WCTestCase.test_revert, WCTestCase.test_lock, WCTestCase.test_unlock): Use
   WCTestCase._info_receiver() instead of WCTestCase._info_reciever().

* subversion/bindings/swig/python/tests/client.py
  (SubversionClientTestCase.log_receiver): Fix a typo in doc string.

* subversion/libsvn_ra_neon/ra_neon.h
  (UNEXPECTED_ELEMENT): Fix a typo in doc string.

* www/faq.html
  (obstructed-add): Fix a typo.

------------------------------------------------------------------------
r34191 | julianfoad | 2008-11-14 19:31:06 +0100 (Fri, 14 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/tree_conflicts.h

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__read_tree_conflicts_from_entry): Un-Doxygen-ate the doc string.
  (svn_wc__write_tree_conflicts_to_entry): Improve the doc string.

------------------------------------------------------------------------
r34192 | hwright | 2008-11-14 19:52:14 +0100 (Fri, 14 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/deprecated.c
   M /trunk/subversion/libsvn_subr/io.c

Move a deprecated function to the deprecated file (thus removing a warning).

* subversion/libsvn_subr/io.c
  (svn_io_open_unique_file2, svn_io_open_unique_file): Move from here...

* subversion/libsvn_subr/deprecated.c
  (svn_io_open_unique_file2, svn_io_open_unique_file): ...to here.

------------------------------------------------------------------------
r34193 | kfogel | 2008-11-14 20:08:01 +0100 (Fri, 14 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/deprecated.c: Include svn_path.h, to avoid an
    "implicit declaration of function 'svn_path_split'" warning.

------------------------------------------------------------------------
r34194 | arfrever | 2008-11-14 20:17:24 +0100 (Fri, 14 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

Revert r34149.

Suggested by: hwright

------------------------------------------------------------------------
r34195 | kfogel | 2008-11-14 20:31:56 +0100 (Fri, 14 Nov 2008) | 5 lines
Changed paths:
   M /trunk/COMMITTERS

* COMMITTERS
  (rocksun): Add as a new Chinese translator for the www area.
  (nmiyo): While here, expand domain from faq to www; anyone who can
    translate the faq can obviously translate other documents in www.

------------------------------------------------------------------------
r34196 | markphip | 2008-11-14 20:32:11 +0100 (Fri, 14 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

JavaHL: A follow-up to r34184, adjust the JavaHL tests to no
longer expect property modifications when an item is moved.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java
  (testMove): Remove expectations of mergeinfo creation.

------------------------------------------------------------------------
r34197 | cmpilato | 2008-11-14 20:34:25 +0100 (Fri, 14 Nov 2008) | 43 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_fs/fs-test.c
   M /trunk/subversion/tests/libsvn_fs_base/changes-test.c
   M /trunk/subversion/tests/libsvn_fs_base/fs-base-test.c
   M /trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /trunk/subversion/tests/libsvn_repos/repos-test.c
   M /trunk/subversion/tests/svn_test.h
   M /trunk/subversion/tests/svn_test_fs.c
   M /trunk/subversion/tests/svn_test_fs.h
   M /trunk/subversion/tests/svn_test_main.c

Bang support for --server-minor-version testing into the C test
framework, and use it in the FS and Repos tests.

NOTE:  Only one failure that I didn't expect turned up:

   $ ./fs-test --server-minor-version=4 --fs-type=fsfs
   ...
   subversion/tests/libsvn_fs/fs-test.c:369: (apr_err=160000)
   svn_tests: the transaction name '0-3' was reused
   FAIL:  lt-fs-test 5: check that transaction names are not reused
   ...

* subversion/tests/svn_test.h
  (svn_test_opts_t): Add server_minor_version.

* subversion/tests/svn_test_main.c
  (server_minor_version_opt): New enum.
  (cl_options): Add bits for new --server-minor-version option.
  (main): Add handling of new --server-minor-version option.

* subversion/tests/svn_test_fs.h
  (svn_test__create_bdb_fs): Add 'opts' parameter.

* subversion/tests/svn_test_fs.c
  (make_fs_config, create_fs): Add 'server_minor_version' parameter
    and handling.
  (svn_test__create_bdb_fs): Add 'opts' parameter, and update call to
    create_fs().
  (svn_test__create_fs, svn_test__create_repos): Update call to create_fs().

* subversion/tests/libsvn_fs/fs-test.c
  (node_origin_rev): Bail (with success) when testing BDB with
    server-minor-version 4.

* subversion/tests/libsvn_repos/repos-test.c
  (node_location_segments): Bail (with success) when testing BDB with
    server-minor-version 4.

* subversion/tests/libsvn_fs_base/changes-test.c,
* subversion/tests/libsvn_fs_base/fs-base-test.c,
* subversion/tests/libsvn_fs_base/strings-reps-test.c
  Update calls to svn_test__create_bdb_fs().

------------------------------------------------------------------------
r34198 | kfogel | 2008-11-14 20:41:47 +0100 (Fri, 14 Nov 2008) | 5 lines
Changed paths:
   M /trunk/COMMITTERS

* COMMITTERS
  (rocksun): Whups, say "zh" instead of "cn", following up to r34195.

Found by: arfrever

------------------------------------------------------------------------
r34199 | cmpilato | 2008-11-14 20:45:44 +0100 (Fri, 14 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/tests/svn_test_main.c

Followup to r34197.

* subversion/tests/svn_test_main.c
  (main): Oops.  Fix a use of an AND where an OR was intended.

Found by: danielsh

------------------------------------------------------------------------
r34200 | julianfoad | 2008-11-14 22:30:38 +0100 (Fri, 14 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/subversion/libsvn_diff/diff_file.c

* STATUS: Nominate r34171 (fix a character encoding failure).
------------------------------------------------------------------------
r34201 | julianfoad | 2008-11-14 22:34:35 +0100 (Fri, 14 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/subversion/libsvn_diff/diff_file.c

Revert r34200 because it accidentally included the nominated change as well as the nomination.
------------------------------------------------------------------------
r34202 | julianfoad | 2008-11-14 22:41:33 +0100 (Fri, 14 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34171 (fix a character encoding failure).
------------------------------------------------------------------------
r34203 | cmpilato | 2008-11-14 22:49:02 +0100 (Fri, 14 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/subst.c

Add some error-scenario cleanup logic, some of it needed since r34187
stopped using delete-on-close semantics for the tempfile, some of it
needed probably since the inception of this code.

* subversion/libsvn_subr/subst.c
  (svn_subst_copy_and_translate3): Clean up streams and temporary
    files in the error case.  The lack of this code was causing
    translate-tests 14 to leave two tempfile turds.

------------------------------------------------------------------------
r34204 | julianfoad | 2008-11-14 23:00:05 +0100 (Fri, 14 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_client/resolved.c

* subversion/libsvn_client/resolved.c
  (svn_client_resolved): Move below svn_client_resolve() which it calls,
    because that's the natural order in C.

------------------------------------------------------------------------
r34205 | cmpilato | 2008-11-14 23:11:02 +0100 (Fri, 14 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/include/svn_error.h
   M /trunk/subversion/libsvn_subr/error.c

Add a version of svn_error_compose that is SVN_NO_ERROR-tolerant.

* subversion/include/svn_error.h,
* subversion/libsvn_subr/error.c
  (svn_error_compose_create): New function.

------------------------------------------------------------------------
r34206 | cmpilato | 2008-11-14 23:11:28 +0100 (Fri, 14 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/subst.c

Simplify some cleanup logic.

* subversion/libsvn_subr/subst.c
  (svn_subst_copy_and_translate3): Use new svn_error_compose_create()
    to simply some logic.

------------------------------------------------------------------------
r34207 | cmpilato | 2008-11-14 23:17:12 +0100 (Fri, 14 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/subst.c

Followup to r34206.

* subversion/libsvn_subr/subst.c
  (svn_subst_copy_and_translate3): Just return the composed error
    chain as soon as you know it's non-NULL, rather than testing it
    again later.

Suggested by: gstein

------------------------------------------------------------------------
r34208 | cmpilato | 2008-11-14 23:21:00 +0100 (Fri, 14 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/error.c

Followup to r34205.

* subversion/libsvn_subr/error.c
  (svn_error_compose_create): Simplify, simplify...

Suggested by: gstein

------------------------------------------------------------------------
r34209 | sbutler | 2008-11-14 23:45:27 +0100 (Fri, 14 Nov 2008) | 45 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/cmdline/svntest/actions.py
   M /trunk/subversion/tests/cmdline/switch_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

If update or switch skips a conflicted tree, don't set the new
revision, URL, etc. on anything in the conflicted tree.

On updating or switching a prop-conflicted directory, skip the
directory and its descendants as we do for tree conflicts.

This is a follow-up to the skip-conflicts improvements in r34158.

* subversion/libsvn_wc/adm_ops.c
  (tweak_entries): When finishing an update or switch, skip all
   descendants of an excluded path.

* subversion/libsvn_wc/update_editor.c
  (edit_baton): Note in comments the new (recursive) meaning of the
   skipped_paths field.  Rename current_tree_conflict to
   current_conflict to reflect that it may contain the path of a
   prop-conflicted dir.
  (complete_directory,
   do_entry_deletion,
   add_directory,
   close_directory,
   add_file,
   open_file,
   make_editor): Track field renames.
  (open_directory): Track field renames. Ensure that an existing
   property conflict causes the dir tree to be skipped.

* subversion/tests/cmdline/switch_tests.py
  (tree_conflicts_on_switch_2_1,
   tree_conflicts_on_switch_3): Expected status shows old revision
   numbers.  Now consistent with the other tests.

* subversion/tests/cmdline/update_tests.py
  (update_delete_modified_files,
   update_conflicted): Expected output and status show improved
   skipping and old revision numbers.
  (tree_conflicts_on_update_2_1,
   tree_conflicts_on_update_2_3,
   tree_conflicts_on_update_3): Expected status shows old revision
   numbers.  Now consistent with the other tests.

* subversion/tests/cmdline/svntest/actions.py
  (deep_trees_skipping_on_update): Check status before the skipping,
   too.  Comment out a print statement (whoops).

------------------------------------------------------------------------
r34210 | gstein | 2008-11-15 00:02:59 +0100 (Sat, 15 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/subst.c

The new composition is cool... but let's have the stream closure take
precedence over the file removal error. It was the closure, after all,
that caused us to attempt the file removal.

* subversion/libsvn_subr/subst.c:
  (svn_subst_copy_and_translate3): swap order of error precedence

------------------------------------------------------------------------
r34211 | julianfoad | 2008-11-15 00:25:49 +0100 (Sat, 15 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_is_wc_root): Clarify the doc string: "WC root" might not mean what
    you would think.

------------------------------------------------------------------------
r34212 | julianfoad | 2008-11-15 00:40:18 +0100 (Sat, 15 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/update_editor.c
  (check_wc_root): Add a minimal doc string. Separate it from the large
    documentation comment above it.

------------------------------------------------------------------------
r34213 | blair | 2008-11-15 02:46:41 +0100 (Sat, 15 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/tree.c

* subversion/libsvn_fs_fs/tree.c
  (svn_fs_fs__commit_txn):
    Fix excessive memory usage during commit in repositories with high
    commit rates where the transactions modify nodes that have 20,000
    siblings nodes.

------------------------------------------------------------------------
r34214 | neels | 2008-11-15 03:19:27 +0100 (Sat, 15 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/include/svn_string.h
   M /trunk/subversion/libsvn_subr/svn_string.c

Follow up on r34178, getting rid of compiler warnings.

* subversion/include/svn_string.h,
* subversion/libsvn_subr/svn_string.c
  (svn_cstring_join):  Make first parameter STRINGS const.



------------------------------------------------------------------------
r34215 | kou | 2008-11-15 04:06:58 +0100 (Sat, 15 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/tree.c

Add missing NULL checks.

* subversion/libsvn_fs_fs/tree.c
  (fs_file_checksum, apply_textdelta): Add missing NULL check.

Reviewed by: markphip
             hwright
             jwhitlock

[Reverted in r34252.]

------------------------------------------------------------------------
r34216 | rocksun | 2008-11-15 08:36:24 +0100 (Sat, 15 Nov 2008) | 2 lines
Changed paths:
   M /trunk/www/faq.html
   A /trunk/www/faq.zh.html

* www/faq.html: Add Chinese translation links.
* www/faq.zh.html: Chinese translation based on English r33959
------------------------------------------------------------------------
r34217 | rocksun | 2008-11-15 08:41:16 +0100 (Sat, 15 Nov 2008) | 2 lines
Changed paths:
   M /trunk/www/index.html

* www/index.html: Add Chinese FAQ translation links.

------------------------------------------------------------------------
r34218 | arfrever | 2008-11-15 17:30:20 +0100 (Sat, 15 Nov 2008) | 15 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp
   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 r34085:

* subversion/libsvn_subr/auth.c
  (svn_auth_get_platform_specific_provider): Rename local constant.

* subversion/libsvn_subr/cmdline.c
  (svn_cmdline_create_auth_baton): Consistently use SVN_ERR() and improve
   indentation.

* subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::getContext): Consistently use SVN_JNI_ERR() and improve
   indentation.

* subversion/tests/libsvn_subr/auth-test.c: Fix copyright year.

------------------------------------------------------------------------
r34219 | arfrever | 2008-11-15 23:21:01 +0100 (Sat, 15 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

Follow-up to r34130:
Store pointer to wallet in parameters of authentication baton instead of using
global variable.

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (wallet): Delete.
  (get_wallet): New.
  (kwallet_password_get, kwallet_password_set): Use get_wallet().

Found by: gstein

------------------------------------------------------------------------
r34220 | rhuijben | 2008-11-16 13:33:16 +0100 (Sun, 16 Nov 2008) | 46 lines
Changed paths:
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/svn_auth.h
   M /trunk/subversion/libsvn_subr/auth.c
   M /trunk/subversion/libsvn_subr/cmdline.c
   M /trunk/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /trunk/subversion/libsvn_subr/win32_crypto.c
   M /trunk/subversion/tests/libsvn_subr/auth-test.c

To complete issue #2489, implement secure client certificate passphrase 
caching for Windows CryptoAPI.

* subversion/include/private/svn_auth_private.h
  (svn_auth__ssl_client_cert_pw_file_save_creds_helper): Update documentation
    to note that it is used by the windows cryptoapi store.
  (svn_auth__ssl_client_cert_pw_get): Add passphrase getter for use by the 
    Windows crypto provider.
  (svn_auth__ssl_client_cert_pw_set): Add passphrase setter for use by the 
    Windows crypto provider.
* subversion/include/svn_auth.h
  (svn_auth_get_windows_ssl_client_cert_pw_provider): Add Windows Crypto api
    ssl client certificate passphrase provider.
* subversion/libsvn_subr/auth.c
  (svn_auth_get_platform_specific_provider): Handle requests for windows 
    ssl_client_cert_pw.
* subversion/libsvn_subr/cmdline.c
  (svn_cmdline_create_auth_baton): Register Windows Crypto api ssl client 
    certificate passphrase provider in the auth batton.
* subversion/libsvn_subr/ssl_client_cert_pw_providers.c
  (simple_passphrase_get): Renamed to ...
  (svn_auth__ssl_client_cert_pw_get): .... and remove static to allow reuse
    by the Windows Crypto api implementation.
  (simple_passphrase_set): Renamed to ...
  svn_auth__ssl_client_cert_pw_set): ... and remove static to allow reuse
    by the Windows Crypto api implementation.
  (svn_auth__ssl_client_cert_pw_file_save_creds_helper): Mark that passphrases
    saved by the Windows Crypto api are encrypted to remove the confirmation 
    prompt.
  (ssl_client_cert_pw_file_first_credentials, 
   ssl_client_cert_pw_file_save_credentials): Update references to 
    simple_passphrase_*.
* subversion/libsvn_subr/win32_crypto.c
  (windows_ssl_client_cert_pw_encrypter, 
   windows_ssl_client_cert_pw_decrypter,
   windows_ssl_client_cert_pw_first_creds, 
   windows_ssl_client_cert_pw_save_creds, 
   windows_ssl_client_cert_pw_provider): Add ssl client certificate passphrase
    provider, forwarding caching and save requests to the file provider like
    the simple provider.
  (svn_auth_get_windows_ssl_client_cert_pw_provider): Add registration function
    for the Windows Crypto api ssl client certificate passphrase provider.
* subversion/tests/libsvn_subr/auth-test.c
  (test_platform_specific_auth_providers): Test registration of the CryptoApi 
    provider via svn_auth_get_platform_specific_provider.

------------------------------------------------------------------------
r34221 | arfrever | 2008-11-16 15:19:54 +0100 (Sun, 16 Nov 2008) | 28 lines
Changed paths:
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/svn_auth.h
   M /trunk/subversion/include/svn_cmdline.h
   M /trunk/subversion/libsvn_subr/auth.c
   M /trunk/subversion/libsvn_subr/cmdline.c
   M /trunk/subversion/svn/main.c
   M /trunk/subversion/svnsync/main.c

Implement termination of authentication providers.

* subversion/include/svn_auth.h
  (svn_auth_provider_t.terminate_provider): New function which terminates
   authentication provider.

* subversion/include/svn_cmdline.h
  (svn_cmdline_terminate_auth_baton): New function which terminates all
   authentication providers in authentication baton, which have non-NULL
   terminate_provider() function.

* subversion/libsvn_subr/cmdline.c
  (provider_set_t): New structure.
  (svn_cmdline_terminate_auth_baton): New function which terminates all
   authentication providers in authentication baton, which have non-NULL
   terminate_provider() function.

* subversion/libsvn_subr/auth.c
  (svn_auth_baton_t): Move from here ...
* subversion/include/private/svn_auth_private.h
  (svn_auth_baton_t): ... to here.

* subversion/svn/main.c
  (main): Call svn_cmdline_terminate_auth_baton().

* subversion/svnsync/main.c
  (main): Call svn_cmdline_terminate_auth_baton().

------------------------------------------------------------------------
r34222 | arfrever | 2008-11-16 15:24:11 +0100 (Sun, 16 Nov 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

Properly terminate KWallet authentication providers.

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (kwallet_password_get, kwallet_password_set): Set "kwallet-initialized" in
   'parameters' of authentication baton after opening wallet.
   Delete some comments.
  (kwallet_terminate): New function which disconnects Subversion from KWallet
   and deletes pointer to wallet.
  (kwallet_simple_provider, kwallet_ssl_client_cert_pw_provider): Initialize
   terminate_provider() field with kwallet_terminate().

------------------------------------------------------------------------
r34223 | arfrever | 2008-11-16 15:37:58 +0100 (Sun, 16 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/svnsync/main.c

Follow-up to r34221:

* subversion/svnsync/main.c
  (main): Add 2 missing calls to svn_cmdline_terminate_auth_baton().

------------------------------------------------------------------------
r34224 | rocksun | 2008-11-16 16:10:02 +0100 (Sun, 16 Nov 2008) | 3 lines
Changed paths:
   M /trunk/www/tools_contrib.html
   A /trunk/www/tools_contrib.zh.html

* www/tools_contrib.html: Add Chinese translation links.
* www/tools_contrib.zh.html: Chinese translation based on English r33959

------------------------------------------------------------------------
r34225 | jensseidel | 2008-11-16 16:22:07 +0100 (Sun, 16 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/bindings/swig/python
   M /trunk/subversion/bindings/swig/python/libsvn_swig_py

Extended svn:ignore properties.

* subversion/bindings/swig/python/libsvn_swig_py/
  subversion/bindings/swig/python/
  (svn:ignore): Added *.lo, *.la (obvious fix)

------------------------------------------------------------------------
r34226 | arfrever | 2008-11-16 16:42:27 +0100 (Sun, 16 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

Don't try to open wallet if opening of wallet previously failed.

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (get_wallet): Don't try to open wallet if 'parameters' of authentication
   baton contain "kwallet-opening-failed". Store "kwallet-opening-failed" in
   'parameters' of authentication baton if opening of wallet failed.

------------------------------------------------------------------------
r34227 | arfrever | 2008-11-16 17:40:17 +0100 (Sun, 16 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_svn/client.c

Store configuration in 'parameters' of authentication baton when using
svn:// protocol.

* subversion/libsvn_ra_svn/client.c
  (ra_svn_open): Store configuration in 'parameters' of authentication baton.

------------------------------------------------------------------------
r34228 | fabien | 2008-11-16 18:07:21 +0100 (Sun, 16 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/po/fr.po

French translation update for r34227.

* subversion/po/fr.po: po-update, new and fuzzy fixed.

------------------------------------------------------------------------
r34229 | arfrever | 2008-11-16 18:32:20 +0100 (Sun, 16 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/svn_auth.h
   M /trunk/subversion/include/svn_cmdline.h
   M /trunk/subversion/libsvn_subr/auth.c
   M /trunk/subversion/libsvn_subr/cmdline.c
   M /trunk/subversion/svn/main.c
   M /trunk/subversion/svnsync/main.c

Revert r34223 and r34221.

Suggested by: rhuijben

------------------------------------------------------------------------
r34230 | rhuijben | 2008-11-16 18:37:35 +0100 (Sun, 16 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/include/svn_dirent_uri.h
   M /trunk/subversion/libsvn_subr/dirent_uri.c

* subversion/include/svn_dirent_uri.h
  (svn_dirent_is_absolute, svn_dirent_is_root): Use examples in canonical
    format for function documentation. (Remove \\?\ examples as these are not 
    generic supported)
* subversion/libsvn_subr/dirent_uri.c
  (svn_dirent_is_root): Minor comment update

------------------------------------------------------------------------
r34231 | arfrever | 2008-11-16 18:39:18 +0100 (Sun, 16 Nov 2008) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

Follow-up to r34222:
Use apr_pool_cleanup_register() to register kwallet_terminate() to be called
when the pool is destroyed.

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (kwallet_terminate): Update.
  (kwallet_password_get, kwallet_password_set): Call
   apr_pool_cleanup_register().
  (kwallet_simple_provider, kwallet_ssl_client_cert_pw_provider): Update.

Suggested by: rhuijben

------------------------------------------------------------------------
r34232 | lgo | 2008-11-16 19:09:42 +0100 (Sun, 16 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

Fix out-of-bounds-read issue.

Suggested by: philip

* subversion/libsvn_subr/dirent_uri.c
  (canonicalize): check bounds before reading from target
   buffer.

------------------------------------------------------------------------
r34233 | stsp | 2008-11-16 20:44:47 +0100 (Sun, 16 Nov 2008) | 19 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

Parsing strings in C - Great Fun since 1972!

Fix a segfault reported by Jens Seidel in:

 Date: Sun, 16 Nov 2008 17:53:20 +0100
 From: Jens Seidel <jensseidel@users.sf.net>
 To: dev@subversion.tigris.org
 Message-ID: <20081116165320.GA3562@merkur.sol.de>
 Subject:  Re: Segfault during "svn info"
 http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=145419

* subversion/libsvn_subr/dirent_uri.c
  (svn_uri_is_canonical): Do not blindly assume that supplied
   uri's hostname part contains a slash. We were running over
   the terminating null if it didn't.
   Also, put a block of windows-specific code which assumes
   that a character pointer points to a slash into an if
   statement which checks for this.

------------------------------------------------------------------------
r34234 | danielsh | 2008-11-16 20:58:26 +0100 (Sun, 16 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c

* subversion/tests/libsvn_subr/dirent_uri-test.c
  (test_uri_is_canonical):
    Add a test for the bug fixed in r34233.
------------------------------------------------------------------------
r34235 | neels | 2008-11-17 02:21:55 +0100 (Mon, 17 Nov 2008) | 26 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/cmdline/depth_tests.py

Fix failure to raise a distinct tree-conflict that is a sibling of another
tree-conflict raised in the same run: Do not defer tree-conflicts via the log
but record them immediately.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Rename to check_and_store_tree_conflict().
  (check_and_store_tree_conflict):
    Renamed from check_tree_conflict(), because this function now stores
    a tree-conflict in the working copy immediately. Remove the LOG_ACCUM
    argument. Cosmetic change: initialize the return value further up.
  (do_entry_deletion, add_directory, open_directory, add_file, open_file): 
    Apply rename and functional change from check_tree_conflict() to
    check_and_store_tree_conflict().

* subversion/tests/cmdline/depth_tests.py
  (make_depth_tree_conflicts):
    Fix some dumb mis-expectations that still remain after above fixes
    are applied.
  (tree_conflicts_resolved_depth_immediates,
   tree_conflicts_resolved_depth_infinity):
    Change output expectation line arrays to UnorderedOutput.
  (test_list):
    Do not XFail tests tree_conflicts_resolved_depth_* since the bug is
    now fixed and make_depth_tree_conflicts() now works.


------------------------------------------------------------------------
r34236 | kfogel | 2008-11-17 07:35:37 +0100 (Mon, 17 Nov 2008) | 5 lines
Changed paths:
   M /trunk/www/svn_1.6_releasenotes.html

* www/svn_1.6_releasenotes.html
  (What's New in Subversion 1.6): Link to CHANGES file.

Suggested by: Anatoly Techtonik <techtonik@gmail.com>

------------------------------------------------------------------------
r34237 | rhuijben | 2008-11-17 11:56:39 +0100 (Mon, 17 Nov 2008) | 6 lines
Changed paths:
   M /trunk/TODO-1.6
   M /trunk/www/svn_1.6_releasenotes.html

* www/svn_1.6_releasenotes.html
  (SSL Certificate passphrases): Note that we can also save in a via Windows 
    CryptoAPI encrypted form.
* TODO-1.6
  (Issue 2489 for Windows): Remove item from optional, as it is finished now.

------------------------------------------------------------------------
r34238 | sbutler | 2008-11-17 13:14:41 +0100 (Mon, 17 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/cmdline/depth_tests.py

Revert r34235, which wrote tree conflict data to disk directly.
We'll fix the problem in a loggy way (with a new log operation for
tree conflict data).

------------------------------------------------------------------------
r34239 | hwright | 2008-11-17 15:32:01 +0100 (Mon, 17 Nov 2008) | 8 lines
Changed paths:
   M /branches/fsfs-pack
   M /branches/fsfs-pack/COMMITTERS
   M /branches/fsfs-pack/TODO-1.6
   M /branches/fsfs-pack/build.conf
   M /branches/fsfs-pack/configure.ac
   M /branches/fsfs-pack/contrib/client-side/svnmucc/svnmucc-test.py
   M /branches/fsfs-pack/contrib/client-side/svnmucc/svnmucc.c
   M /branches/fsfs-pack/contrib/hook-scripts/commit-email.pl.in
   M /branches/fsfs-pack/notes/tree-conflicts/design-overview.txt
   M /branches/fsfs-pack/notes/tree-conflicts/requirements.txt
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/test/wc.py
   M /branches/fsfs-pack/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/fsfs-pack/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/fsfs-pack/subversion/bindings/swig/python
   M /branches/fsfs-pack/subversion/bindings/swig/python/libsvn_swig_py
   M /branches/fsfs-pack/subversion/bindings/swig/python/tests/client.py
   M /branches/fsfs-pack/subversion/include
   M /branches/fsfs-pack/subversion/include/private/svn_auth_private.h
   M /branches/fsfs-pack/subversion/include/private/svn_cache.h
   M /branches/fsfs-pack/subversion/include/private/svn_fs_util.h
   M /branches/fsfs-pack/subversion/include/private/svn_sqlite.h
   M /branches/fsfs-pack/subversion/include/private/svn_wc_private.h
   M /branches/fsfs-pack/subversion/include/svn_auth.h
   M /branches/fsfs-pack/subversion/include/svn_client.h
   M /branches/fsfs-pack/subversion/include/svn_dirent_uri.h
   M /branches/fsfs-pack/subversion/include/svn_error.h
   M /branches/fsfs-pack/subversion/include/svn_fs.h
   M /branches/fsfs-pack/subversion/include/svn_io.h
   M /branches/fsfs-pack/subversion/include/svn_opt.h
   M /branches/fsfs-pack/subversion/include/svn_ra.h
   M /branches/fsfs-pack/subversion/include/svn_string.h
   M /branches/fsfs-pack/subversion/include/svn_wc.h
   M /branches/fsfs-pack/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/fsfs-pack/subversion/libsvn_client/blame.c
   M /branches/fsfs-pack/subversion/libsvn_client/commit.c
   M /branches/fsfs-pack/subversion/libsvn_client/commit_util.c
   M /branches/fsfs-pack/subversion/libsvn_client/copy.c
   M /branches/fsfs-pack/subversion/libsvn_client/diff.c
   M /branches/fsfs-pack/subversion/libsvn_client/export.c
   M /branches/fsfs-pack/subversion/libsvn_client/externals.c
   M /branches/fsfs-pack/subversion/libsvn_client/info.c
   M /branches/fsfs-pack/subversion/libsvn_client/merge.c
   M /branches/fsfs-pack/subversion/libsvn_client/ra.c
   M /branches/fsfs-pack/subversion/libsvn_client/repos_diff.c
   M /branches/fsfs-pack/subversion/libsvn_client/resolved.c
   M /branches/fsfs-pack/subversion/libsvn_client/status.c
   M /branches/fsfs-pack/subversion/libsvn_client/switch.c
   M /branches/fsfs-pack/subversion/libsvn_client/update.c
   M /branches/fsfs-pack/subversion/libsvn_diff/diff_file.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/tree.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/tree.c
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/commit.c
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/fetch.c
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/session.c
   M /branches/fsfs-pack/subversion/libsvn_ra_neon/util.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/commit.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/serf.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/util.c
   M /branches/fsfs-pack/subversion/libsvn_ra_svn/client.c
   M /branches/fsfs-pack/subversion/libsvn_repos/dump.c
   M /branches/fsfs-pack/subversion/libsvn_repos/fs-wrap.c
   M /branches/fsfs-pack/subversion/libsvn_repos/hooks.c
   M /branches/fsfs-pack/subversion/libsvn_repos/reporter.c
   M /branches/fsfs-pack/subversion/libsvn_repos/repos.h
   M /branches/fsfs-pack/subversion/libsvn_subr
   M /branches/fsfs-pack/subversion/libsvn_subr/auth.c
   M /branches/fsfs-pack/subversion/libsvn_subr/cmdline.c
   M /branches/fsfs-pack/subversion/libsvn_subr/deprecated.c
   M /branches/fsfs-pack/subversion/libsvn_subr/dirent_uri.c
   M /branches/fsfs-pack/subversion/libsvn_subr/error.c
   M /branches/fsfs-pack/subversion/libsvn_subr/io.c
   M /branches/fsfs-pack/subversion/libsvn_subr/simple_providers.c
   M /branches/fsfs-pack/subversion/libsvn_subr/sqlite.c
   M /branches/fsfs-pack/subversion/libsvn_subr/ssl_client_cert_providers.c
   M /branches/fsfs-pack/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/fsfs-pack/subversion/libsvn_subr/stream.c
   M /branches/fsfs-pack/subversion/libsvn_subr/subst.c
   M /branches/fsfs-pack/subversion/libsvn_subr/svn_string.c
   M /branches/fsfs-pack/subversion/libsvn_subr/win32_crypto.c
   M /branches/fsfs-pack/subversion/libsvn_wc/README
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_crawler.c
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_files.c
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_ops.c
   M /branches/fsfs-pack/subversion/libsvn_wc/ambient_depth_filter_editor.c
   M /branches/fsfs-pack/subversion/libsvn_wc/copy.c
   A /branches/fsfs-pack/subversion/libsvn_wc/crop.c (from /trunk/subversion/libsvn_wc/crop.c:34238)
   M /branches/fsfs-pack/subversion/libsvn_wc/deprecated.c
   M /branches/fsfs-pack/subversion/libsvn_wc/diff.c
   M /branches/fsfs-pack/subversion/libsvn_wc/entries.c
   M /branches/fsfs-pack/subversion/libsvn_wc/lock.c
   M /branches/fsfs-pack/subversion/libsvn_wc/log.c
   M /branches/fsfs-pack/subversion/libsvn_wc/log.h
   M /branches/fsfs-pack/subversion/libsvn_wc/merge.c
   M /branches/fsfs-pack/subversion/libsvn_wc/props.c
   M /branches/fsfs-pack/subversion/libsvn_wc/questions.c
   M /branches/fsfs-pack/subversion/libsvn_wc/relocate.c
   M /branches/fsfs-pack/subversion/libsvn_wc/status.c
   M /branches/fsfs-pack/subversion/libsvn_wc/translate.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.h
   M /branches/fsfs-pack/subversion/libsvn_wc/update_editor.c
   M /branches/fsfs-pack/subversion/libsvn_wc/util.c
   M /branches/fsfs-pack/subversion/libsvn_wc/wc.h
   M /branches/fsfs-pack/subversion/mod_dav_svn/activity.c
   M /branches/fsfs-pack/subversion/mod_dav_svn/util.c
   M /branches/fsfs-pack/subversion/po/fr.po
   M /branches/fsfs-pack/subversion/po/ko.po
   M /branches/fsfs-pack/subversion/po/pl.po
   M /branches/fsfs-pack/subversion/svn/info-cmd.c
   M /branches/fsfs-pack/subversion/svn/log-cmd.c
   M /branches/fsfs-pack/subversion/svn/main.c
   M /branches/fsfs-pack/subversion/svn/notify.c
   M /branches/fsfs-pack/subversion/svn/tree-conflicts.c
   M /branches/fsfs-pack/subversion/svn/util.c
   M /branches/fsfs-pack/subversion/svn_private_config.hw
   M /branches/fsfs-pack/subversion/svnadmin/main.c
   M /branches/fsfs-pack/subversion/svndumpfilter/main.c
   M /branches/fsfs-pack/subversion/svnlook/main.c
   M /branches/fsfs-pack/subversion/svnsync/main.c
   M /branches/fsfs-pack/subversion/tests/cmdline/commit_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/copy_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/depth_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/info_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/log_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/merge_authz_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/merge_tests.py
   A /branches/fsfs-pack/subversion/tests/cmdline/resolved_tests.py (from /trunk/subversion/tests/cmdline/resolved_tests.py:34238)
   M /branches/fsfs-pack/subversion/tests/cmdline/revert_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/stat_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/actions.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/tree.py
   M /branches/fsfs-pack/subversion/tests/cmdline/switch_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/fsfs-pack/subversion/tests/cmdline/update_tests.py
   M /branches/fsfs-pack/subversion/tests/libsvn_fs/fs-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_fs_base/changes-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_fs_base/fs-base-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_repos/repos-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/auth-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/translate-test.c
   M /branches/fsfs-pack/subversion/tests/svn_test.h
   M /branches/fsfs-pack/subversion/tests/svn_test_fs.c
   M /branches/fsfs-pack/subversion/tests/svn_test_fs.h
   M /branches/fsfs-pack/subversion/tests/svn_test_main.c
   M /branches/fsfs-pack/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/fsfs-pack/tools/po/po-update.sh
   M /branches/fsfs-pack/tools/server-side/svn_server_log_parse.py
   M /branches/fsfs-pack/tools/server-side/test_svn_server_log_parse.py
   M /branches/fsfs-pack/www/development.html
   M /branches/fsfs-pack/www/faq.html
   A /branches/fsfs-pack/www/faq.zh.html (from /trunk/www/faq.zh.html:34238)
   M /branches/fsfs-pack/www/hacking.html
   M /branches/fsfs-pack/www/index.html
   M /branches/fsfs-pack/www/issue-tracker.html
   M /branches/fsfs-pack/www/links.html
   M /branches/fsfs-pack/www/svn_1.6_releasenotes.html
   M /branches/fsfs-pack/www/tasks.html
   M /branches/fsfs-pack/www/tools_contrib.html
   A /branches/fsfs-pack/www/tools_contrib.zh.html (from /trunk/www/tools_contrib.zh.html:34238)

On the fsfs-pack branch:
YAMFT: Yet another merge from trunk.

Note: If it seems that I'm doing this with some type of OCD-like regularity,
that's not really the case.  I really do intend to finish the work on this
branch, and keeping it up-to-date is part of that process.  I just get
distracted by Real Life now and then.  ;)

------------------------------------------------------------------------
r34240 | cmpilato | 2008-11-17 16:15:40 +0100 (Mon, 17 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_fs/fs-test.c

* subversion/tests/libsvn_fs/fs-test.c
  (txn_names_are_not_reused): Don't really test FSFS with server minor
    version of 4.
  (node_origin_rev): Comment tweak.

------------------------------------------------------------------------
r34241 | julianfoad | 2008-11-17 16:16:27 +0100 (Mon, 17 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

TODO-1.6: Remove a resolved item.
------------------------------------------------------------------------
r34242 | markphip | 2008-11-17 19:05:38 +0100 (Mon, 17 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

JavaHL: A follow-up to r34220, implement secure client
certificate passphrase caching for Windows CryptoAPI.

* subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::getContext): Register Windows Crypto api ssl 
    client certificate passphrase provider in the auth batton.

------------------------------------------------------------------------
r34243 | blair | 2008-11-17 19:10:20 +0100 (Mon, 17 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

* subversion/bindings/javahl/native/SVNClient.cpp:
  Reindent a line modified in r34242 plus some other incorrectly
  indented lines.

------------------------------------------------------------------------
r34244 | pburba | 2008-11-17 19:57:42 +0100 (Mon, 17 Nov 2008) | 10 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Expand an existing reintegrate test to cover another common use case that
should succeed.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_with_subtree_mergeinfo): Test that a rename on 'trunk'
  which is merged to the 'branch', doesn't stop otherwise valid attempts to
  reintegrate 'branch' back to 'trunk'.
  (test_list): Mark reintegrate_with_subtree_mergeinfo as XFail.


------------------------------------------------------------------------
r34245 | stsp | 2008-11-18 01:58:03 +0100 (Tue, 18 Nov 2008) | 25 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

Some housekeeping in dirent/uri parsing code.

* subversion/libsvn_subr/dirent_uri.c
  (path_type_t): There seems to be no significant difference
    between type_url and type_uri. And since type_url is not
    used anywhere, remove it.
  (internal_style, local_style): Fix docstrings to accommodate
   for parameter changes made in r33553.
  (canonicalize): Add docstring.
   Add XXX and FIXME comments describing some oddities I've
   observed while reading and running this code.
   Fix indentation.
   Do not move 'src' pointer past null-terminator.
  (get_longest_ancestor_length): Fix docstrings to accommodate
   for parameter changes made in r33553.
   Move variable 'unc' completely into #ifdef WIN32 since other
   platforms don't need it.
   Fix indentation.
   Test for types == type_dirent where previously testing for
   types != type_uri.
   Add an assertion on Win32 which would uncover bugs if triggered.
   In a comment, mention implicit assumption (i <= string length).
  (is_child, is_ancestor): Add FIXMEs to remind us that these
   functions need docstrings.

------------------------------------------------------------------------
r34246 | stsp | 2008-11-18 02:30:52 +0100 (Tue, 18 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/dirent_uri.c
  (canonicalize): Revert a wrong comment I added in r34245.
  (get_longest_ancestor_length): Revert redundant whitespace
   I added in r34245.

------------------------------------------------------------------------
r34247 | neels | 2008-11-18 07:13:52 +0100 (Tue, 18 Nov 2008) | 22 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/tree_conflicts.h
   M /trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c

Fix (probably most of) issue #3320: Commit fails to block on tree-conflict.

* subversion/libsvn_client/commit_util.c
  (harvest_committables):
    Already check for tree-conflicts on immediate child nodes when harvesting
    a directory, adhering to the requested DEPTH. Thus catch tree-conflicts
    on nodes that don't have an entry (only when recursing; when the target
    is a victim and has no entry, "commit" still gives a different error).
  (do_item_commit): Fix typo in comment.

* subversion/libsvn_wc/tree_conflicts.h,
* subversion/include/private/svn_wc_private.h
  (svn_wc__read_tree_conflicts_from_entry): 
    Move declaration of this function to svn_wc_private.h, so that it
    is visible in commit_util.c (s.a.).
    Also clarify the function's comment.

* subversion/tests/libsvn_wc/tree-conflict-data-test.c:
    Also include svn_wc_private.h,
    for svn_wc__read_tree_conflicts_from_entry().


------------------------------------------------------------------------
r34248 | julianfoad | 2008-11-18 12:33:21 +0100 (Tue, 18 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/include/svn_io.h
   M /trunk/subversion/include/svn_mergeinfo.h
   M /trunk/subversion/include/svn_wc.h

Fix Doxygen mark-up.

* subversion/include/svn_io.h,
  subversion/include/svn_mergeinfo.h,
  subversion/include/svn_wc.h
  Replace the bogus command "@seealso" with "@see". Where "@see" occurred in
  sentences, replace it with plain text, because "@see" starts a new
  section.

------------------------------------------------------------------------
r34249 | julianfoad | 2008-11-18 18:39:02 +0100 (Tue, 18 Nov 2008) | 6 lines
Changed paths:
   M /trunk/TODO-1.6
   M /trunk/notes/tree-conflicts/design-overview.txt

* TODO-1.6
  Modify status of tree conflict issues.

* notes/tree-conflicts/design-overview.txt
  Add a TODO note, and reformat a paragraph.

------------------------------------------------------------------------
r34250 | stsp | 2008-11-18 20:44:36 +0100 (Tue, 18 Nov 2008) | 6 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Make issue #3322 a 1.6 blocker. Also, mention that tree conflicts
   should be delayed till 1.7 if essential tree-conflict-related blocker tasks
   are not resolved by the time we branch 1.6.
   Note: This is *my* view on it. If you disagree with delaying to 1.7 because
   of any current blockers, please let me know so we can discuss this.

------------------------------------------------------------------------
r34251 | stsp | 2008-11-18 20:52:41 +0100 (Tue, 18 Nov 2008) | 3 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Tweak IRC conversation for #3322 blocker, so it says what
   I really meant to say.

------------------------------------------------------------------------
r34252 | hwright | 2008-11-18 21:53:03 +0100 (Tue, 18 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/dag.c
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c
   M /trunk/subversion/libsvn_fs_fs/tree.c

Revert r34215 and r33954, which fix and implement sha1 checksums on FSFS.

In the process, those revisions removed support for md5, which kills a fair
amount of the consistency checking in the repository.  A patch which implements
both is forthcoming.

------------------------------------------------------------------------
r34253 | stsp | 2008-11-18 23:05:35 +0100 (Tue, 18 Nov 2008) | 2 lines
Changed paths:
   M /trunk/www/poole-response.html

* www/poole-response.html: Fix broken link to opinion piece.

------------------------------------------------------------------------
r34254 | stsp | 2008-11-18 23:18:00 +0100 (Tue, 18 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

Knock off a FIXME item in dirent/uri parsing code.

* subversion/libsvn_subr/dirent_uri.c
  (canonicalize): Do not rely on the 'dst' pointer pointing
   1 byte after the null-terminator when removing trailing
   slash from canonicalised string.

------------------------------------------------------------------------
r34255 | stsp | 2008-11-18 23:21:37 +0100 (Tue, 18 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/dirent_uri.c
  (canonicalize): Fix a wrong comment added in r34254.

------------------------------------------------------------------------
r34256 | pburba | 2008-11-18 23:21:47 +0100 (Tue, 18 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Correct a reintegrate test's expectations.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_fail_on_stale_source): Don't expect the reintegrate to fail
  simply because the source was never merged to, see
  See http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=145500.
  (test_list): Remove XFail from reintegrate_fail_on_stale_source.

------------------------------------------------------------------------
r34257 | stsp | 2008-11-18 23:38:36 +0100 (Tue, 18 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/dirent_uri.c
  (canonicalize): For consistency's sake, use SVN_PATH_IS_EMPTY
   macro to check whether an empty string was passed, like
   many other functions in this file already do.

------------------------------------------------------------------------
r34258 | gstein | 2008-11-19 00:04:41 +0100 (Wed, 19 Nov 2008) | 6 lines
Changed paths:
   M /trunk/configure.ac

For maintainers, add a bunch of flags to the GCC compilation line to flag
more warnings about our constructs.

* configure.ac:
  (CFLAGS): add flags when --enable-maintainer-mode is specified

------------------------------------------------------------------------
r34259 | gstein | 2008-11-19 00:10:37 +0100 (Wed, 19 Nov 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

A couple items that I've left in my wake...

------------------------------------------------------------------------
r34260 | stsp | 2008-11-19 00:12:07 +0100 (Wed, 19 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/dirent_uri.c
  (is_child): Add docstring.

------------------------------------------------------------------------
r34261 | stsp | 2008-11-19 00:57:29 +0100 (Wed, 19 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/dirent_uri.c
  (is_child): Add some comments, partly FIXMEs, partly to make surrounding
   code easier to follow. Add brackets around nested if/else statements.
   Do not treat a child part with zero length as child, return NULL in this
   case, not an empty string.

------------------------------------------------------------------------
r34262 | stsp | 2008-11-19 01:03:19 +0100 (Wed, 19 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/dirent_uri.c
  (is_child): Fix a typo in a comment.

------------------------------------------------------------------------
r34263 | neels | 2008-11-19 02:37:39 +0100 (Wed, 19 Nov 2008) | 9 lines
Changed paths:
   M /trunk/configure.ac

Reverting r34258: It breaks the maintainer-mode build on some systems.

See this mail:
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=145526
Date: Wed, 19 Nov 2008 02:38:44 +0100
From: Neels J. Hofmeyr <neels@elego.de>
Subject: Trunk build broken: Re: svn commit: r34258 - trunk


------------------------------------------------------------------------
r34264 | hwright | 2008-11-19 03:54:33 +0100 (Wed, 19 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/io.c

* subversion/libsvn_subr/io.c
  (svn_io_file_trunc): Remove a non-reachable and redundant return statement.

------------------------------------------------------------------------
r34265 | hwright | 2008-11-19 04:38:57 +0100 (Wed, 19 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/dirent_uri.c
  (internal_style, local_style): Change a run-time check to a compile-time
    check.

------------------------------------------------------------------------
r34266 | neels | 2008-11-19 06:39:14 +0100 (Wed, 19 Nov 2008) | 21 lines
Changed paths:
   M /trunk/subversion/libsvn_client/commit_util.c

Follow-up on r34247: issue #3320: Commit fails to block on tree-conflict.

Fix handling of changelists in r34247, compare against child entry instead
of parent entry. Also, when using changelists, silently skip tree-conflict
victims that have no entry.

Note: There is no way of assigning a tree-conflict victim that has no entry
to a changelist.

Move the checking of tree-conflicted children out into another function
for code readability.

* subversion/libsvn_client/commit_util.c
  (bail_on_tree_conflicted_children):
    New function contains the error detection on tree-conflicted child nodes.
    Handle changelists properly (s.a.).
  (harvest_committables): 
    Move checking of tree-conflicted children to
    new function bail_on_tree_conflicted_children().


------------------------------------------------------------------------
r34267 | neels | 2008-11-19 06:46:14 +0100 (Wed, 19 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_client/commit_util.c

Another follow-up on r34247: issue #3320: Commit fails to block on tree-
conflict.

* subversion/libsvn_client/commit_util.c
  (svn_client__harvest_committables): 
    Issue a correct tree-conflict error when the *target* is a tree-conflict
    victim without an entry, instead of saying "not under version control".


------------------------------------------------------------------------
r34268 | neels | 2008-11-19 06:49:00 +0100 (Wed, 19 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/lock.c

* subversion/libsvn_wc/lock.c
  (extend_lock_found_entry): Fix typo in comment.


------------------------------------------------------------------------
r34269 | sbutler | 2008-11-19 15:06:27 +0100 (Wed, 19 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/resolved_tests.py

Update test expectations for the resolved command.  Follow-up to
r34158 (update/switch should skip tree conflict victims).

* subversion/tests/cmdline/resolved_tests.py (resolved_on_wc_root):
  Adjust expected status to reflect that descendants of a tree
  conflict victim are not updated.


------------------------------------------------------------------------
r34270 | sbutler | 2008-11-19 16:17:20 +0100 (Wed, 19 Nov 2008) | 4 lines
Changed paths:
   M /trunk/build.conf

Add resolved_tests.py to the cmdline test list.

* build.conf: Add missing test to the test-scripts list.

------------------------------------------------------------------------
r34271 | hwright | 2008-11-19 18:28:06 +0100 (Wed, 19 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_delta/depth_filter_editor.c

Fix a few compiler warnings.

* subversion/libsvn_delta/depth_filter_editor.c
  (okay_to_edit): Include the rest of the depth enum in a switch statement,
    and move the abort() call to the default case.  Also, for cases which we
    should never hit, make them abort(), too.

------------------------------------------------------------------------
r34272 | hwright | 2008-11-19 19:22:43 +0100 (Wed, 19 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/time.c

More compiler warning fixup.

* subversion/libsvn_subr/time.c
  Make some static constant never-ever changing variables macros instead.
  (svn_time_to_cstring, svn_time_from_cstring, svn_time_to_human_cstring): Use
   the new macros, remove some long-dead code.

------------------------------------------------------------------------
r34273 | sbutler | 2008-11-19 22:26:59 +0100 (Wed, 19 Nov 2008) | 50 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/status.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

Changing existing tree-conflict data functions for use in fixing
issue 3328 "Update can't record >1 add/edit tree conflict per dir".

The functions should read and write strings instead of entries.
When running logs, it's kind of silly to make dummy entries just
to hold the tc-data strings.


* subversion/include/private/svn_wc_private.h
  (svn_wc__read_tree_conflicts_from_entry): Renamed to...
  (svn_wc__read_tree_conflicts): this, take a string arg instead of
   an entry, and take a **conflicts while we're here, for
   consistency with other APIs.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__write_tree_conflicts_from_entry): Renamed to...
  (svn_wc__write_tree_conflicts): this, take a string arg instead of
   an entry, and take a **conflicts while we're here, for
   consistency with other APIs.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__read_tree_conflicts_from_entry): Renamed to...
  (svn_wc__read_tree_conflicts): this, etc.
  (svn_wc__write_tree_conflicts_from_entry): Renamed to...
  (svn_wc__write_tree_conflicts): this, etc.
  (svn_wc__loggy_del_tree_conflicts,
   svn_wc__loggy_add_tree_conflicts,
   svn_wc__get_tree_conflicts): Track renames and arg changes.
   

* subversion/libsvn_wc/adm_ops.c
  (revert_internal): Track renames and arg changes.

* subversion/libsvn_wc/entries.c
  (visit_tc_too_found_entry): Track renames and arg changes.

* subversion/libsvn_wc/status.c
  (get_dir_status): Track renames and arg changes.

* subversion/libsvn_client/commit_util.c
  (bail_on_tree_conflicted_children): Track renames and arg changes.

* subversion/tests/libsvn_wc/tree-conflict-data-test.c
  (test_read_tree_conflict,
   test_read_2_tree_conflicts,
   test_read_invalid_tree_conflicts,
   test_write_tree_conflict,
   test_write_2_tree_conflicts,
   test_write_invalid_tree_conflicts): Track renames and arg changes.

------------------------------------------------------------------------
r34274 | hwright | 2008-11-20 00:11:23 +0100 (Thu, 20 Nov 2008) | 20 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_subr/pool.c
   M /trunk/subversion/libsvn_wc/translate.c
   M /trunk/subversion/svn/status.c
   M /trunk/subversion/svnadmin/main.c

More warning quashing: remove some unreachable code.  In some cases, this code
was intentionally inserted to keep the compiler happy.  It turns out the
compiler (or at least recent versions of GCC) now complain about the code being
there, so we can remove it.

Also, this doesn't remove all such warnings in our code base, just the ones for
which removing it was obvious.

* subversion/libsvn_subr/pool.c
  (abort_on_pool_feature),
* subversion/svn/status.c
  (generate_status_desc),
* subversion/svnadmin/main.c
  (subcommand_crashtest),
* subversion/libsvn_wc/translate.c
  (read_handler_unsupported, write_handler_unsupported),
* subversion/libsvn_client/merge.c
  (calculate_left_hand_side):
  Remove some dead code.

------------------------------------------------------------------------
r34275 | pburba | 2008-11-20 00:38:12 +0100 (Thu, 20 Nov 2008) | 3 lines
Changed paths:
   M /branches/diff-repos-wc/build.conf
   M /branches/diff-repos-wc/notes/tree-conflicts/design-overview.txt
   M /branches/diff-repos-wc/notes/tree-conflicts/requirements.txt
   M /branches/diff-repos-wc/subversion/include
   M /branches/diff-repos-wc/subversion/include/private/svn_auth_private.h
   M /branches/diff-repos-wc/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/diff-repos-wc/subversion/libsvn_subr
   M /branches/diff-repos-wc/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/diff-repos-wc/subversion/tests/libsvn_subr
   M /branches/diff-repos-wc/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/diff-repos-wc/tools/server-side/svn_server_log_parse.py
   M /branches/diff-repos-wc/tools/server-side/test_svn_server_log_parse.py
   M /branches/diff-repos-wc/www/development.html
   M /branches/diff-repos-wc/www/issue-tracker.html
   M /branches/diff-repos-wc/www/tasks.html
   M /branches/explore-wc/build.conf
   M /branches/explore-wc/notes/tree-conflicts/design-overview.txt
   M /branches/explore-wc/notes/tree-conflicts/requirements.txt
   M /branches/explore-wc/subversion/include
   M /branches/explore-wc/subversion/include/private/svn_auth_private.h
   M /branches/explore-wc/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/explore-wc/subversion/libsvn_subr
   M /branches/explore-wc/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/explore-wc/subversion/tests/libsvn_subr
   M /branches/explore-wc/tools/server-side/svn_server_log_parse.py
   M /branches/explore-wc/tools/server-side/test_svn_server_log_parse.py
   M /branches/explore-wc/www/development.html
   M /branches/explore-wc/www/issue-tracker.html
   M /branches/explore-wc/www/tasks.html
   M /branches/fsfs-pack/build.conf
   M /branches/fsfs-pack/notes/tree-conflicts/design-overview.txt
   M /branches/fsfs-pack/notes/tree-conflicts/requirements.txt
   M /branches/fsfs-pack/subversion/include
   M /branches/fsfs-pack/subversion/include/private/svn_auth_private.h
   M /branches/fsfs-pack/subversion/include/private/svn_cache.h
   M /branches/fsfs-pack/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/fsfs-pack/subversion/libsvn_subr
   M /branches/fsfs-pack/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/fsfs-pack/subversion/tests/libsvn_subr
   M /branches/fsfs-pack/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/fsfs-pack/tools/server-side/svn_server_log_parse.py
   M /branches/fsfs-pack/tools/server-side/test_svn_server_log_parse.py
   M /branches/fsfs-pack/www/development.html
   M /branches/fsfs-pack/www/issue-tracker.html
   M /branches/fsfs-pack/www/tasks.html
   M /branches/ignore-mergeinfo/build.conf
   M /branches/ignore-mergeinfo/notes/tree-conflicts/design-overview.txt
   M /branches/ignore-mergeinfo/notes/tree-conflicts/requirements.txt
   M /branches/ignore-mergeinfo/subversion/include
   M /branches/ignore-mergeinfo/subversion/include/private/svn_auth_private.h
   M /branches/ignore-mergeinfo/subversion/include/private/svn_cache.h
   M /branches/ignore-mergeinfo/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/ignore-mergeinfo/subversion/libsvn_subr
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr
   M /branches/ignore-mergeinfo/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/ignore-mergeinfo/tools/server-side/svn_server_log_parse.py
   M /branches/ignore-mergeinfo/tools/server-side/test_svn_server_log_parse.py
   M /branches/ignore-mergeinfo/www/development.html
   M /branches/ignore-mergeinfo/www/issue-tracker.html
   M /branches/ignore-mergeinfo/www/tasks.html
   M /branches/issue-2382/build.conf
   M /branches/issue-2382/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2382/notes/tree-conflicts/requirements.txt
   M /branches/issue-2382/subversion/include
   M /branches/issue-2382/subversion/include/private/svn_auth_private.h
   M /branches/issue-2382/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2382/subversion/libsvn_subr
   M /branches/issue-2382/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-2382/subversion/tests/libsvn_subr
   M /branches/issue-2382/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2382/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2382/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2382/www/development.html
   M /branches/issue-2382/www/issue-tracker.html
   M /branches/issue-2382/www/tasks.html
   M /branches/issue-2897-take2/build.conf
   M /branches/issue-2897-take2/notes/tree-conflicts/design-overview.txt
   M /branches/issue-2897-take2/notes/tree-conflicts/requirements.txt
   M /branches/issue-2897-take2/subversion/include
   M /branches/issue-2897-take2/subversion/include/private/svn_auth_private.h
   M /branches/issue-2897-take2/subversion/include/private/svn_cache.h
   M /branches/issue-2897-take2/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2897-take2/subversion/libsvn_subr
   M /branches/issue-2897-take2/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr
   M /branches/issue-2897-take2/tools/buildbot/slaves/win32-xp-VS2005
   M /branches/issue-2897-take2/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2897-take2/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2897-take2/www/development.html
   M /branches/issue-2897-take2/www/issue-tracker.html
   M /branches/issue-2897-take2/www/tasks.html
   M /branches/reduce-wc-walks-for-mergeinfo/build.conf
   M /branches/reduce-wc-walks-for-mergeinfo/notes/tree-conflicts/design-overview.txt
   M /branches/reduce-wc-walks-for-mergeinfo/notes/tree-conflicts/requirements.txt
   M /branches/reduce-wc-walks-for-mergeinfo/subversion/include
   M /branches/reduce-wc-walks-for-mergeinfo/subversion/include/private/svn_auth_private.h
   M /branches/reduce-wc-walks-for-mergeinfo/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/reduce-wc-walks-for-mergeinfo/subversion/libsvn_subr
   M /branches/reduce-wc-walks-for-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/reduce-wc-walks-for-mergeinfo/subversion/tests/libsvn_subr
   M /branches/reduce-wc-walks-for-mergeinfo/tools/server-side/svn_server_log_parse.py
   M /branches/reduce-wc-walks-for-mergeinfo/tools/server-side/test_svn_server_log_parse.py
   M /branches/reduce-wc-walks-for-mergeinfo/www/development.html
   M /branches/reduce-wc-walks-for-mergeinfo/www/issue-tracker.html
   M /branches/reduce-wc-walks-for-mergeinfo/www/tasks.html
   M /branches/svnpatch-diff/build.conf
   M /branches/svnpatch-diff/notes/tree-conflicts/design-overview.txt
   M /branches/svnpatch-diff/notes/tree-conflicts/requirements.txt
   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/libsvn_auth_kwallet/kwallet.cpp
   M /branches/svnpatch-diff/subversion/libsvn_subr
   M /branches/svnpatch-diff/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr
   M /branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005
   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/www/development.html
   M /branches/svnpatch-diff/www/issue-tracker.html
   M /branches/svnpatch-diff/www/tasks.html
   M /trunk/build.conf
   M /trunk/notes/tree-conflicts/design-overview.txt
   M /trunk/notes/tree-conflicts/requirements.txt
   M /trunk/subversion/include
   M /trunk/subversion/include/private/svn_auth_private.h
   M /trunk/subversion/include/private/svn_cache.h
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /trunk/subversion/libsvn_subr
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.txt
   M /trunk/subversion/tests/libsvn_subr
   M /trunk/tools/buildbot/slaves/win32-xp-VS2005
   M /trunk/tools/server-side/svn_server_log_parse.py
   M /trunk/tools/server-side/test_svn_server_log_parse.py
   M /trunk/www/development.html
   M /trunk/www/issue-tracker.html
   M /trunk/www/tasks.html

Remove all subtree mergeinfo from trunk and feature branches.

See http://svn.haxx.se/dev/archive-2008-11/0532.shtml.
------------------------------------------------------------------------
r34276 | neels | 2008-11-20 04:21:40 +0100 (Thu, 20 Nov 2008) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_client/resolved.c

Fix a segmentation fault when resolving an entry-less tree-conflict as
explicit target.

* subversion/libsvn_client/resolved.c
  (svn_client_resolve):
    Add two cases where a path should not be considered a working copy
    root: Where there is no ENTRY, and where it has no repository URL.
    No ENTRY: it may be a tree-conflict without an entry.
    No ENTRY->url: it may be a tree-conflicted deleted item.
    Adjust comments.


------------------------------------------------------------------------
r34277 | neels | 2008-11-20 05:41:56 +0100 (Thu, 20 Nov 2008) | 5 lines
Changed paths:
   A /branches/tc_url_rev (from /trunk:34276)

New lightweight branch tc_url_rev: Issue #3322: store URL@REV of older+theirs.
Tree-conflicts should show URL@REV info (and more) on victims for both sides
of a conflict.


------------------------------------------------------------------------
r34278 | neels | 2008-11-20 05:48:22 +0100 (Thu, 20 Nov 2008) | 35 lines
Changed paths:
   M /branches/tc_url_rev/subversion/include/svn_wc.h
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c
   M /branches/tc_url_rev/subversion/libsvn_wc/update_editor.c

On *lightweight* branch tc_url_rev:
*** Checking in julianf's initial patch version ***
*** (store-conflict-urls-1.patch)               ***

When raising a tree conflict, store the URLs and revisions of the incoming
change, as this information can be valuable when resolving the conflict and
otherwise is not necessarily available after the event. Display this info in
"svn info".

### Patch in progress, not ready for commit.

TODO:    Tests.
Started: Put info about new conflict into description struct, in merge.
Started: Put info about new conflict into description struct, in update/switch.
TODO:    Store info from description struct into (parent dir's) WC entry.
TODO:    Fetch info from (parent dir's) WC entry into description struct.
Nil:     Remove info from WC on revert/resolve. (No action needed at present.)
TODO:    Display info from description struct, in "svn info".

(Possible extension: Do likewise for text and property conflicts as well.)

* subversion/include/svn_wc.h
  (svn_wc_conflict_node_version_t): New structure.
  (svn_wc_conflict_description_t): Add 'older_version' and 'their_version'
    fields of type svn_wc_conflict_node_version_t.

* subversion/libsvn_client/merge.c
  (tree_conflict): Fill in 'older_version' and 'their_version' fields of
    conflict description.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Fill in 'older_version' and 'their_version' fields of
    conflict description.


------------------------------------------------------------------------
r34279 | neels | 2008-11-20 06:36:46 +0100 (Thu, 20 Nov 2008) | 9 lines
Changed paths:
   M /branches/tc_url_rev/subversion/include/svn_wc.h
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c

On branch `tc_url_rev': Change two comments.

* subversion/include/svn_wc.h
  (svn_wc_conflict_description_t): Suggest a comment on ACCESS.

* subversion/libsvn_client/merge.c
  (tree_conflict): Fix typo.


------------------------------------------------------------------------
r34280 | gstein | 2008-11-20 08:22:24 +0100 (Thu, 20 Nov 2008) | 9 lines
Changed paths:
   M /trunk/configure.ac

Second attempt at adding more warning flags to maintainers' build. First
attempt was r34258 which broke the build for some (reverted in r34263).
This version will now test for the acceptance of some GCC flags (which
older GCC versions may not have) before deciding to use them.

* configure.ac:
  (CFLAGS): add some warning flags for maintainers. for a select few (only
    present in newer GCCs), test for their existence first.

------------------------------------------------------------------------
r34281 | stsp | 2008-11-20 13:22:19 +0100 (Thu, 20 Nov 2008) | 5 lines
Changed paths:
   M /trunk/configure.ac

Followup to r34280: Unbreak build for gcc-3.3.5.

* configure.ac
  (CFLAGS): Make -Wold-style-definition an optional warning.

------------------------------------------------------------------------
r34282 | julianfoad | 2008-11-20 15:37:38 +0100 (Thu, 20 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

TODO-1.6: Remove a done item.
------------------------------------------------------------------------
r34283 | julianfoad | 2008-11-20 17:59:43 +0100 (Thu, 20 Nov 2008) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h

Refactor some code in preparation for expanding it.

* subversion/libsvn_wc/tree_conflicts.c
  (read_field_separator, read_string_field): New functions.
  (read_victim_path): Don't skip the separator. Simplify by using
    read_string_field().
  (read_node_kind, read_operation, read_action): Don't skip the separator.
   read_reason): Document that we don't skip the final separator.
  (read_one_tree_conflict): Skip the separators explicitly between fields.
  (write_string_field): New function.
  (svn_wc__write_tree_conflicts): Simplify by using write_string_field().

* subversion/libsvn_wc/tree_conflicts.h
  (SVN_WC__NODE_NONE): New constant, to complement '..._FILE' and '..._DIR'.

------------------------------------------------------------------------
r34284 | julianfoad | 2008-11-20 18:09:14 +0100 (Thu, 20 Nov 2008) | 1 line
Changed paths:
   M /branches/tc_url_rev
   M /branches/tc_url_rev/TODO-1.6
   M /branches/tc_url_rev/configure.ac
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.h

On the tc_url_rev branch: Merge changes from trunk up to r34283.
------------------------------------------------------------------------
r34285 | stsp | 2008-11-20 18:14:36 +0100 (Thu, 20 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/include/svn_dirent_uri.h

* subversion/include/svn_dirent_uri.h
  (svn_dirent_join): Fix a typo in docstring.

------------------------------------------------------------------------
r34286 | hwright | 2008-11-20 18:31:59 +0100 (Thu, 20 Nov 2008) | 10 lines
Changed paths:
   M /branches/fsfs-pack/build.conf
   A /branches/fsfs-pack/subversion/tests/libsvn_fs_fs
   A /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c

On the fsfs-pack branch:
Add a directory for a series of fsfs-specific tests, and populate it with
a stub for fsfs packing tests.

* build.conf
  (fs-pack-test): New section.
  (libs): Add fs-pack-test to the list of tests to run.

* subversion/tests/libsvn_fs_fs/fs-pack-test.c: New.

------------------------------------------------------------------------
r34287 | hwright | 2008-11-20 18:38:46 +0100 (Thu, 20 Nov 2008) | 4 lines
Changed paths:
   M /branches/fsfs-pack
   M /branches/fsfs-pack/TODO-1.6
   M /branches/fsfs-pack/build.conf
   M /branches/fsfs-pack/configure.ac
   M /branches/fsfs-pack/notes/tree-conflicts/design-overview.txt
   M /branches/fsfs-pack/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/fsfs-pack/subversion/include/private/svn_wc_private.h
   M /branches/fsfs-pack/subversion/include/svn_dirent_uri.h
   M /branches/fsfs-pack/subversion/include/svn_io.h
   M /branches/fsfs-pack/subversion/include/svn_mergeinfo.h
   M /branches/fsfs-pack/subversion/include/svn_wc.h
   M /branches/fsfs-pack/subversion/libsvn_client/commit_util.c
   M /branches/fsfs-pack/subversion/libsvn_client/merge.c
   M /branches/fsfs-pack/subversion/libsvn_client/resolved.c
   M /branches/fsfs-pack/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/dag.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/tree.c
   M /branches/fsfs-pack/subversion/libsvn_subr/dirent_uri.c
   M /branches/fsfs-pack/subversion/libsvn_subr/io.c
   M /branches/fsfs-pack/subversion/libsvn_subr/pool.c
   M /branches/fsfs-pack/subversion/libsvn_subr/time.c
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_ops.c
   M /branches/fsfs-pack/subversion/libsvn_wc/entries.c
   M /branches/fsfs-pack/subversion/libsvn_wc/lock.c
   M /branches/fsfs-pack/subversion/libsvn_wc/status.c
   M /branches/fsfs-pack/subversion/libsvn_wc/translate.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.h
   M /branches/fsfs-pack/subversion/svn/status.c
   M /branches/fsfs-pack/subversion/svnadmin/main.c
   M /branches/fsfs-pack/subversion/tests/cmdline/merge_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/resolved_tests.py
   M /branches/fsfs-pack/subversion/tests/libsvn_fs/fs-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/fsfs-pack/www/poole-response.html

On the fsfs-pack branch:
Bring up to date with trunk, specifically to pull in the changes to 
build.conf.

------------------------------------------------------------------------
r34288 | stsp | 2008-11-20 19:26:21 +0100 (Thu, 20 Nov 2008) | 11 lines
Changed paths:
   A /trunk/notes/tree-conflicts/use-cases-resolution.txt

Add notes about resolving tree conflict use cases 1 to 6.

This file does not describe any design requirements.
It just shows how one may go about resolving particular
tree conflicts using what we currently have in trunk.

Maybe it will provide inspiration, or come in handy as
a reference, for someone, somewhere, some day.

* notes/tree-conflicts/use-cases-resolution.txt: New file.

------------------------------------------------------------------------
r34289 | danielsh | 2008-11-20 20:14:21 +0100 (Thu, 20 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/config_file.c

Fix ambiguity in the description of 'ssl-authority-files'.

* subversion/libsvn_subr/config_file.c
  (svn_config_ensure):
    Clarify that only one CA is allowed per file.

Found by: cmpilato
------------------------------------------------------------------------
r34290 | hwright | 2008-11-20 21:12:09 +0100 (Thu, 20 Nov 2008) | 7 lines
Changed paths:
   M /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c

On the fsfs-pack branch:
Add an API-level test for FSFS packing.

* subversion/tests/libsvn_fs_fs/fs-pack-test.c
  (write_format): New.  Largely stolen from libsvn_fs_fs/fs_fs.c.
  (pack_filesystem): Fill out the implementation.

------------------------------------------------------------------------
r34291 | hwright | 2008-11-20 22:02:23 +0100 (Thu, 20 Nov 2008) | 9 lines
Changed paths:
   M /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c

On the fsfs-pack branch:
Add another (failing) test for reading from packed repositories.

* subversion/tests/libsvn_fs_fs/fs-pack-test.c
  (get_rev_contents, create_packed_filesystem): New.
  (pack_filesystem): Make use of our new helper functions.
  (read_packed_fs): New test.
  (test_funcs): Add the new test as XFailing.

------------------------------------------------------------------------
r34292 | julianfoad | 2008-11-21 01:26:45 +0100 (Fri, 21 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/tree_conflicts.c

* subversion/libsvn_wc/tree_conflicts.c
  Add an overview comment at the top of the file.

------------------------------------------------------------------------
r34293 | julianfoad | 2008-11-21 01:45:12 +0100 (Fri, 21 Nov 2008) | 15 lines
Changed paths:
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c

Refactor the tree conflict storage code some more.

* subversion/libsvn_wc/tree_conflicts.c
  (advance_on_match): Delete.
  (read_desc_separator): New function.
  (enum_mapping_t): New type.
  (node_kind_map, operation_map, action_map, reason_map): New data.
  (read_enum_field): New function.
  (read_victim_path, read_node_kind, read_operation, read_action, read_reason):
    Delete.
  (read_one_tree_conflict): Simplify, using the new functions and data.
  (svn_wc__read_tree_conflicts): Tweak and simplify.
  (write_enum_field): New function.
  (svn_wc__write_tree_conflicts): Simplify, using write_enum_field().

------------------------------------------------------------------------
r34294 | julianfoad | 2008-11-21 02:06:37 +0100 (Fri, 21 Nov 2008) | 10 lines
Changed paths:
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c

Store and retrieve the extra tree conflict info introduced in r34278.

* subversion/libsvn_wc/tree_conflicts.c
  (read_node_version_info): New function.
  (read_one_tree_conflict): Use read_node_version_info() to retrieve the new
    data.
  (write_integer_field, write_node_version_info): New functions.
  (svn_wc__write_tree_conflicts): Use write_node_version_info() to store the
    new data.

------------------------------------------------------------------------
r34295 | julianfoad | 2008-11-21 02:15:27 +0100 (Fri, 21 Nov 2008) | 17 lines
Changed paths:
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.c

Print tree conflict URLs and revs in "svn info".

Done:    Put info about new conflict into description struct, in merge.
Started: Put info about new conflict into description struct, in update/switch.
Done:    Store info from description struct into (parent dir's) WC entry.
Done:    Fetch info from (parent dir's) WC entry into description struct.
Nil:     Remove info from WC on revert/resolve. (No action needed at present.)
Done:    Display info from description struct, in "svn info".
TODO:    Display info from description struct, in "svn info --xml".

* subversion/libsvn_client/merge.c
  (tree_conflict): Fill in the "repos_url" and "path_in_repos" fields properly.

* subversion/svn/tree-conflicts.c
  (svn_cl__append_human_readable_tree_conflict_description): Print this data as
    part of the normal "svn info" output when a tree conflict is present.

------------------------------------------------------------------------
r34296 | hwright | 2008-11-21 04:11:30 +0100 (Fri, 21 Nov 2008) | 14 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:
When packing a filesystem, store the manifest independent of the pack file.
This does a couple of things: makes calculating offsets a bit easier, and
also allows us to potentially keep the manifest file opened and/or cached
for later use.  Plus, it's easier to debug, and we can always go back if we
change the pack method later.

* subversion/tests/libsvn_fs_fs/fs-pack-test.c
  (pack_filesystem): Update the test.

* subversion/libsvn_fs_fs/fs_fs.c
  (pack_shard): Use a permanent file for the manifest, and don't append it
    to the pack file when done.

------------------------------------------------------------------------
r34297 | hwright | 2008-11-21 04:25:09 +0100 (Fri, 21 Nov 2008) | 9 lines
Changed paths:
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c

On the fsfs-pack branch:
Remove various and sundry compiler warnings.

* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__rev_get_root): Remove unused variable.
  (packer_func): Make static, and remove unused variables.  Also, fix
    format strings.
  (pack_shard): Make static and fix format strings.

------------------------------------------------------------------------
r34298 | neels | 2008-11-21 06:23:35 +0100 (Fri, 21 Nov 2008) | 18 lines
Changed paths:
   M /branches/tc_url_rev/subversion/libsvn_wc/update_editor.c
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.c

On branch tc_url_rev: Some progress in `update' tree-conflicts info.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict):
    Add arguments THEIR_NODE_KIND and THEIR_URL, instead of guessing them
    within this function. Give proper repository and path-in-repos info
    on update (switch is not entirely similar).
  (do_entry_deletion):
    ### TODO: try to pass proper THEIR_URL (and THEIR_NODE_KIND if possible).
  (add_directory, open_directory, add_file, open_file): 
    Send proper THEIR_NODE_KIND and THEIR_URL to check_tree_conflict().

* subversion/svn/tree-conflicts.c
  (svn_cl__append_human_readable_tree_conflict_description):
    Fix repository comparison between Older and Theirs. Print "Common
    Repository" instead of just "Older" in case of a match.


------------------------------------------------------------------------
r34299 | gstein | 2008-11-21 08:36:20 +0100 (Fri, 21 Nov 2008) | 22 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_ops.c

When we commit a text modification, a temp file is left around (later to
be installed as the new text base). This file was also used to compute a
checksum for the new entry, but the ugly part was that we just *assumed* a
particular location for the file and checksum'd it.

In actuality, we already had the checksum stashed away in the commit
queue, or (in some cases) the unmodified text base. So: go look around for
the checksum instead of assuming a path and computing the checksum.

* subversion/libsvn_wc/adm_ops.c:
  (struct svn_wc_committed_queue_t, committed_queue_item_t): move to top
    of file, like all good structs should be.
  (process_committed_leaf); take the commit queue as a parameter, and look
    in there for a file that we may have sent to the server. if it isn't
    there, then we should be able to find a text base for it. in one edge
    case, we simply don't have a checksum, but the file is scheduled for
    deletion anyways.
  (process_committed_internal): take a queue as a parameter, and pass it
    along when recursing on self, or calling _leaf.
  (svn_wc_process_committed_queue): pass the queue along
  (svn_wc_process_committed4): pass a NULL for the queue

------------------------------------------------------------------------
r34300 | sbutler | 2008-11-21 12:52:34 +0100 (Fri, 21 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

TODO-1.6: Remove 2 done items.
------------------------------------------------------------------------
r34301 | hwright | 2008-11-21 14:39:07 +0100 (Fri, 21 Nov 2008) | 7 lines
Changed paths:
   M /branches/fsfs-pack/subversion/tests/libsvn_fs_fs/fs-pack-test.c

On the fsfs-pack branch:
Add another test, to check committing to a packed filesystem.

* subversion/tests/libsvn_fs_fs/fs-pack-test.c
  (commit_packed_fs): New.
  (test_funcs): XFail the new test.

------------------------------------------------------------------------
r34302 | gstein | 2008-11-21 14:46:48 +0100 (Fri, 21 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_ops.c

Whoop. copy_tests 24 broke. I changed some code into an ASSERT and forgot
to negate the expression properly.

* subversion/libsvn_wc/adm_ops.c:
  (process_committed_leaf); negate an assertion expression

------------------------------------------------------------------------
r34303 | stsp | 2008-11-21 15:09:26 +0100 (Fri, 21 Nov 2008) | 24 lines
Changed paths:
   M /trunk/subversion/svn/info-cmd.c
   M /trunk/subversion/svn/tree-conflicts.c
   M /trunk/subversion/tests/cmdline/info_tests.py
   M /trunk/subversion/tests/cmdline/merge_tests.py

Remove elaborate descriptions of tree conflicts in favour of
short and concise one-line descriptions.

* subversion/tests/cmdline/info_tests.py,
  subversion/tests/cmdline/merge_tests.py
  (info_with_tree_conflicts, verify_tree_conflict_info):
   Adjust expected output.

* subversion/svn/tree-conflicts.c
  (tree_conflict_phrases): Remove.
  (new_tree_conflict_phrases): Remove.
  (select_their_phrase): Rename to ...
  (select_action): ... this, and return simple strings
   describing each possible action.
  (select_our_phrase): Rename to ...
  (select_reason):  ... this, and return simple strings
   describing each possible reason.
  (svn_cl__append_human_readable_tree_conflict_description):
   Print short one-line tree conflict descriptions instead
   of the old long multi-line descriptions.

* subversion/svn/info-cmd.c
  (print_info): Print "Tree conflict:" info on a single line.

------------------------------------------------------------------------
r34304 | stsp | 2008-11-21 15:33:02 +0100 (Fri, 21 Nov 2008) | 20 lines
Changed paths:
   M /trunk/subversion/svn/info-cmd.c
   M /trunk/subversion/svn/tree-conflicts.c
   M /trunk/subversion/svn/tree-conflicts.h

Fix an API quirk which was a relic from the times when 'svn info'
had to be run on the parent directory of a tree conflict victim.

* subversion/svn/tree-conflicts.c
  (svn_cl__append_human_readable_tree_conflict_description):
   Rename to ...
  (svn_cl__get_human_readable_tree_conflict_description):
   ... this, and return a single conflict description
   instead of appending one to an existing string.

* subversion/svn/tree-conflicts.h
  (svn_cl__append_human_readable_tree_conflict_description):
    Track rename to ...
  (svn_cl__get_human_readable_tree_conflict_description):
   ... this, and adjust docstring to reflect new semantics
   of this function.

* subversion/svn/info-cmd.c
  (print_info): Track above changes.

------------------------------------------------------------------------
r34305 | julianfoad | 2008-11-21 15:49:33 +0100 (Fri, 21 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_repos/reporter.c

Improve a server error message "Target path does not exist" by reporting what
path it's referring to.

* subversion/libsvn_repos/reporter.c
  (drive): Include the target path in the "Target path does not exist" error.

------------------------------------------------------------------------
r34306 | pburba | 2008-11-21 16:10:11 +0100 (Fri, 21 Nov 2008) | 49 lines
Changed paths:
   M /trunk/subversion/include/private/svn_mergeinfo_private.h
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_subr/mergeinfo.c
   M /trunk/subversion/tests/cmdline/merge_tests.py

Follow-up to r34091.  Make reintegrate even more tolerant of subtree
mergeinfo on the reintegrate source.

Subtrees with mergeinfo in the source are ok as long as their explicit *and*
implicit mergeinfo show that the reintegrate target has been uniformly
merged to the source.

This change also improves the error message that reintegrate produces
when the source hasn't had the target uniformly merged to it.  Instead of
showing what has been merged to what subtree, and leaving it up to the user
to calculate what needs to be merged, it skips right to showing what needs
to be merged for the reintegrate to work.

* subversion/include/private/svn_mergeinfo_private.h
  (svn_mergeinfo__get_range_endpoints,
  svn_mergeinfo__filter_mergeinfo_by_ranges,
  svn_mergeinfo__filter_catalog_by_ranges): New private function
  declarations.

* subversion/libsvn_client/merge.c
  (ensure_all_missing_ranges_are_phantoms): Check a mergeinfo catalog rather
  than single instance of mergeinfo.
  (remove_irrelevant_ranges): Replace this function...
  (find_unmerged_mergeinfo): ...with this.  Rather than filtering the
  source's mergeinfo so it only represents what comes from the target,
  instead create a catalog that describes what hasn't been merged from the
  target to the source.
  (calculate_left_hand_side): Like find_unmerged_mergeinfo(), stop filtering
  but rather return a catalog that describes what hasn't been previously
  merged from the reintegrate target to the source.  Move some error handling
  back to the caller, i.e. svn_client_merge_reintegrate which has the context
  to produce a better error message.
  (svn_client_merge_reintegrate): Update calls to calculate_left_hand_side()
  and ensure_all_missing_ranges_are_phantoms().  If applicable create the
  detailed error message here describing what isn't merged into the source
  yet.

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo__get_range_endpoints,
  svn_mergeinfo__filter_mergeinfo_by_ranges,
  svn_mergeinfo__filter_catalog_by_ranges): New private function
  definitions.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_branch_never_merged_to): Fix a comment typo.
  (reintegrate_with_subtree_mergeinfo): Tweak expected error text to show
  what *needs* to be merged rather than what was merged and remove
  comment about XFail.
  (test_list): Remove XFail from reintegrate_with_subtree_mergeinfo.
------------------------------------------------------------------------
r34307 | stsp | 2008-11-21 16:16:42 +0100 (Fri, 21 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Unbreak merge test 112.

* subversion/tests/cmdline/merge_tests.py
  (tree_conflicts_and_obstructions): Fix error in expected
   output I introduced in r34303.

------------------------------------------------------------------------
r34308 | stsp | 2008-11-21 16:22:42 +0100 (Fri, 21 Nov 2008) | 9 lines
Changed paths:
   M /trunk/subversion/svn/tree-conflicts.c
   M /trunk/subversion/tests/cmdline/info_tests.py

Simplify 'svn info --xml' output for tree conflicts.

* subversion/svn/tree-conflicts.c
  (svn_cl__append_tree_conflict_info_xml): Use only present-tense
   verbs in XML output of tree-conflict info.

* subversion/tests/cmdline/info_tests.py
  (info_with_tree_conflicts): Adjust expected output.

------------------------------------------------------------------------
r34309 | stsp | 2008-11-21 16:30:54 +0100 (Fri, 21 Nov 2008) | 18 lines
Changed paths:
   M /trunk/subversion/svn/info-cmd.c
   M /trunk/subversion/svn/tree-conflicts.c
   M /trunk/subversion/svn/tree-conflicts.h

Followup to r34304:

I've been told that svn_string_t is for doing things that plain
"char *" can't. Since nothing fancy (such as the string containing
null chars) is needed here, use a plain C string.

* subversion/svn/tree-conflicts.c,
  subversion/svn/tree-conflicts.h
  (svn_cl__get_human_readable_tree_conflict_description):
   Return plain C string instead of an svn_string_t.

* subversion/svn/info-cmd.c
  (print_info): Adjust caller.

Suggested by: gstein
              julianfoad
              danielsh

------------------------------------------------------------------------
r34310 | stsp | 2008-11-21 16:41:32 +0100 (Fri, 21 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/svn/schema/info.rnc

* subversion/svn/schema/info.rnc
  (attlist.tree-conflict): Sync with current 'svn info --xml' output.

------------------------------------------------------------------------
r34311 | julianfoad | 2008-11-21 16:46:54 +0100 (Fri, 21 Nov 2008) | 3 lines
Changed paths:
   M /trunk/INSTALL

* INSTALL
  Say that newer versions of Serf are OK.

------------------------------------------------------------------------
r34312 | julianfoad | 2008-11-21 17:52:54 +0100 (Fri, 21 Nov 2008) | 3 lines
Changed paths:
   M /branches/tc_url_rev/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_conflict_node_version_t): Tweak comments.

------------------------------------------------------------------------
r34313 | julianfoad | 2008-11-21 17:56:46 +0100 (Fri, 21 Nov 2008) | 7 lines
Changed paths:
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c

Fix a function return-type mismatch which would have leaked an error.

* subversion/libsvn_wc/tree_conflicts.c
  (write_node_version_info): Change the signature to return (svn_error_t *),
    as it already tries to return an error.
  (svn_wc__write_tree_conflicts): Adjust calls accordingly.

------------------------------------------------------------------------
r34314 | hwright | 2008-11-21 18:27:40 +0100 (Fri, 21 Nov 2008) | 7 lines
Changed paths:
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c

On the fsfs-pack branch:
When looking for a packed file, use the correct path.

* subversion/libsvn_fs_fs/fs_fs.c
  (path_rev_packed): Take an argument for the manifest or pack file.
  (open_pack_or_rev_file): Call the right path function.

------------------------------------------------------------------------
r34315 | julianfoad | 2008-11-21 18:49:41 +0100 (Fri, 21 Nov 2008) | 6 lines
Changed paths:
   M /branches/tc_url_rev/subversion/svn/cl.h
   M /branches/tc_url_rev/subversion/svn/util.c

* subversion/svn/cl.h,
  subversion/svn/util.c
  (svn_cl__node_kind_str): For the node kind "none", return "none" instead
    of the empty string. Existing callers should not enounter this case,
    only the new tree-conflict printing.

------------------------------------------------------------------------
r34316 | julianfoad | 2008-11-21 18:55:28 +0100 (Fri, 21 Nov 2008) | 8 lines
Changed paths:
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.c

Print the whole URL of each tree-conflicted node version in "svn info"
output, rather than showing the repository and path-in-repository separately.

* subversion/svn/tree-conflicts.c
  (node_description): New function.
  (svn_cl__append_human_readable_tree_conflict_description): Print one line
    per conflicted node version, using node_description().

------------------------------------------------------------------------
r34317 | stsp | 2008-11-21 20:24:59 +0100 (Fri, 21 Nov 2008) | 63 lines
Changed paths:
   M /trunk/subversion/include/private/svn_wc_private.h
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_wc/status.c
   M /trunk/subversion/libsvn_wc/util.c
   M /trunk/subversion/svn/status.c
   M /trunk/subversion/tests/cmdline/stat_tests.py

In 'svn status', print an additional line for tree conflict victims,
describing the nature of the conflict.

It currently looks like this:

$ svn status
 M      .
D     C alpha
      >   incoming edit, local missing
M       beta
$

This makes it unnecessary to run 'svn info' in order to find out
what kind of tree conflict happened, greatly improving usability.
The information printed is also consistent with what 'svn info'
reports, and easier to understand than if we tried to squash
it into single letters in additional columns.

Suggested by: danielsh
(Daniel brought up the idea of the additional line.
Myself and possibly others have been wanting this information
in the default output of 'svn status' for quite some time now.)

* subversion/svn/status.c
  (print_status): Print an additional line for tree conflict victims,
    containing the same human-readable description string as printed
    by 'svn info'.
  (svn_cl__print_status_xml): Track changed member in svn_wc_status2_t.

* subversion/include/svn_wc.h
  (svn_wc_status2_t): Remove member tree_conflicted_p, and replace
   with a new member tree_conflict. We now use an 
   svn_wc_conflict_description_t instead of a boolean to indicate
   whether the path is a tree conflict victim. This provides clients
   with the necessary information to print meaningful messages when
   reporting status of a tree conflict victim.

* subversion/include/private/svn_wc_private.h
  (svn_wc__conflict_description_dup): Declare new function.

* subversion/libsvn_wc/util.c
  (svn_wc__conflict_description_dup): New function.
   It makes a deep copy of an svn_wc_conflict_description_t,
   excluding the adm_access member. I could not figure out
   whether deep-copying an adm_access makes sense, and how
   to make a deep copy of it. If a deep copy of the adm_access
   member is possible and desired, this function should be updated.
   Not making a deep copy of the adm_access does not break any
   existing code.
   Clients should probably be told to ignore the adm_access
   returned in the tree_conflict member of svn_wc_status2_t.

* subversion/libsvn_wc/status.c
  (assemble_status): Track changed member in svn_wc_status2_t.
   Fill the tree_conflict member in the status structure with
   an svn_wc_conflict_description_t if the path is a tree conflict
   victim. Otherwise, set the member to NULL.
  (svn_wc__is_sendable_status): Track changed member in svn_wc_status2_t.
  (svn_wc_dup_status2): Make a deep copy of new tree_conflict member.

* subversion/tests/cmdline/stat_tests.py
  (status_with_tree_conflicts): Tweak expected output.

------------------------------------------------------------------------
r34318 | stsp | 2008-11-21 21:27:55 +0100 (Fri, 21 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/svn/main.c

* subversion/svn/main.c
  (svn_opt_subcommand_desc2_t): Document the new tree conflict
   output of 'svn status' in 'svn help status'.

------------------------------------------------------------------------
r34319 | danielsh | 2008-11-21 21:55:01 +0100 (Fri, 21 Nov 2008) | 14 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c
   M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c

Fix edge-case bug in svn_path_is_canonical() where a '.:' segment caused
paths to be considered non-canonical.

* subversion/libsvn_subr/dirent_uri.c
  (svn_uri_is_canonical):
    When the first segment of a non-URL contains a colon, don't treat it as
    the end of the segment.

* subversion/tests/libsvn_subr/dirent_uri-test.c
  (test_dirent_is_canonical, test_uri_is_canonical):
    Test paths with colons.

Found by: hwright
(during a dump|load of the ASF repos.  Brave man!)
------------------------------------------------------------------------
r34320 | stsp | 2008-11-21 22:12:10 +0100 (Fri, 21 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_conflict_description_t): Add comment reminding
   people to update svn_wc__conflict_description_dup()
   if they add fields to this struct.

Suggested by: danielsh

------------------------------------------------------------------------
r34321 | sussman | 2008-11-21 22:51:23 +0100 (Fri, 21 Nov 2008) | 1 line
Changed paths:
   A /branches/http-protocol-v2 (from /trunk:34320)

Create branch for HTTP protocol rewrite.
------------------------------------------------------------------------
r34322 | sussman | 2008-11-21 22:58:04 +0100 (Fri, 21 Nov 2008) | 22 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/version.c

Begin HTTP v2 protocol work by making mod_dav_svn return new URI stubs in
OPTIONS requests.

* subversion/mod_dav_svn/version.c 
  (get_vsn_options):  output the new root-stub, pegrev-stub, rev-stub
                      for all OPTIONS requests, since it's not
                      resource-specific.
  (get_option):  for OPTIONS on a specific resource, return the
                 repository's youngest-rev (when requested).


* subversion/mod_dav_svn/dav_svn.h 
  (DAV_SVN__ROOT_STUB, DAV_SVN__PEGREV_STUB, DAV_SVN__REV_STUB,
   DAV_SVN__TXN_STUB, DAV_SVN__TXNPROP_STUB):  new constants used
   within mod_dav_svn.

* subversion/include/svn_dav.h
  (SVN_DAV_NS_DAV_SVN_ROOT_STUB,
   SVN_DAV_NS_DAV_SVN_PEGREV_STUB,
   SVN_DAV_NS_DAV_SVN_REV_STUB):  new constants shared between client
   and server.

------------------------------------------------------------------------
r34323 | stsp | 2008-11-21 23:00:19 +0100 (Fri, 21 Nov 2008) | 6 lines
Changed paths:
   M /branches/tc_url_rev/subversion/svn/util.c

On the tc_url_rev branch:

* subversion/svn/util.c
  (svn_cl__node_kind_str): Fix build, a case value in a switch statement
  was duplicated. Put the right value in place.

------------------------------------------------------------------------
r34324 | stsp | 2008-11-21 23:01:40 +0100 (Fri, 21 Nov 2008) | 5 lines
Changed paths:
   M /branches/tc_url_rev/subversion/svn/util.c

On the tc_url_rev branch:

* subversion/svn/util.c
  (svn_cl__node_kind_str): Mark node kind strings for translation.

------------------------------------------------------------------------
r34325 | stsp | 2008-11-21 23:25:54 +0100 (Fri, 21 Nov 2008) | 6 lines
Changed paths:
   M /branches/tc_url_rev
   M /branches/tc_url_rev/INSTALL
   M /branches/tc_url_rev/TODO-1.6
   M /branches/tc_url_rev/subversion/include/private/svn_mergeinfo_private.h
   M /branches/tc_url_rev/subversion/include/private/svn_wc_private.h
   M /branches/tc_url_rev/subversion/include/svn_dirent_uri.h
   M /branches/tc_url_rev/subversion/include/svn_wc.h
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c
   M /branches/tc_url_rev/subversion/libsvn_repos/reporter.c
   M /branches/tc_url_rev/subversion/libsvn_subr/config_file.c
   M /branches/tc_url_rev/subversion/libsvn_subr/dirent_uri.c
   M /branches/tc_url_rev/subversion/libsvn_subr/mergeinfo.c
   M /branches/tc_url_rev/subversion/libsvn_wc/adm_ops.c
   M /branches/tc_url_rev/subversion/libsvn_wc/status.c
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c
   M /branches/tc_url_rev/subversion/libsvn_wc/util.c
   M /branches/tc_url_rev/subversion/svn/info-cmd.c
   M /branches/tc_url_rev/subversion/svn/main.c
   M /branches/tc_url_rev/subversion/svn/schema/info.rnc
   M /branches/tc_url_rev/subversion/svn/status.c
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.c
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.h
   M /branches/tc_url_rev/subversion/tests/cmdline/info_tests.py
   M /branches/tc_url_rev/subversion/tests/cmdline/merge_tests.py
   M /branches/tc_url_rev/subversion/tests/cmdline/stat_tests.py
   M /branches/tc_url_rev/subversion/tests/libsvn_subr/dirent_uri-test.c

On the tc_url_rev branch:

Sync with trunk as of r34324. Do not resolve conflicts yet,
just leave the conflict markers in place. Will resolve
conflicts in a separate commit.

------------------------------------------------------------------------
r34326 | stsp | 2008-11-22 00:45:55 +0100 (Sat, 22 Nov 2008) | 55 lines
Changed paths:
   M /branches/tc_url_rev/subversion/include/private/svn_wc_private.h
   M /branches/tc_url_rev/subversion/include/svn_wc.h
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c
   M /branches/tc_url_rev/subversion/libsvn_wc/update_editor.c
   M /branches/tc_url_rev/subversion/libsvn_wc/util.c
   M /branches/tc_url_rev/subversion/svn/cl.h
   M /branches/tc_url_rev/subversion/svn/info-cmd.c
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.c
   M /branches/tc_url_rev/subversion/svn/util.c

On the tc_url_rev branch:

Resolve conflicts from merge with trunk.
This commit is rather large for a 'resolve' commit, but catching
up with progress made on trunk made quite a few changes neccessary.

* subversion/svn/cl.h
  (svn_cl__node_description): Declare.

* subversion/svn/util.c
  (svn_cl__node_description): Moved here from ....

* subversion/svn/tree-conflicts.c
  (node_description): ... here and unstaticed, so we can
   call it from another file. No functional changes.

  (svn_cl__get_human_readable_tree_conflict_description):
   Resolve conflicts with trunk. This function cannot add the
   URL@rev information directly to the description anymore,
   because the description is now also used in 'svn status'.

* subversion/svn/info-cmd.c
  (print_info): Print URL@rev information here.

* subversion/include/svn_wc.h
  (svn_wc_conflict_version_t): Sync typedef with actual
   struct name (this was probably a typo). Add comment
   reminding people to update svn_wc__conflict_version_dup()
   when adding members to this struct.
   Make older_version and their_version membes pointers,
   for more straightforward handling in svn_wc__conflict_description_dup().
  (svn_wc_conflict_description_create_tree): Adjust docstring for new
   parameters (see below).

* subversion/include/private/svn_wc_private.h
  (svn_wc__conflict_version_dup): Declare.

* subversion/libsvn_wc/util.c
  (svn_wc_conflict_description_create_tree): Add older_version and
    their_version parameters, allowing callers to initialise these
    members when calling this function.
  (svn_wc__conflict_description_dup): Make a deep copy of older_version
   and their_version members.
  (svn_wc__conflict_version_dup): New function to make a deep copy of
   an svn_wc_conflict_version_t object.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Track above changes.

* subversion/libsvn_wc/tree_conflicts.c
  (read_one_tree_conflict): Track above changes.

* subversion/libsvn_client/merge.c
  (tree_conflict): Track above changes.

------------------------------------------------------------------------
r34327 | stsp | 2008-11-22 00:50:21 +0100 (Sat, 22 Nov 2008) | 6 lines
Changed paths:
   M /branches/tc_url_rev/subversion/svn/util.c

On the tc_url_rev branch:

* subversion/svn/util.c
  (svn_cl__node_kind_str): Revert r34324, these strings are used in
   XML and should not be translated.

------------------------------------------------------------------------
r34328 | stsp | 2008-11-22 00:55:47 +0100 (Sat, 22 Nov 2008) | 12 lines
Changed paths:
   M /branches/tc_url_rev/subversion/svn/cl.h
   M /branches/tc_url_rev/subversion/svn/util.c

On the tc_url_rev branch:

* subversion/svn/cl.h
  (svn_cl__node_kind_str_human_readable): Declare.

* subversion/svn/util.c
  (svn_cl__node_kind_str_human_readable): New function which
   returns possibly localised node kind strings.
  (svn_cl__node_description): Use possibly localised node
   kind strings instead of non-localised ones. The output
   of this function is now suitable for human consumption.

------------------------------------------------------------------------
r34329 | neels | 2008-11-22 04:37:54 +0100 (Sat, 22 Nov 2008) | 31 lines
Changed paths:
   M /branches/tc_url_rev/subversion/include/svn_wc.h
   M /branches/tc_url_rev/subversion/libsvn_wc/update_editor.c
   M /branches/tc_url_rev/subversion/libsvn_wc/util.c
   M /branches/tc_url_rev/subversion/svn/info-cmd.c
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.c

Fix some confusion with "incoming", "local", "older" and "their" versions.

Include the operation that caused the tree-conflict in abbreviated
info output.

Show a proper "their" path on some delete cases (in update code).

* subversion/include/svn_wc.h
  (svn_wc_operation_str):
    New helper function that returns a string for an svn_wc_operation_t.
    ### TODO: really go public?

* subversion/libsvn_wc/util.c
  (svn_wc_operation_str):
    New helper function that returns a string for an svn_wc_operation_t.

* subversion/libsvn_wc/update_editor.c
  (do_entry_deletion):
    New argument THEIR_PATH propagated from delete_entry(), for passing
    it to check_tree_conflict().
  (delete_entry): Fill in a THEIR_PATH for do_entry_deletion().
  (close_edit, complete_directory): Just pass NULL for THEIR_PATH. ### TODO

* subversion/svn/info-cmd.c
  (print_info): Don't take older/their as local/incoming. Capitalize output.

* subversion/svn/tree-conflicts.c
  (select_action, select_reason): Rename these...
  (action_str, reason_str): ...to these


------------------------------------------------------------------------
r34330 | gstein | 2008-11-22 06:14:55 +0100 (Sat, 22 Nov 2008) | 21 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_files.c
   M /trunk/subversion/libsvn_wc/adm_files.h
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/diff.c
   M /trunk/subversion/libsvn_wc/update_editor.c

Remove the "temp" flag from the svn_wc__text_revert_path() function. We no
longer need to construct revert bases in a specific temp area, so this
flag is not needed.

* subversion/libsvn_wc/adm_files.h:
  (svn_wc__text_revert_path): remove TMP parameter

* subversion/libsvn_wc/adm_files.c:
  (svn_wc__text_revert_path): remove TMP parameter. hardcode FALSE.

* subversion/libsvn_wc/adm_ops.c:
  (remove_revert_files): ...
  (svn_wc_delete3): ...
  (svn_wc_add3): ...
  (revert_admin_things): ...
* subversion/libsvn_wc/update_editor.c:
  (choose_base_paths): ...
  (svn_wc_add_repos_file3): ...
* subversion/libsvn_wc/diff.c:
  (file_diff): ... remove TMP parameter from svn_wc__text_revert_path calls.

------------------------------------------------------------------------
r34331 | julianfoad | 2008-11-22 08:41:51 +0100 (Sat, 22 Nov 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c

Fix "printf" format specifiers in a "merge --reintegrate" error message, and
remove unused variables.

* subversion/libsvn_client/merge.c
  (calculate_left_hand_side): Remove unused variables.
  (svn_client_merge_reintegrate): Use "%ld" format spec for svn_revnum_t.

------------------------------------------------------------------------
r34332 | rhuijben | 2008-11-22 14:58:46 +0100 (Sat, 22 Nov 2008) | 21 lines
Changed paths:
   M /branches/tc_url_rev/subversion/include/svn_wc.h
   M /branches/tc_url_rev/subversion/libsvn_wc/log.c
   M /branches/tc_url_rev/subversion/libsvn_wc/merge.c
   M /branches/tc_url_rev/subversion/libsvn_wc/update_editor.c
   M /branches/tc_url_rev/subversion/libsvn_wc/wc.h

On the tc_url_rev branch:
Allow passing conflict versions to the conflict resolver for text conflicts.

* subversion/include/svn_wc.h
  (svn_wc_conflict_version_t): Update documentation to state that the 
    structure can be extended in future versions and is new in 1.6.
* subversion/libsvn_wc/wc.h
  (svn_wc__merge_internal): Add left_version and right_version arguments and
    update documentation to refer to svn_wc_merge3 instead of svn_wc_merge2.
* subversion/libsvn_wc/merge.c
  (svn_wc__merge_internal): Set older and their version in the conflict
    description to left_version and right_version.
  (svn_wc_merge3): Pass NULL to svn_wc__merge_internal for left_version and
    right_version.
* subversion/libsvn_wc/log.c
  (log_do_merge): Pass NULL to svn_wc__merge_internal for left_version and
    right_version.
* subversion/libsvn_wc/update_editor.c
  (merge_file): Pass NULL to svn_wc__merge_internal for left_version and
    right_version.

------------------------------------------------------------------------
r34333 | stsp | 2008-11-22 18:26:19 +0100 (Sat, 22 Nov 2008) | 6 lines
Changed paths:
   M /trunk/www/links.html

* www/links.html
  (converters): Link to SVNfusion.

Patch by: Marcos Mayorga <mayorga.geek@gmail.com>
(some spacing tweaked by me)

------------------------------------------------------------------------
r34334 | rhuijben | 2008-11-22 18:30:28 +0100 (Sat, 22 Nov 2008) | 24 lines
Changed paths:
   M /trunk/subversion/include/svn_error.h
   M /trunk/subversion/libsvn_subr/error.c
   M /trunk/subversion/libsvn_wc/wc_db.c

Add SVN_ERR_ASSERT_NO_RETURN() and SVN_ERR_MALFUNCTION_NO_RETURN() for 
functions that don't return a svn_error_t*.

* subversion/include/svn_error.h
  (SVN_ERR_MALFUNCTION, SVN_ERR_ASSERT): Call svn_error__malfunction with
    can_return true.
  (SVN_ERR_MALFUNCTION_NO_RETURN, SVN_ERR_ASSERT_NO_RETURN): New macros
    like their with return variants but calling svn_error__malfunction with
    can_return false. Call abort() when svn_error__malfunction returns.
  (svn_error_malfunction_handler_t): Document that an implementation of this
   function type should never return if the new argument can_return is false.
  (svn_error__malfunction,
   svn_error_raise_on_malfunction, 
   svn_error_abort_on_malfunction): Add can_return boolean argument.
* subversion/libsvn_subr/error.c
  (svn_error_raise_on_malfunction): Update arguments and call abort() 
    when can_return is false.
  (svn_error_abort_on_malfunction): Update arguments and call 
    svn_error_raise_on_malfunction with can_return TRUE.
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_pristine_check, svn_wc__db_pristine_repair, 
   svn_wc__db_pristine_incref, svn_wc__db_pristine_decref):
     Update direct calls to svn_error__malfunction.

------------------------------------------------------------------------
r34335 | rhuijben | 2008-11-22 18:39:35 +0100 (Sat, 22 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/StatusCallback.cpp

* subversion/bindings/javahl/native/StatusCallback.cpp
  (StatusCallback::createJavaStatus): Parse tree_conflict null/non-null
    as previous tree_conflicted boolean to fix Windows build.

------------------------------------------------------------------------
r34336 | stsp | 2008-11-22 18:42:57 +0100 (Sat, 22 Nov 2008) | 5 lines
Changed paths:
   M /trunk/www/links.html

* www/links.html
  (clients): Link to Cornerstone, a GUI client for Mac OS X.

Patch by: Simon Wilson <simonw@zennaware.com>

------------------------------------------------------------------------
r34337 | rhuijben | 2008-11-22 20:23:18 +0100 (Sat, 22 Nov 2008) | 29 lines
Changed paths:
   M /trunk/subversion/libsvn_delta/depth_filter_editor.c
   M /trunk/subversion/libsvn_fs/fs-loader.c
   M /trunk/subversion/libsvn_fs_base/tree.c
   M /trunk/subversion/libsvn_fs_base/util/skel.c
   M /trunk/subversion/libsvn_repos/dump.c
   M /trunk/subversion/libsvn_subr/sqlite.c
   M /trunk/subversion/libsvn_subr/utf.c
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/mod_dav_svn/util.c

Following up on r34334, replace abort() calls with SVN_ERR_MALFUNCTION
and SVN_ERR_ASSERT where possible. This patch should remove all abort calls 
except those in the global library initialization, out of memory conditions 
and those in libsvn_ra_serf.

* subversion/libsvn_delta/depth_filter_editor.c
  (okay_to_edit): Replace call to abort with SVN_ERR_MALFUNCTION_NO_RETURN
    and add return to remove compilation warning.
* subversion/libsvn_fs/fs-loader.c
  (default_warning_func): Call SVN_ERR_MALFUNCTION_NO_RETURN instead of abort.
* subversion/libsvn_fs_base/tree.c
  (dag_node_cache_set): Call SVN_ERR_MALFUNCTION_NO_RETURN instead of abort in
    unimplemented case.
* subversion/libsvn_fs_base/util/skel.c
  (global): include svn_error.h
  (unparse, svn_fs_base__prepend, svn_fs_base__append): 
    Replace abort calls with SVN_ERR_ASSERT_NO_RETURN.
* subversion/libsvn_repos/dump.c
  (make_dir_baton): Replace abort with SVN_ERR_ASSERT_NO_RETURN.
* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__step): Replace abort with SVN_ERR_MALFUNCTION
* subversion/libsvn_subr/utf.c
  (put_xlate_handle_node): Call SVN_ERR_MALFUNCTION when mutex calls fail.
* subversion/libsvn_wc/entries.c
  (write_entry_xml): Use SVN_ERR_ASSERT to validate entry name.
* subversion/mod_dav_svn/util.c
  (dav_svn__build_uri): Call SVN_ERR_MALFUNCTION_NO_RETURN when value out of
    range.

------------------------------------------------------------------------
r34338 | hwright | 2008-11-22 20:38:32 +0100 (Sat, 22 Nov 2008) | 31 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/tests/cmdline/svnadmin_tests.py

Similar to r33975 with BDB, teach FSFS to store both MD5 and SHA1 checksums.

* subversion/libsvn_fs_fs/fs_fs.c
  (read_rep_offsets): Parse both sha1 and md5 checksums from the node rev.
  (representation_string): Put both the sha1 and md5 checksums, if they exist
    (put the all-zero checksum if they don't).
  (read_rep_baton): Rename context and checksum to reflect type.
  (rep_read_get_baton): Initialize baton contents.
  (rep_read_contents): Update the checksum with the appropriate contents.
  (svn_fs_fs__get_file_delta_stream): More baton variable rename fixes.
  (svn_fs_fs__file_checksum): Return the md5 checksum no matter the type
    requested.
  (svn_fs_fs__rep_copy): Update for new representation checksum members.
  (rep_write_baton): Add contexts for both sha1 and md5.
  (rep_write_contents): Update both contexts.
  (rep_write_get_baton): Initialize both contexts.
  (rep_write_contents_close): Finalize both checksums.
  (write_final_rev): Update for new checksum variable names.

* subversion/libsvn_fs_fs/fs.h
  (representation_t): Remove generic checksum member in favor of specifically
    named checksum member.

* subversion/libsvn_fs_fs/rep-cache.c
  (svn_fs_fs__get_rep_reference): Make sure only sha1 references are requested.
  (svn_fs_fs__set_rep_reference): Make sure only sha1 references are inserted.
  (svn_fs_fs__inc_rep_reuse): Update variable names.

* subversion/tests/cmdline/svnadmin_tests.py
  (verify_incremental_fsfs): Update expected error.

------------------------------------------------------------------------
r34339 | rhuijben | 2008-11-22 21:02:51 +0100 (Sat, 22 Nov 2008) | 27 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_serf/commit.c
   M /trunk/subversion/libsvn_ra_serf/locks.c
   M /trunk/subversion/libsvn_ra_serf/merge.c
   M /trunk/subversion/libsvn_ra_serf/update.c
   M /trunk/subversion/libsvn_ra_serf/util.c
   M /trunk/subversion/libsvn_ra_serf/xml.c

Following up on r34337, replace abort calls with SVN_ERR_MALFUNCTION in
libsvn_ra_serf.

Most of these replaced aborts are triggerable from the network and should be
converted to non malfunction errors before serf is the default dav client.

* subversion/libsvn_ra_serf/commit.c
  (absent_directory, close_edit, abort_edit): Replace abort calls in
    unlikely http error conditions.
* subversion/libsvn_ra_serf/locks.c
  (start_lock): Replace abort calls on invalid xml responses.
* subversion/libsvn_ra_serf/merge.c
  (start_merge): Replace abort call on unknown xml response.
* subversion/libsvn_ra_serf/update.c
  (close_dir, close_all_dirs): Replace abort on internal references checks.
  (cancel_fetch): Replace abort on broken request.
  (handle_fetch,handle_stream): Replace aborts on broken network requests.
  (fetch_file,start_report): Replace aborts on invalid responses.
  (abort_report): Replace abort on aborting.
* subversion/libsvn_ra_serf/util.c
  (svn_ra_serf__conn_closed): Replace abort on connection broken errors.
  (svn_ra_serf__handle_xml_parser): Replace abort on unexpected http or 
    xml errors.
* subversion/libsvn_ra_serf/xml.c
  (svn_ra_serf__expand_ns): Replace abort on expanding the namespace of a
    unknown namespace reference.

------------------------------------------------------------------------
r34340 | hwright | 2008-11-22 21:11:58 +0100 (Sat, 22 Nov 2008) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/dag.c
   M /trunk/subversion/libsvn_fs_fs/dag.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/tree.c

Followup to r34338: Return the requested checksum for FSFS.

* subversion/libsvn_fs_fs/tree.c
  (fs_file_checksum): Pass the requested kind down the stack.
  (apply_textdelta): Request the appropriate checksum kind.

* subversion/libsvn_fs_fs/fs_fs.h
* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__noderev_same_rep_key): Return the requested checksum kind.

* subversion/libsvn_fs_fs/dag.h
* subversion/libsvn_fs_fs/dag.c
  (svn_fs_fs__dag_file_checksum): Pass requested checksum down the stack.
  (svn_fs_fs__dag_finalize_edits): Request the correct checksum kind.

------------------------------------------------------------------------
r34341 | hwright | 2008-11-22 22:07:34 +0100 (Sat, 22 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/tree.c

Followup to r34340: Don't check the checksum kind, since we do that already
in a deeper layer.

Found by: danielsh

* subversion/libsvn_fs_fs/tree.c
  (fs_file_checksum): Dispense with checking the checksum kind before returning.

------------------------------------------------------------------------
r34342 | sbutler | 2008-11-22 22:15:39 +0100 (Sat, 22 Nov 2008) | 1 line
Changed paths:
   A /branches/update-tc-loggy (from /trunk:34341)

Create experimental branch for loggy writing of tree conflicts during update.
------------------------------------------------------------------------
r34343 | hwright | 2008-11-22 22:27:23 +0100 (Sat, 22 Nov 2008) | 4 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove an item, specifically the bit about storing both sha1
  and md5 checksums for FSFS representations.  There's still a couple of ###
  comments in the code, but those fall under a different item in TODO-1.6.

------------------------------------------------------------------------
r34344 | hwright | 2008-11-23 00:34:51 +0100 (Sun, 23 Nov 2008) | 17 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Fix failing svnsync test 22, which does a byte-for-byte comparison of a
dumpfile.

Why this test only fails on Windows is beyond me, but the source of the
failure isn't.  When retrieving a rep from the rep-cache, we only have the
sha1 (since that's all that's stored in the rep cache), so the md5 wasn't
being recorded in the dumpfile.  We solve this by simply copying the md5
from the replaced rep.

Found by: rhuijben

* subversion/libsvn_fs_fs/fs_fs.c
  (representation_string): Unconditionally print the md5, since we know we
    will always have one.
  (rep_write_contents_close): Copy the md5 from the current rep to the old
    one.

------------------------------------------------------------------------
r34345 | sbutler | 2008-11-23 00:46:26 +0100 (Sun, 23 Nov 2008) | 34 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/log.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/tests/cmdline/depth_tests.py

Properly loggify the recording of tree conflict data during update and
switch.  The desired end result is the same as before; only the timing
of the entry-writing has changed.  It's now consistent with the other
loggy commands.

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__loggy_add_tree_conflict): Move to log.c, where the other
   svn_wc__loggy_* functions are.

* subversion/libsvn_wc/log.c
  (#include tree_conflicts.h): We need tree conflict helper functions.
  (svn_wc__loggy_add_tree_conflict): Move here from tree_conflicts.
   Change this function to simply write an <add-tree-conflict> log
   element in the victim's parent's log.
  (SVN_WC__LOG_ADD_TREE_CONFLICT,
   SVN_WC__LOG_ATTR_DATA): New XML element and attribute names.
  (log_runner): Add fields tree_conflicts_added (boolean) and
   tree_conflicts (array).  Add field result_pool to hold the tree
   conflicts.
  (log_do_add_tree_conflict): Sanity check a new tree conflict and
   add it to loggy->tree_conflicts.
  (start_handler): Support <add-tree-conflict> log elements.
  (run_log_from_memory): Note: no tree conflict support needed because
   this function doesn't update the entry.
  (run_log): If the log_runner has tree conflicts, encode them as text
   data and include them in the entry rewrite.

* subversion/tests/cmdline/depth_tests.py
  (make_depth_tree_conflicts): Correct errors in expected status.
  (verify_lines): New function borrowed from merge tests.
  (tree_conflicts_resolved_depth_immediates,
   tree_conflicts_resolved_depth_infinity): Allow expected output in
   any order.

------------------------------------------------------------------------
r34346 | sbutler | 2008-11-23 00:53:30 +0100 (Sun, 23 Nov 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

TODO-1.6: Remove a done item.
------------------------------------------------------------------------
r34347 | arfrever | 2008-11-23 03:39:18 +0100 (Sun, 23 Nov 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

Don't try to open keyring if opening of keyring previously failed.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (gnome_keyring_password_get, gnome_keyring_password_set): Don't try to open
   keyring if 'parameters' of authentication baton contain
   "gnome-keyring-opening-failed". Store "gnome-keyring-opening-failed" in
   'parameters' of authentication baton if opening of keyring failed.

------------------------------------------------------------------------
r34348 | neels | 2008-11-23 04:03:21 +0100 (Sun, 23 Nov 2008) | 13 lines
Changed paths:
   M /branches/tc_url_rev/subversion/include/svn_wc.h
   M /branches/tc_url_rev/subversion/libsvn_wc/util.c
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.c

On branch tc_url_rev: Implement some hints by stsp.

* subversion/include/svn_wc.h,
* subversion/libsvn_wc/util.c
  (svn_wc_operation_str): Rename...
  (svn_wc_operation_str_human_readable): ...to this.
  (svn_wc_operation_str_xml):
    New svn_wc_operation_t to string function for XML output.

* subversion/svn/tree-conflicts.c
  (action_str, reason_str): Don't say "delete or move", just say "delete".


------------------------------------------------------------------------
r34349 | neels | 2008-11-23 04:06:16 +0100 (Sun, 23 Nov 2008) | 8 lines
Changed paths:
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c

On branch tc_url_rev: Fix a segfault in tree_conflict().

* subversion/libsvn_client/merge.c
  (tree_conflict):
    Fix *one* segmentation fault introduced by r34326.
    ### TODO There may be more hidden in the foliage.


------------------------------------------------------------------------
r34350 | hwright | 2008-11-23 04:20:25 +0100 (Sun, 23 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_delta/compose_delta.c

* subversion/libsvn_delta/compose_delta.c
  (build_range_list): Remove some unreachable code.

------------------------------------------------------------------------
r34351 | hwright | 2008-11-23 04:49:53 +0100 (Sun, 23 Nov 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/fs_fs.c
  (rep_write_contents_close): Followup to r34344: Copy the *correct* md5
     checksum from the duplicate rep.

------------------------------------------------------------------------
r34352 | hwright | 2008-11-23 05:08:04 +0100 (Sun, 23 Nov 2008) | 25 lines
Changed paths:
   M /trunk/subversion/include/svn_repos.h
   M /trunk/subversion/libsvn_repos/dump.c
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
   M /trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump

When creating a dump file, include the sha1 checksum as well as the md5.

We don't actually parse or use the sha1 at this point, thought we could.  The
md5 is used at the repos layer to check corruption, and later passed to the fs
layer for the same reason.  If we ever switch the entire system over to sha1,
this patch will mean that 1.6-era dumpfiles will have sha1 data usable by
future versions of Subversion.

* subversion/include/svn_repos.h
  (SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_MD5,
   SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_SHA1,
   SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5,
   SVN_REPOS_DUMPFILE_TEXT_CONTENT_SHA1,
   SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5
   SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1): New.
  (SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM,
   SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM,
   SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM): Use the md5 define.

* subversion/libsvn_repos/dump.c
  (dump_node): Include the sha1 in the dumpfile.

[ in subversion/tests/cmdline/svnsync_tests_data/ ]
Fix up assorted dump files to include the now-expected sha1 field.

------------------------------------------------------------------------
r34353 | hwright | 2008-11-23 05:13:53 +0100 (Sun, 23 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/util.c

* subversion/mod_dav_svn/util.c
  (dav_svn__build_uri): Remove another never-reached line.

------------------------------------------------------------------------
r34354 | neels | 2008-11-23 05:35:04 +0100 (Sun, 23 Nov 2008) | 8 lines
Changed paths:
   M /branches/tc_url_rev/subversion/libsvn_wc/update_editor.c

On branch tc_url_rev: reflect some research in the comments.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict):
    Change what is printed if no full URL is available, and some comments.
  (complete_directory, close_edit): Just comments.


------------------------------------------------------------------------
r34355 | neels | 2008-11-23 05:50:22 +0100 (Sun, 23 Nov 2008) | 7 lines
Changed paths:
   M /branches/tc_url_rev/subversion/svn/info-cmd.c

On branch tc_url_rev: Output change on merge tree-conflicts.

* subversion/svn/info-cmd.c (print_info):
    For a merge, say "Merge left" and "Merge right" instead of "Older"- and
    "Their version".


------------------------------------------------------------------------
r34356 | sbutler | 2008-11-23 14:38:41 +0100 (Sun, 23 Nov 2008) | 1 line
Changed paths:
   M /branches/tc_url_rev
   M /branches/tc_url_rev/TODO-1.6
   M /branches/tc_url_rev/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/tc_url_rev/subversion/include/svn_error.h
   M /branches/tc_url_rev/subversion/include/svn_repos.h
   M /branches/tc_url_rev/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c
   M /branches/tc_url_rev/subversion/libsvn_delta/compose_delta.c
   M /branches/tc_url_rev/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/tc_url_rev/subversion/libsvn_fs/fs-loader.c
   M /branches/tc_url_rev/subversion/libsvn_fs_base/tree.c
   M /branches/tc_url_rev/subversion/libsvn_fs_base/util/skel.c
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/dag.c
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/dag.h
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/fs.h
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/tree.c
   M /branches/tc_url_rev/subversion/libsvn_ra_serf/commit.c
   M /branches/tc_url_rev/subversion/libsvn_ra_serf/locks.c
   M /branches/tc_url_rev/subversion/libsvn_ra_serf/merge.c
   M /branches/tc_url_rev/subversion/libsvn_ra_serf/update.c
   M /branches/tc_url_rev/subversion/libsvn_ra_serf/util.c
   M /branches/tc_url_rev/subversion/libsvn_ra_serf/xml.c
   M /branches/tc_url_rev/subversion/libsvn_repos/dump.c
   M /branches/tc_url_rev/subversion/libsvn_subr/error.c
   M /branches/tc_url_rev/subversion/libsvn_subr/sqlite.c
   M /branches/tc_url_rev/subversion/libsvn_subr/utf.c
   M /branches/tc_url_rev/subversion/libsvn_wc/adm_files.c
   M /branches/tc_url_rev/subversion/libsvn_wc/adm_files.h
   M /branches/tc_url_rev/subversion/libsvn_wc/adm_ops.c
   M /branches/tc_url_rev/subversion/libsvn_wc/diff.c
   M /branches/tc_url_rev/subversion/libsvn_wc/entries.c
   M /branches/tc_url_rev/subversion/libsvn_wc/log.c
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c
   M /branches/tc_url_rev/subversion/libsvn_wc/update_editor.c
   M /branches/tc_url_rev/subversion/libsvn_wc/wc_db.c
   M /branches/tc_url_rev/subversion/mod_dav_svn/util.c
   M /branches/tc_url_rev/subversion/tests/cmdline/depth_tests.py
   M /branches/tc_url_rev/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
   M /branches/tc_url_rev/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
   M /branches/tc_url_rev/www/links.html

On the tc_url_rev branch: Sync with trunk.  No conflicts.
------------------------------------------------------------------------
r34357 | stsp | 2008-11-23 15:14:48 +0100 (Sun, 23 Nov 2008) | 26 lines
Changed paths:
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c
   M /branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c
   M /branches/tc_url_rev/subversion/libsvn_wc/update_editor.c
   M /branches/tc_url_rev/subversion/svn/info-cmd.c

On the tc_url_rev branch:

Follow-up to r34349, never dereference pointer members of
svn_wc_conflict_version_t without checking for NULL first.

* svn/info-cmd.c
  (print_info): Assert the validity of older_version and
   their_version members. We really need them here!

* libsvn_wc/update_editor.c
  (check_tree_conflict): Unrelated cosmetic fix: Use the
   same variable name for pointer to memory allocated and
   argument passed to sizeof().

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__write_tree_conflicts): Check older_version and
   their_version members of conflict before dereferencing them.
   Also checked whether writing empty their_version and older_version
   fields into the victim's tc-info in the entries file does any harm
   upon reading the data again. Turns out the existing code can cope
   well with that situation.

* libsvn_client/merge.c
  (tree_conflict): Check older_version and their_version
   members of conflict before dereferencing them.

------------------------------------------------------------------------
r34358 | arfrever | 2008-11-23 16:47:42 +0100 (Sun, 23 Nov 2008) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/blame_tests.py

Python 3 compatibility:
Use list(zip()) instead of zip().

* subversion/tests/cmdline/blame_tests.py
  (parse_and_verify_blame): Use list(zip()) instead of zip().

------------------------------------------------------------------------
r34359 | arfrever | 2008-11-23 17:04:26 +0100 (Sun, 23 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/bindings/swig/python/tests/trac/test.py

* subversion/bindings/swig/python/tests/trac/test.py: Fix encoding. Wrong
   encoding was causing traceback during running Python-3 version of 2to3.

------------------------------------------------------------------------
r34370 | neels | 2008-11-24 04:51:03 +0100 (Mon, 24 Nov 2008) | 11 lines
Changed paths:
   M /branches/tc_url_rev/subversion/svn/tree-conflicts.c

On branch tc_url_rev: Implement XML output of URL@REV information.

* subversion/svn/tree-conflicts.c
  (add_conflict_version_xml):
    New helper function for svn_cl__append_tree_conflict_info_xml().
  (svn_cl__append_tree_conflict_info_xml): 
    Print svn_wc_conflict_version_t information in XML form.
    Use svn_cl__node_kind_str_xml() and svn_wc_operation_str_xml()
    instead of own switch statements.

[[[[ crazycat ]]]]
------------------------------------------------------------------------
r34402 | rhuijben | 2008-11-25 12:56:58 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   A /branches/1.5.x-r31314 (from /branches/1.5.x:34401)
   M /branches/1.5.x-r31314/COMMITTERS
   M /branches/1.5.x-r31314/subversion/bindings/swig
   M /branches/1.5.x-r31314/subversion/libsvn_client/copy.c
   M /branches/1.5.x-r31314/subversion/libsvn_client/merge.c
   M /branches/1.5.x-r31314/subversion/tests/cmdline/copy_tests.py

Create backport branch for r31311, r31314 from 1.5.x@34401
------------------------------------------------------------------------
r34403 | rhuijben | 2008-11-25 13:09:28 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Document backport branch for r31314 group
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34405 | stsp | 2008-11-25 15:56:01 +0100 (Tue, 25 Nov 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add a question about r34345.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34407 | julianfoad | 2008-11-25 16:34:23 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   M /branches/tc_url_rev
   M /branches/tc_url_rev/TODO-1.6
   M /branches/tc_url_rev/notes/dump-load-format.txt
   M /branches/tc_url_rev/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/tc_url_rev/subversion/include/svn_auth.h
   M /branches/tc_url_rev/subversion/libsvn_client/merge.c
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/dag.c
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/tc_url_rev/subversion/libsvn_fs_fs/tree.c
   M /branches/tc_url_rev/subversion/libsvn_subr/auth.c
   M /branches/tc_url_rev/subversion/libsvn_subr/cmdline.c
   M /branches/tc_url_rev/subversion/libsvn_subr/path.c
   M /branches/tc_url_rev/subversion/tests/cmdline/depth_tests.py
   M /branches/tc_url_rev/subversion/tests/cmdline/merge_tests.py
   M /branches/tc_url_rev/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/tc_url_rev/subversion/tests/libsvn_repos/repos-test.c
   M /branches/tc_url_rev/subversion/tests/libsvn_subr/auth-test.c

On the tc_url_rev branch: Merge all changes from trunk up to r34406.
------------------------------------------------------------------------
r34408 | sbutler | 2008-11-25 16:38:56 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   D /branches/update-tc-loggy

Delete the update-tc-loggy branch (unused).
------------------------------------------------------------------------
r34409 | julianfoad | 2008-11-25 16:45:56 +0100 (Tue, 25 Nov 2008) | 2 lines
Changed paths:
   M /branches/tc_url_rev/subversion/tests/libsvn_wc/tree-conflict-data-test.c

* subversion/tests/libsvn_wc/tree-conflict-data-test.c
  (test_funcs): Mark test 3 as XFAIL.
------------------------------------------------------------------------
r34410 | stsp | 2008-11-25 16:52:04 +0100 (Tue, 25 Nov 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove a done tree conflict item.

------------------------------------------------------------------------
r34411 | julianfoad | 2008-11-25 16:56:38 +0100 (Tue, 25 Nov 2008) | 5 lines
Changed paths:
   M /trunk
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_wc/log.c
   M /trunk/subversion/libsvn_wc/merge.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/libsvn_wc/util.c
   M /trunk/subversion/libsvn_wc/wc.h
   M /trunk/subversion/svn/cl.h
   M /trunk/subversion/svn/diff-cmd.c
   M /trunk/subversion/svn/info-cmd.c
   M /trunk/subversion/svn/list-cmd.c
   M /trunk/subversion/svn/tree-conflicts.c
   M /trunk/subversion/svn/util.c
   M /trunk/subversion/tests/cmdline/info_tests.py
   M /trunk/subversion/tests/cmdline/stat_tests.py
   M /trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c

Merge the tc_url_rev branch to trunk.

This stores and reports the URL@REV and similar information of the conflicting
versions of a node in a tree conflict.

------------------------------------------------------------------------
r34412 | stsp | 2008-11-25 16:59:12 +0100 (Tue, 25 Nov 2008) | 3 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove last remaining essential tree conflict item.
   Looks like we'll be good for tree conflicts in 1.6 :)

------------------------------------------------------------------------
r34413 | hwright | 2008-11-25 17:00:22 +0100 (Tue, 25 Nov 2008) | 16 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c
   M /trunk/subversion/svnserve/serve.c

Comment out the rep-sharing configureation option, but default to true if
the option doesn't exist in the configuration file.  This won't
automatically enable rep sharing on old repositories, since it's also
protected by the filesystem format number.

Suggested by: glasser

* subversion/libsvn_fs_fs/fs_fs.c
  (write_config): Comment out the rep sharing config option in the config
    file.
  (svn_fs_fs__open, svn_fs_fs__create): When reading the rep sharing
    config option, default to TRUE if it doesn't exist.

[ Changes accidentally included to subversion/svnserve/serve.c were reverted
  in r34414. ]

------------------------------------------------------------------------
r34414 | hwright | 2008-11-25 17:01:54 +0100 (Tue, 25 Nov 2008) | 3 lines
Changed paths:
   M /trunk/subversion/svnserve/serve.c

* subversion/svnserve/serve.c:
  Revert commits to this file accidentally made in r34413.

------------------------------------------------------------------------
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().

------------------------------------------------------------------------
r34416 | hwright | 2008-11-25 17:21:00 +0100 (Tue, 25 Nov 2008) | 3 lines
Changed paths:
   M /branches/fsfs-pack
   M /branches/fsfs-pack/INSTALL
   M /branches/fsfs-pack/TODO-1.6
   M /branches/fsfs-pack/build/generator/gen_win.py
   M /branches/fsfs-pack/build/run_tests.py
   M /branches/fsfs-pack/notes/dump-load-format.txt
   A /branches/fsfs-pack/notes/tree-conflicts/use-cases-resolution.txt (from /trunk/notes/tree-conflicts/use-cases-resolution.txt:34415)
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/fsfs-pack/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/fsfs-pack/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/fsfs-pack/subversion/bindings/swig/python/tests/ra.py
   M /branches/fsfs-pack/subversion/bindings/swig/python/tests/trac/test.py
   M /branches/fsfs-pack/subversion/include/private/svn_mergeinfo_private.h
   M /branches/fsfs-pack/subversion/include/private/svn_wc_private.h
   M /branches/fsfs-pack/subversion/include/svn_auth.h
   M /branches/fsfs-pack/subversion/include/svn_config.h
   M /branches/fsfs-pack/subversion/include/svn_error.h
   M /branches/fsfs-pack/subversion/include/svn_repos.h
   M /branches/fsfs-pack/subversion/include/svn_wc.h
   M /branches/fsfs-pack/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/fsfs-pack/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/fsfs-pack/subversion/libsvn_client/merge.c
   M /branches/fsfs-pack/subversion/libsvn_delta/compose_delta.c
   M /branches/fsfs-pack/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/fsfs-pack/subversion/libsvn_fs/fs-loader.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/tree.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/util/skel.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/dag.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/dag.h
   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/fs_fs.h
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/tree.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/commit.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/locks.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/merge.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/update.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/util.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/xml.c
   M /branches/fsfs-pack/subversion/libsvn_repos/dump.c
   M /branches/fsfs-pack/subversion/libsvn_repos/reporter.c
   M /branches/fsfs-pack/subversion/libsvn_subr/auth.c
   M /branches/fsfs-pack/subversion/libsvn_subr/cmdline.c
   M /branches/fsfs-pack/subversion/libsvn_subr/config_file.c
   M /branches/fsfs-pack/subversion/libsvn_subr/dirent_uri.c
   M /branches/fsfs-pack/subversion/libsvn_subr/error.c
   M /branches/fsfs-pack/subversion/libsvn_subr/genctype.py
   M /branches/fsfs-pack/subversion/libsvn_subr/mergeinfo.c
   M /branches/fsfs-pack/subversion/libsvn_subr/path.c
   M /branches/fsfs-pack/subversion/libsvn_subr/sqlite.c
   M /branches/fsfs-pack/subversion/libsvn_subr/utf.c
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_files.c
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_files.h
   M /branches/fsfs-pack/subversion/libsvn_wc/adm_ops.c
   M /branches/fsfs-pack/subversion/libsvn_wc/diff.c
   M /branches/fsfs-pack/subversion/libsvn_wc/entries.c
   M /branches/fsfs-pack/subversion/libsvn_wc/log.c
   M /branches/fsfs-pack/subversion/libsvn_wc/merge.c
   M /branches/fsfs-pack/subversion/libsvn_wc/status.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.c
   M /branches/fsfs-pack/subversion/libsvn_wc/tree_conflicts.h
   M /branches/fsfs-pack/subversion/libsvn_wc/update_editor.c
   M /branches/fsfs-pack/subversion/libsvn_wc/util.c
   M /branches/fsfs-pack/subversion/libsvn_wc/wc.h
   M /branches/fsfs-pack/subversion/libsvn_wc/wc_db.c
   M /branches/fsfs-pack/subversion/mod_dav_svn/util.c
   M /branches/fsfs-pack/subversion/po/pl.po
   M /branches/fsfs-pack/subversion/svn/cl.h
   M /branches/fsfs-pack/subversion/svn/diff-cmd.c
   M /branches/fsfs-pack/subversion/svn/info-cmd.c
   M /branches/fsfs-pack/subversion/svn/list-cmd.c
   M /branches/fsfs-pack/subversion/svn/main.c
   M /branches/fsfs-pack/subversion/svn/schema/info.rnc
   M /branches/fsfs-pack/subversion/svn/status.c
   M /branches/fsfs-pack/subversion/svn/tree-conflicts.c
   M /branches/fsfs-pack/subversion/svn/tree-conflicts.h
   M /branches/fsfs-pack/subversion/svn/util.c
   M /branches/fsfs-pack/subversion/tests/cmdline/blame_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/changelist_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/depth_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/info_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/log_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/merge_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/stat_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svnlook_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/actions.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/main.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/wc.py
   M /branches/fsfs-pack/subversion/tests/libsvn_repos/repos-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/auth-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/fsfs-pack/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/fsfs-pack/tools/backup/hot-backup.py.in
   M /branches/fsfs-pack/tools/dev/iz/find-fix.py
   M /branches/fsfs-pack/tools/dev/trails.py
   M /branches/fsfs-pack/tools/examples/blame.py
   M /branches/fsfs-pack/tools/examples/svnshell.py
   M /branches/fsfs-pack/tools/hook-scripts/mailer/mailer.py
   M /branches/fsfs-pack/tools/hook-scripts/svn2feed.py
   M /branches/fsfs-pack/tools/server-side/fsfs-reshard.py
   M /branches/fsfs-pack/win-tests.py
   M /branches/fsfs-pack/www/links.html
   M /branches/fsfs-pack/www/toctool.py

On the fsfs-pack branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r34417 | rhuijben | 2008-11-25 17:32:24 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast some votes, approving the r33873 and r34051 groups
------------------------------------------------------------------------
r34418 | julianfoad | 2008-11-25 17:51:44 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   D /branches/tc_url_rev

Delete the tc_url_rev branch, merged to trunk in 34411.
------------------------------------------------------------------------
r34419 | danielsh | 2008-11-25 17:57:16 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Vote for r34171, approving.
------------------------------------------------------------------------
r34420 | hwright | 2008-11-25 18:08:08 +0100 (Tue, 25 Nov 2008) | 11 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/subversion/bindings/swig
   M /branches/1.5.x/subversion/libsvn_client/merge.c
   M /branches/1.5.x/subversion/libsvn_repos/log.c
   M /branches/1.5.x/subversion/tests/libsvn_repos/repos-test.c

Merge r33873, r33874 from trunk:

* r33873, r33874
   Old API-accessible bug where a certain combination of revision
   arguments to svn_repos_get_logs returns garbage.  Has tests.
   Votes:
     +1: glasser, cmpilato, rhuijben

[ Note: there was a minor semantic conflict in the new repos test, but it
  was easily resolved. ]

------------------------------------------------------------------------
r34421 | hwright | 2008-11-25 18:09:46 +0100 (Tue, 25 Nov 2008) | 12 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/subversion/bindings/swig
   M /branches/1.5.x/subversion/libsvn_client/merge.c
   M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py

Merge r34050, r34051, r34053 from trunk:

 * r34050, r34051, r34053
   Fix a bug in which files added via merge from a foreign repository
   kept the UUID of the foreign repository.
   Notes:
     r34050 adds an XFail regression test.
     r34051 fixes the bug and expects the regression test to pass.
     r34053 expands the test to cover directory adds, too.
   Votes:
     +1: cmpilato, danielsh, rhuijben

------------------------------------------------------------------------
r34422 | hwright | 2008-11-25 18:10:54 +0100 (Tue, 25 Nov 2008) | 12 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/subversion/bindings/swig
   M /branches/1.5.x/subversion/libsvn_client/merge.c
   M /branches/1.5.x/subversion/libsvn_diff/diff_file.c

Merge r34171 from trunk:

 * r34171
   Fix: interactive resolve's 'diff-full (df)' errors out in locales
   such as zh_CN.GBK, due to a failure in character encoding when
   outputting the diff header.
   Justification:
     Very unfriendly to error out during a merge.
     Simple fix (UTF-8-encode the date string from APR).
   Votes:
     +1: julianfoad, rhuijben, danielsh

------------------------------------------------------------------------
r34423 | pburba | 2008-11-25 20:21:18 +0100 (Tue, 25 Nov 2008) | 12 lines
Changed paths:
   M /trunk/subversion/include/svn_mergeinfo.h
   M /trunk/subversion/libsvn_subr/mergeinfo.c

Fix issue #3312 "Mergeinfo for '...' maps to an empty revision range" due
to sparse merging.

Patch by: Mark Eichin <eichin@gmail.com>

* subversion/include/svn_mergeinfo.h
  (svn_mergeinfo_inheritable): Tweak doc string.

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo_inheritable): Do not return paths mapped to empty
  rangelists, this is not permitted by the svn:mergeinfo syntax.

------------------------------------------------------------------------
r34424 | pburba | 2008-11-25 20:32:28 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34423.
------------------------------------------------------------------------
r34425 | pburba | 2008-11-25 23:17:56 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Fix cut-and-paste typo on r34423 group.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34427 | rhuijben | 2008-11-25 23:31:11 +0100 (Tue, 25 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast vote on r34423.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34430 | pburba | 2008-11-26 15:48:31 +0100 (Wed, 26 Nov 2008) | 5 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Note the issue an XFailing merge test is for.

* subversion/tests/cmdline/merge_tests.py
  (merge_range_prior_to_rename_source_existence): This is for issue #3324.

------------------------------------------------------------------------
r34431 | hwright | 2008-11-26 16:41:01 +0100 (Wed, 26 Nov 2008) | 3 lines
Changed paths:
   M /trunk/CHANGES

* CHANGES:
  (1.5.5): New section.  Update with current merges to 1.5.x.

------------------------------------------------------------------------
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 <hdmlist@googlemail.com>

* 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.
------------------------------------------------------------------------
r34433 | pburba | 2008-11-26 18:16:56 +0100 (Wed, 26 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34432.
------------------------------------------------------------------------
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 <Marc.Haesen@oneaccess-net.com>
          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.

------------------------------------------------------------------------
r34446 | hwright | 2008-11-27 02:48:31 +0100 (Thu, 27 Nov 2008) | 4 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
  (get_root_changes_offset): Add an explanatory concept.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34450 | hwright | 2008-11-27 22:17:04 +0100 (Thu, 27 Nov 2008) | 3 lines
Changed paths:
   M /branches/fsfs-pack
   M /branches/fsfs-pack/CHANGES
   M /branches/fsfs-pack/contrib/client-side/emacs/psvn.el
   M /branches/fsfs-pack/subversion/include/svn_mergeinfo.h
   M /branches/fsfs-pack/subversion/libsvn_client/merge.c
   M /branches/fsfs-pack/subversion/libsvn_fs_base/util/skel.h
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/commit.c
   M /branches/fsfs-pack/subversion/libsvn_subr/mergeinfo.c
   M /branches/fsfs-pack/subversion/tests/cmdline/depth_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/merge_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/dirent_uri-test.c

On the fsfs-pack branch:
Bring up-to-date with trunk (to grab r34449).

------------------------------------------------------------------------
r34451 | neels | 2008-11-27 23:50:27 +0100 (Thu, 27 Nov 2008) | 5 lines
Changed paths:
   A /branches/merge-skips-obstructions (from /trunk:34450)

Another (lightweight) branch: merge-skips-obstructions
Make "merge" check for obstructions and skip them, before looking for tree
conflicts. Adjust tests accordingly.


------------------------------------------------------------------------
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.


------------------------------------------------------------------------
r34456 | neels | 2008-11-28 04:24:11 +0100 (Fri, 28 Nov 2008) | 19 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/update_tests.py

Make cmdline test update_tests.py 50 pass.

tree_conflicts_on_update_2_3 expected to get a "Skipped" message when
trying to update from *within* a directory deleted on the repository
(that also happens to be a tree-conflict victim). The tree-conflict-ness
does not change anything about a path missing in the repos, and
without stepping out to the parent dir, no tree-conflicts can be known
on the directory. See also this message:
Date: Wed, 26 Nov 2008 06:32:57 +0100
From: Neels J Hofmeyr <neels@elego.de>
Subject: update_tests.py 50 XFails.

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_2_3): 
    Don't expect to "Skip" when updating *within* a "deleted" dir, twice.
    Comment on that. Remove an obsolete warning comment.
  (test_list): Don't XFail tree_conflicts_on_update_2_3, it passes now.


------------------------------------------------------------------------
r34457 | hwright | 2008-11-28 06:25:04 +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
  (write_format): Avoid an unneeded string creation function call.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34463 | hwright | 2008-11-28 16:34:20 +0100 (Fri, 28 Nov 2008) | 7 lines
Changed paths:
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c

On the fsfs-pack branch:
Using the max_packed_rev value, simplify the logic in open_pack_or_rev_file().

* subversion/libsvn_fs_fs/fs_fs.c
  (open_pack_or_rev_file): Only attempt to open the the correct pack or rev
    file, not both.

------------------------------------------------------------------------
r34464 | hwright | 2008-11-28 16:59:04 +0100 (Fri, 28 Nov 2008) | 10 lines
Changed paths:
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c

On the fsfs-pack branch:
Remove the need to pass around a "packed" variable everywhere, since its
value can be trivially calculated.

* subversion/libsvn_fs_fs/fs_fs.c
  (open_pack_or_rev_file): Remove the PACKED return parameter.
  (open_and_seek_revision, get_fs_id_at_offset, get_root_changes_offset,
   svn_fs_fs__rev_get_root, svn_fs_fs__paths_changed, recover_body):
    Locally calculate whether a revision is packed or not.

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34470 | arfrever | 2008-11-29 03:06:15 +0100 (Sat, 29 Nov 2008) | 3 lines
Changed paths:
   M /trunk/build/ac-macros/swig.m4

* build/ac-macros/swig.m4
  (SVN_FIND_SWIG): Allow SWIG 1.3.36.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34479 | arfrever | 2008-11-30 17:22:27 +0100 (Sun, 30 Nov 2008) | 7 lines
Changed paths:
   M /branches/svnpatch-diff/subversion/libsvn_wc/deprecated.c

On the 'svnpatch-diff' branch:
Follow-up to r33978:

* subversion/libsvn_wc/deprecated.c
  (file_added, dir_added): Add some arguments which were accepted by these
  functions in ^/branches/svnpatch-diff/subversion/libsvn_wc/diff.c@33977.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34484 | arfrever | 2008-11-30 19:30:30 +0100 (Sun, 30 Nov 2008) | 3 lines
Changed paths:
   M /branches/svnpatch-diff
   M /branches/svnpatch-diff/TODO-1.6
   M /branches/svnpatch-diff/build.conf
   M /branches/svnpatch-diff/configure.ac
   M /branches/svnpatch-diff/notes/tree-conflicts/design-overview.txt
   M /branches/svnpatch-diff/notes/tree-conflicts/requirements.txt
   A /branches/svnpatch-diff/notes/tree-conflicts/use-cases-resolution.txt (from /trunk/notes/tree-conflicts/use-cases-resolution.txt:34300)
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/svnpatch-diff/subversion/bindings/swig/python
   M /branches/svnpatch-diff/subversion/bindings/swig/python/libsvn_swig_py
   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_wc_private.h
   M /branches/svnpatch-diff/subversion/include/svn_auth.h
   M /branches/svnpatch-diff/subversion/include/svn_dirent_uri.h
   M /branches/svnpatch-diff/subversion/include/svn_error.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_string.h
   M /branches/svnpatch-diff/subversion/include/svn_wc.h
   M /branches/svnpatch-diff/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/svnpatch-diff/subversion/libsvn_client/commit_util.c
   M /branches/svnpatch-diff/subversion/libsvn_client/merge.c
   M /branches/svnpatch-diff/subversion/libsvn_client/resolved.c
   M /branches/svnpatch-diff/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/dag.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/tree.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_svn/client.c
   M /branches/svnpatch-diff/subversion/libsvn_subr
   M /branches/svnpatch-diff/subversion/libsvn_subr/auth.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/dirent_uri.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/error.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/io.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/pool.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/subst.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/svn_string.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/time.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/win32_crypto.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.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/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/po/fr.po
   M /branches/svnpatch-diff/subversion/svn/status.c
   M /branches/svnpatch-diff/subversion/svnadmin/main.c
   M /branches/svnpatch-diff/subversion/tests/cmdline/merge_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/resolved_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/switch_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_subr
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/auth-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005
   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/www/development.html
   M /branches/svnpatch-diff/www/faq.html
   A /branches/svnpatch-diff/www/faq.zh.html (from /trunk/www/faq.zh.html:34274)
   M /branches/svnpatch-diff/www/index.html
   M /branches/svnpatch-diff/www/issue-tracker.html
   M /branches/svnpatch-diff/www/poole-response.html
   M /branches/svnpatch-diff/www/svn_1.6_releasenotes.html
   M /branches/svnpatch-diff/www/tasks.html
   M /branches/svnpatch-diff/www/tools_contrib.html
   A /branches/svnpatch-diff/www/tools_contrib.zh.html (from /trunk/www/tools_contrib.zh.html:34274)

On the 'svnpatch-diff' branch:
Merge r34200:34300 from trunk.

------------------------------------------------------------------------
r34485 | arfrever | 2008-11-30 19:33:37 +0100 (Sun, 30 Nov 2008) | 4 lines
Changed paths:
   M /branches/svnpatch-diff/build.conf
   M /branches/svnpatch-diff/notes/tree-conflicts/design-overview.txt
   M /branches/svnpatch-diff/notes/tree-conflicts/requirements.txt
   M /branches/svnpatch-diff/subversion/include
   M /branches/svnpatch-diff/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/svnpatch-diff/subversion/libsvn_subr
   M /branches/svnpatch-diff/subversion/tests/cmdline/tree_conflict_tests.txt
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr
   M /branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005
   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/www/development.html
   M /branches/svnpatch-diff/www/issue-tracker.html
   M /branches/svnpatch-diff/www/tasks.html

On the 'svnpatch-diff' branch:
Follow-up to r34484:
Delete svn:mergeinfo on some files.

------------------------------------------------------------------------
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().

------------------------------------------------------------------------
r34487 | danielsh | 2008-11-30 22:31:48 +0100 (Sun, 30 Nov 2008) | 28 lines
Changed paths:
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/svn/main.c
   M /trunk/subversion/tests/cmdline/commit_tests.py
   M /trunk/subversion/tests/cmdline/depth_tests.py

Fixed backward compatibility bug: it was not possible to commit only
property changes on a folder with modified child items.

Patch by: Martin Hauner <martin.hauner@gmx.net>
          me
(Martin found the bug in and wrote the fix to libsvn_client.)


* subversion/libsvn_client/deprecated.c
  (svn_client_commit3):
    Turn non recursive into svn_depth_empty instead of svn_depth_files.

* subversion/svn/main.c
  (main):  Map '-N' to '--depth=empty' for 'svn commit'.


* subversion/tests/cmdline/commit_tests.py
  (commit_nonrecursive):
    Fix the test to expect 'commit -N' to mean 'commit --depth=empty'.
    While here, extend the 'add' scenario in the test.

* subversion/tests/cmdline/depth_tests.py
  (commit_propmods_with_depth_empty):
    Extract helper function and run it twice: with '-N' and
    with '--depth=empty'.
  (commit_propmods_with_depth_empty_helper):
    Renamed from 'commit_propmods_with_depth_empty' and added 'depth_arg'
    parameter.
------------------------------------------------------------------------
r34488 | danielsh | 2008-11-30 22:41:11 +0100 (Sun, 30 Nov 2008) | 1 line
Changed paths:
   A /branches/1.5.x-r34487 (from /branches/1.5.x:34487)

Create backport branch for r34487.
------------------------------------------------------------------------
r34489 | danielsh | 2008-11-30 22:47:26 +0100 (Sun, 30 Nov 2008) | 4 lines
Changed paths:
   M /branches/1.5.x-r34487
   M /branches/1.5.x-r34487/CHANGES
   M /branches/1.5.x-r34487/COMMITTERS
   M /branches/1.5.x-r34487/subversion/bindings/swig
   M /branches/1.5.x-r34487/subversion/libsvn_client/commit.c
   M /branches/1.5.x-r34487/subversion/libsvn_client/merge.c
   M /branches/1.5.x-r34487/subversion/svn/main.c
   M /branches/1.5.x-r34487/subversion/tests/cmdline/commit_tests.py
   M /branches/1.5.x-r34487/subversion/tests/cmdline/depth_tests.py

On the 1.5.x-r34487 branch:

Merge r34487 from trunk.  Avoid a tree conflict on deprecated.c by editing
the diff and running a record-only merge.
------------------------------------------------------------------------
r34490 | danielsh | 2008-11-30 22:47:38 +0100 (Sun, 30 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Nominate r34487.
------------------------------------------------------------------------
r34491 | rhuijben | 2008-11-30 23:33:07 +0100 (Sun, 30 Nov 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote on r34487. (Also verified 1.4.0 svn ci -N behavior)
------------------------------------------------------------------------
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)

------------------------------------------------------------------------
r34493 | rhuijben | 2008-12-01 00:03:50 +0100 (Mon, 01 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Add r34492 to the r34487 group
------------------------------------------------------------------------
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).

------------------------------------------------------------------------
r34495 | danielsh | 2008-12-01 11:51:09 +0100 (Mon, 01 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS (r34487): Add r34494.
------------------------------------------------------------------------
r34496 | rhuijben | 2008-12-01 12:17:54 +0100 (Mon, 01 Dec 2008) | 4 lines
Changed paths:
   M /branches/1.5.x-r34487
   M /branches/1.5.x-r34487/CHANGES
   M /branches/1.5.x-r34487/COMMITTERS
   M /branches/1.5.x-r34487/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x-r34487/subversion/bindings/swig
   M /branches/1.5.x-r34487/subversion/include/svn_client.h
   M /branches/1.5.x-r34487/subversion/libsvn_client/merge.c
   M /branches/1.5.x-r34487/subversion/tests/cmdline/depth_tests.py
   M /branches/1.5.x-r34487/www/images/subversion-diagram.png
   M /branches/1.5.x-r34487/www/images/subversion_logo-200x173.png
   M /branches/1.5.x-r34487/www/images/subversion_logo-384x332.png
   M /branches/1.5.x-r34487/www/images/subversion_logo_hor-468x64.png

On the 1.5.x-r34487 branch:

Merge r34492,r34494 from trunk.

------------------------------------------------------------------------
r34497 | rhuijben | 2008-12-01 12:20:59 +0100 (Mon, 01 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote on r34494 (r34487 group)
------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34500 | hwright | 2008-12-01 17:08:24 +0100 (Mon, 01 Dec 2008) | 7 lines
Changed paths:
   M /trunk/tools/dev/graph-dav-servers.py
   M /trunk/www/images/svn-dav-securityspace-survey.png
   M /trunk/www/svn-dav-securityspace-survey.html

Update the dav server survey for Dec. 2008.

* www/svn-dav-securityspace-survey.html,
  www/images/svn-dav-securityspace-survey.png,
  tools/dev/graph-dav-servers.py:
  Update image and table.

------------------------------------------------------------------------
r34501 | hwright | 2008-12-01 17:31:28 +0100 (Mon, 01 Dec 2008) | 3 lines
Changed paths:
   M /branches/fsfs-pack
   M /branches/fsfs-pack/build/ac-macros/swig.m4
   M /branches/fsfs-pack/build/generator/ezt.py
   M /branches/fsfs-pack/build/generator/gen_base.py
   M /branches/fsfs-pack/build/generator/gen_vcnet_vcproj.py
   M /branches/fsfs-pack/build/generator/gen_win.py
   M /branches/fsfs-pack/build/win32/make_dist.py
   M /branches/fsfs-pack/gen-make.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/examples/log.py
   M /branches/fsfs-pack/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/fsfs-pack/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/fsfs-pack/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/fsfs-pack/subversion/bindings/swig/python/tests/ra.py
   M /branches/fsfs-pack/subversion/bindings/swig/python/tests/trac/test.py
   M /branches/fsfs-pack/subversion/bindings/swig/python/tests/wc.py
   M /branches/fsfs-pack/subversion/include/svn_auth.h
   M /branches/fsfs-pack/subversion/include/svn_client.h
   M /branches/fsfs-pack/subversion/include/svn_subst.h
   M /branches/fsfs-pack/subversion/libsvn_client/deprecated.c
   M /branches/fsfs-pack/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/fsfs-pack/subversion/libsvn_ra_serf/util.c
   M /branches/fsfs-pack/subversion/libsvn_subr/auth.c
   M /branches/fsfs-pack/subversion/libsvn_subr/cmdline.c
   M /branches/fsfs-pack/subversion/libsvn_wc/log.c
   M /branches/fsfs-pack/subversion/libsvn_wc/update_editor.c
   M /branches/fsfs-pack/subversion/po/pl.po
   M /branches/fsfs-pack/subversion/svn/main.c
   M /branches/fsfs-pack/subversion/tests/cmdline/commit_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/depth_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/externals_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/merge_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/svntest/actions.py
   M /branches/fsfs-pack/subversion/tests/cmdline/switch_tests.py
   M /branches/fsfs-pack/subversion/tests/cmdline/update_tests.py
   M /branches/fsfs-pack/subversion/tests/libsvn_subr/auth-test.c
   M /branches/fsfs-pack/tools/bdb/svn-bdb-view.py
   M /branches/fsfs-pack/tools/dev/contribulyze.py
   M /branches/fsfs-pack/tools/dev/gen-javahl-errors.py
   M /branches/fsfs-pack/tools/dev/graph-dav-servers.py
   M /branches/fsfs-pack/tools/dev/normalize-dump.py
   M /branches/fsfs-pack/tools/dev/po-merge.py
   M /branches/fsfs-pack/tools/dev/trails.py
   M /branches/fsfs-pack/tools/dev/which-error.py
   M /branches/fsfs-pack/tools/examples/svnshell.py
   M /branches/fsfs-pack/tools/hook-scripts/mailer/mailer.py
   M /branches/fsfs-pack/tools/hook-scripts/svnperms.py
   M /branches/fsfs-pack/www/images/svn-dav-securityspace-survey.png
   M /branches/fsfs-pack/www/svn-dav-securityspace-survey.html

On the fsfs-pack branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34503 | hwright | 2008-12-01 18:00:22 +0100 (Mon, 01 Dec 2008) | 2 lines
Changed paths:
   D /branches/fsfs-pack

Remove fsfs-pack branch, merged to trunk in r34502.

------------------------------------------------------------------------
r34504 | hwright | 2008-12-01 18:04:37 +0100 (Mon, 01 Dec 2008) | 3 lines
Changed paths:
   M /trunk/www/svn_1.6_releasenotes.html

* www/svn_1.6_releasenotes.html
  (filesystem-improvements): Remove [BRANCH] designation on fsfs packing.

------------------------------------------------------------------------
r34505 | glasser | 2008-12-01 18:15:13 +0100 (Mon, 01 Dec 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Point out that complete build instructions are a release blocker.

------------------------------------------------------------------------
r34506 | glasser | 2008-12-01 18:45:39 +0100 (Mon, 01 Dec 2008) | 47 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/tree.c

Fix a few bugs (one which can lead to a crash and one to an incorrect
error) in the BDB implementation of node-origin-rev calculation.

These bugs should have been caught by the C tests for
svn_fs_node_origin_rev, but the code is practically dead code: it's
essentially only used for legacy repositories, since any node created
in a 1.5-era repository will immediately have its origin ID stored in
the node-origins cache.  To reveal these bugs, go into
svn_fs_bdb__get_node_origin, and comment out the "if (db_err ==
DB_NOTFOUND)" line (ie, make it always be a cache miss).

Then run fs-test 34: you'll get a segfault in the last svn_path_join
of prev_location.  This is because "path" isn't canonicalized ("A/D")
but "copy_path" is ("/A/D"), so the svn_path_is_child call returns
NULL for remainder.  The first change to base_node_origin_rev fixes
this.  (Though perhaps the correct answer is to change the test to
always pass absolute paths?  It's unclear to me if
base_node_origin_rev's use of relative paths is actually legal.)

However, you then end up with a "File not found: revision 7, path
'/A/D2'" error; this is because the loop calling prev_location
accidentally fails to update the revision that it's looking at with
the revision returned from prev_location, despite a comment to the
contrary.  The second change to base_node_origin_rev fixes this.  Now
the test happily passes without the cache, and you can remove the hack
to svn_fs_bdb__get_node_origin.

This change was tested by running "make check FS_TYPE=bdb" with the
svn_fs_bdb__get_node_origin hack still in.  Modifying the C test suite
so that it manages to test this code without a manual hack is left as
an exercise to the reader.  (OK, that's a lie: after about 8 hours of
running the test suite on my Mac (with no failures, and fs-test having
passed) I got bored of waiting and killed it.  Then I asked on dev@,
and people said that bdb tests were just known to be slow on OS X, so
I decided to try it on my Linux box instead.  But after 45 minutes of
trying to figure out how to build trunk Subversion on a Dapper box
with SQLite 3.2 installed in /usr/lib and failing, I figured I might
as well just commit this fix.  It's not like anybody noticed the
segfault bug in the past year.  Maybe nobody uses fs_base anymore
anyway.  I don't know why they would.)

* subversion/libsvn_fs_base/tree.c
  (base_node_origin_rev): Canonicalize the input path as an absolute
   path.  Actually update a revision variable in a loop instead of
   staying stuck on the revision it started with.


------------------------------------------------------------------------
r34507 | hwright | 2008-12-01 18:55:46 +0100 (Mon, 01 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote.

------------------------------------------------------------------------
r34508 | hwright | 2008-12-01 18:59:11 +0100 (Mon, 01 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/svn_client.h
   M /branches/1.5.x/subversion/libsvn_client/commit.c
   M /branches/1.5.x/subversion/libsvn_client/merge.c
   M /branches/1.5.x/subversion/svn/main.c
   M /branches/1.5.x/subversion/tests/cmdline/commit_tests.py
   M /branches/1.5.x/subversion/tests/cmdline/depth_tests.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 r34487, r34492, and r34494 from the 1.5.x-r34487 branch:

 * r34487, r34492, r34494
   Fixed backward compatibility bug: it was not possible to commit only
   property changes on a folder with modified child items.
   Notes:
     r34487 is the fix.  r34492 and r34494 update the documentation and fix
     a bug in the test.
   Justification:
     Backward compatibility of 'svn commit -N'.
   Branch:
     ^/branches/1.5.x-r34487
   Votes:
     +1: danielsh, rhuijben, hwright

------------------------------------------------------------------------
r34509 | hwright | 2008-12-01 19:00:51 +0100 (Mon, 01 Dec 2008) | 2 lines
Changed paths:
   D /branches/1.5.x-r34487

Remove 1.5.x-r34487 branch, merged to 1.5.x in r34508.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34512 | pburba | 2008-12-01 21:16:19 +0100 (Mon, 01 Dec 2008) | 2 lines
Changed paths:
   A /branches/1.5.x-reintegrate-improvements (from /branches/1.5.x:34511)

Create a 1.5.x backport branch for the various reintegrate improvements in
r34091, r34094, r34244, r34256, and r34306.
------------------------------------------------------------------------
r34513 | pburba | 2008-12-02 00:33:27 +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 r34091 from trunk.

* subversion/include/private/svn_mergeinfo_private.h
* subversion/libsvn_client/merge.c
* subversion/libsvn_subr/mergeinfo.c
* subversion/tests/cmdline/merge_tests.py
  The "real" changes.  r34091 includes the addition of a new 1.6 API
  svn_mergeinfo_catalog_dup.  For the 1.5.x backport this API is made
  private and renamed to svn_mergeinfo__catalog_dup and the declaration
  moved from svn_mergeinfo.h to svn_mergeinfo_private.h.  Also, don't
  expect svntest.actions.run_and_verify_svn to return an exit code in
  merge_tests.py, that functionality was never backported to 1.5.x.

* 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.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34525 | julianfoad | 2008-12-02 18:32:29 +0100 (Tue, 02 Dec 2008) | 2 lines
Changed paths:
   M /branches/merge-skips-obstructions
   M /branches/merge-skips-obstructions/TODO-1.6
   M /branches/merge-skips-obstructions/build/ac-macros/swig.m4
   M /branches/merge-skips-obstructions/build/generator/ezt.py
   M /branches/merge-skips-obstructions/build/generator/gen_base.py
   M /branches/merge-skips-obstructions/build/generator/gen_vcnet_vcproj.py
   M /branches/merge-skips-obstructions/build/generator/gen_win.py
   M /branches/merge-skips-obstructions/build/win32/make_dist.py
   M /branches/merge-skips-obstructions/build.conf
   M /branches/merge-skips-obstructions/contrib/client-side/emacs/dsvn.el
   M /branches/merge-skips-obstructions/gen-make.py
   M /branches/merge-skips-obstructions/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/merge-skips-obstructions/subversion/bindings/ctypes-python/examples/log.py
   M /branches/merge-skips-obstructions/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/merge-skips-obstructions/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/merge-skips-obstructions/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/merge-skips-obstructions/subversion/bindings/swig/python/tests/ra.py
   M /branches/merge-skips-obstructions/subversion/bindings/swig/python/tests/trac/test.py
   M /branches/merge-skips-obstructions/subversion/bindings/swig/python/tests/wc.py
   M /branches/merge-skips-obstructions/subversion/include/svn_auth.h
   M /branches/merge-skips-obstructions/subversion/include/svn_client.h
   M /branches/merge-skips-obstructions/subversion/include/svn_fs.h
   M /branches/merge-skips-obstructions/subversion/include/svn_repos.h
   M /branches/merge-skips-obstructions/subversion/include/svn_subst.h
   M /branches/merge-skips-obstructions/subversion/libsvn_client/deprecated.c
   M /branches/merge-skips-obstructions/subversion/libsvn_fs/fs-loader.c
   M /branches/merge-skips-obstructions/subversion/libsvn_fs/fs-loader.h
   M /branches/merge-skips-obstructions/subversion/libsvn_fs_base/fs.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.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/fs_fs.h
   M /branches/merge-skips-obstructions/subversion/libsvn_fs_fs/structure
   M /branches/merge-skips-obstructions/subversion/libsvn_ra_serf/util.c
   M /branches/merge-skips-obstructions/subversion/libsvn_repos/fs-wrap.c
   M /branches/merge-skips-obstructions/subversion/libsvn_subr/auth.c
   M /branches/merge-skips-obstructions/subversion/libsvn_subr/cmdline.c
   M /branches/merge-skips-obstructions/subversion/libsvn_wc/log.c
   M /branches/merge-skips-obstructions/subversion/libsvn_wc/update_editor.c
   M /branches/merge-skips-obstructions/subversion/po/pl.po
   M /branches/merge-skips-obstructions/subversion/svn/main.c
   M /branches/merge-skips-obstructions/subversion/svnadmin/main.c
   M /branches/merge-skips-obstructions/subversion/tests/cmdline/commit_tests.py
   M /branches/merge-skips-obstructions/subversion/tests/cmdline/depth_tests.py
   M /branches/merge-skips-obstructions/subversion/tests/cmdline/externals_tests.py
   M /branches/merge-skips-obstructions/subversion/tests/cmdline/merge_tests.py
   M /branches/merge-skips-obstructions/subversion/tests/cmdline/svntest/actions.py
   M /branches/merge-skips-obstructions/subversion/tests/cmdline/switch_tests.py
   M /branches/merge-skips-obstructions/subversion/tests/cmdline/update_tests.py
   A /branches/merge-skips-obstructions/subversion/tests/libsvn_fs_fs (from /trunk/subversion/tests/libsvn_fs_fs:34523)
   R /branches/merge-skips-obstructions/subversion/tests/libsvn_fs_fs/fs-pack-test.c (from /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c:34523)
   M /branches/merge-skips-obstructions/subversion/tests/libsvn_subr/auth-test.c
   M /branches/merge-skips-obstructions/tools/bdb/svn-bdb-view.py
   M /branches/merge-skips-obstructions/tools/dev/contribulyze.py
   M /branches/merge-skips-obstructions/tools/dev/gen-javahl-errors.py
   M /branches/merge-skips-obstructions/tools/dev/graph-dav-servers.py
   M /branches/merge-skips-obstructions/tools/dev/normalize-dump.py
   M /branches/merge-skips-obstructions/tools/dev/po-merge.py
   M /branches/merge-skips-obstructions/tools/dev/trails.py
   M /branches/merge-skips-obstructions/tools/dev/which-error.py
   M /branches/merge-skips-obstructions/tools/examples/svnshell.py
   M /branches/merge-skips-obstructions/tools/hook-scripts/mailer/mailer.py
   M /branches/merge-skips-obstructions/tools/hook-scripts/svnperms.py
   M /branches/merge-skips-obstructions/www/images/svn-dav-securityspace-survey.png
   M /branches/merge-skips-obstructions/www/svn-dav-securityspace-survey.html
   M /branches/merge-skips-obstructions/www/svn_1.6_releasenotes.html

On the merge-skips-obstructions branch: Merge all changes from trunk@34523.

------------------------------------------------------------------------
r34526 | pburba | 2008-12-02 18:51:23 +0100 (Tue, 02 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate reintegrate improvements r34091, r34094, r34244, r34256,
  r34306.
------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34528 | pburba | 2008-12-02 19:18:13 +0100 (Tue, 02 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for and approve r31311 and r31314.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34532 | hwright | 2008-12-02 20:13:30 +0100 (Tue, 02 Dec 2008) | 14 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x/subversion/bindings/swig
   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/tests/cmdline/copy_tests.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 r31311, r31314 from the 1.5.x-r31314 branch:

 * r31311, r31314
   Fix bug whereby 'svn cp --parents URL/TO/EXISTING/FILE URL/TO/EXISTING/DIR'
   would seg fault.
   Notes:
     r31311 is the testcase and r31314 the fix. 
     Backport branch available as ^/branches/1.5.x-r31314.
   Justification:
     I just lost a night tracking this issue for an AnkhSVN user and I saw a
     few similar error reports earlier of users that couldn't reproduce.
   Votes:
     +1: rhuijben, hwright, pburba

------------------------------------------------------------------------
r34533 | hwright | 2008-12-02 20:14:30 +0100 (Tue, 02 Dec 2008) | 2 lines
Changed paths:
   D /branches/1.5.x-r31314

Remove the 1.5.x-r31314 branch, merged to 1.5.x in r34532.

------------------------------------------------------------------------
r34534 | cmpilato | 2008-12-02 20:32:00 +0100 (Tue, 02 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Propose r34506 for backport.
------------------------------------------------------------------------
r34535 | glasser | 2008-12-02 20:58:01 +0100 (Tue, 02 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Vote to backport r34506 to 1.5.x.
------------------------------------------------------------------------
r34536 | hwright | 2008-12-02 21:06:40 +0100 (Tue, 02 Dec 2008) | 5 lines
Changed paths:
   M /trunk/www/links.html

* www/links.html: Updated Cascade description to indicate that it is free for
  personal use.

Patch by: Matt Craighead <matt.craighead@conifersystems.com>

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34543 | julianfoad | 2008-12-03 12:39:23 +0100 (Wed, 03 Dec 2008) | 1 line
Changed paths:
   D /branches/merge-skips-obstructions

Remove the merge-skips-obstructions branch which was merged to trunk in r34542.
------------------------------------------------------------------------
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'.


------------------------------------------------------------------------
r34545 | cmpilato | 2008-12-03 17:41:33 +0100 (Wed, 03 Dec 2008) | 14 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/mirror.c

For issue #3275, make some needed bugfixes.

* subversion/mod_dav_svn/mirror.c
  (proxy_request_fixup): Add a docstring which dictates the required
    format of the 'uri_segment' parameter, and assert() that the
    parameter is well-formed.  Remove an unnecessary slash delimiter
    from the composed proxy URI -- we were generating a double-slash.
  (dav_svn__proxy_merge_fixup): Use a helper variable to hold the
    "special URI", and fix a URI construction that was using the root
    URI where the special URI was intended.  Finally, make the
    PROPFIND and GET URI examination as imprecise as tests applied to
    other requests for now.
 

------------------------------------------------------------------------
r34546 | cmpilato | 2008-12-03 18:38:35 +0100 (Wed, 03 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Add r34545 to the r34082 group.
------------------------------------------------------------------------
r34547 | pburba | 2008-12-03 18:52:39 +0100 (Wed, 03 Dec 2008) | 14 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/tests/cmdline/merge_tests.py

Fix issue #3323 'Mergeinfo deleted by a merge should disappear'.

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): Add new paths_with_deleted_mergeinfo member.
  (merge_props_changed): Populate paths_with_deleted_mergeinfo.
  (remove_children_with_deleted_mergeinfo): New helper function.
  (do_directory_merge): Call remove_children_with_deleted_mergeinfo after
  each editor drive.
  (do_merge): Initialize paths_with_deleted_mergeinfo.

* subversion/tests/cmdline/merge_tests.py
  (mergeinfo_deleted_by_a_merge_should_disappear): New test for issue #3323.
  (test_list): Add mergeinfo_deleted_by_a_merge_should_disappear.

------------------------------------------------------------------------
r34548 | julianfoad | 2008-12-03 20:04:00 +0100 (Wed, 03 Dec 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1/6: Update tree-conflicts items.
------------------------------------------------------------------------
r34549 | ghudson | 2008-12-03 21:14:09 +0100 (Wed, 03 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Vote to backport r33866 to 1.5.x.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34551 | stsp | 2008-12-04 00:19:38 +0100 (Thu, 04 Dec 2008) | 3 lines
Changed paths:
   M /trunk/www/getting.html

* www/getting.html
 (binary-packages): Fix link to OpenBSD port.

------------------------------------------------------------------------
r34552 | stsp | 2008-12-04 00:22:16 +0100 (Thu, 04 Dec 2008) | 3 lines
Changed paths:
   M /trunk/www/getting.html

* www/getting.html
  (binary-packages): Fix another link to the OpenBSD port.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34556 | pburba | 2008-12-04 17:55:24 +0100 (Thu, 04 Dec 2008) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/mergeinfo.h

Document some restrictions on the paths in various merge related structures.

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): 'target' member.
  (notification_receiver_baton_t): 'merged_paths', 'skipped_paths', and
  'added_paths' members.
* subversion/libsvn_client/mergeinfo.h
  (svn_client__merge_path_t): 'path' member.
  Note that all of the above paths are either absoulte or relative to the
  current working directory.

------------------------------------------------------------------------
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
<http://svn.haxx.se/dev/archive-2008-12/0137.shtml>.

Found by: Marc Haesen <Marc.Haesen@oneaccess-net.com>

* 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.

------------------------------------------------------------------------
r34560 | pburba | 2008-12-04 19:38:22 +0100 (Thu, 04 Dec 2008) | 14 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Add a test for 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 <eichin@gmail.com>

* subversion/tests/cmdline/merge_tests.py
  (merge_away_subtrees_noninheritable_ranges): Expand this existing
  test, which already deals with non-inheritable mergeinfo, to cover this
  new bug.
  (test_list): Mark merge_away_subtrees_noninheritable_ranges as XFail.

------------------------------------------------------------------------
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 <eichin@gmail.com>

* 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.

------------------------------------------------------------------------
r34563 | pburba | 2008-12-04 20:59:21 +0100 (Thu, 04 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34560 and r34562.
------------------------------------------------------------------------
r34564 | julianfoad | 2008-12-04 22:14:53 +0100 (Thu, 04 Dec 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c

Remove a tiny bit of redundant code.

* subversion/libsvn_wc/update_editor.c
  (do_entry_deletion): Don't handle a tree conflict at the end of the
    function, as that case is handled earlier. Also move a variable into a
    more local scope.

------------------------------------------------------------------------
r34565 | danielsh | 2008-12-04 22:16:56 +0100 (Thu, 04 Dec 2008) | 1 line
Changed paths:
   A /branches/1.5.x-r34050-followups (from /branches/1.5.x:34564)

Create backport branch 1.5.x-r34050-followups.
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r34568 | mf | 2008-12-04 22:31:38 +0100 (Thu, 04 Dec 2008) | 2 lines
Changed paths:
   M /trunk/contrib/server-side/svnmirror-test.sh

* contrib/server-side/svnmirror-test.sh: Add license and small description.

------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r34573 | julianfoad | 2008-12-05 13:20:16 +0100 (Fri, 05 Dec 2008) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c

Remove a tiny bit of redundant code and questioning comments.

* subversion/libsvn_wc/update_editor.c
  (do_entry_deletion): Remove a conditional evaluation that was introduced
    correctly in r6748 and not optimised out when it could have been in r16933.
    See the email thread <http://svn.haxx.se/dev/archive-2008-10/1079.shtml>.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34576 | hwright | 2008-12-05 15:24:11 +0100 (Fri, 05 Dec 2008) | 3 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6:
  Remove a completed item.

------------------------------------------------------------------------
r34577 | danielsh | 2008-12-05 17:48:23 +0100 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate 1.5.x-r34050-followups branch.
------------------------------------------------------------------------
r34578 | pburba | 2008-12-05 17:59:56 +0100 (Fri, 05 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r33775, r33782, r33786, r33788, and r33974.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34583 | pburba | 2008-12-05 19:54:43 +0100 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   A /branches/1.5.x-34184 (from /branches/1.5.x:34582)

Create a 1.5.x backport branch for r34184
------------------------------------------------------------------------
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 <ken.macinnis@gmail.com>

------------------------------------------------------------------------
r34585 | pburba | 2008-12-05 20:07:55 +0100 (Fri, 05 Dec 2008) | 7 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/update_tests.py

Follow-up to r34184, correct the expectations of an XFailing test.

* subversion/tests/cmdline/update_tests.py
  (update_wc_with_replaced_file): Don't expect WC-to-WC copy to create
  explicit mergeinfo on the destination when none exists on the source.
  This test still fails for reasons unrelated to the copy's mergeinfo.

------------------------------------------------------------------------
r34586 | pburba | 2008-12-05 20:15:50 +0100 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x-34184
   M /branches/1.5.x-34184/CHANGES
   M /branches/1.5.x-34184/COMMITTERS
   M /branches/1.5.x-34184/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x-34184/subversion/bindings/swig
   M /branches/1.5.x-34184/subversion/libsvn_client/copy.c
   M /branches/1.5.x-34184/subversion/libsvn_client/merge.c
   M /branches/1.5.x-34184/subversion/tests/cmdline/copy_tests.py
   M /branches/1.5.x-34184/subversion/tests/cmdline/merge_tests.py
   M /branches/1.5.x-34184/subversion/tests/cmdline/revert_tests.py
   M /branches/1.5.x-34184/subversion/tests/cmdline/update_tests.py
   M /branches/1.5.x-34184/www/images/subversion-diagram.png
   M /branches/1.5.x-34184/www/images/subversion_logo-200x173.png
   M /branches/1.5.x-34184/www/images/subversion_logo-384x332.png
   M /branches/1.5.x-34184/www/images/subversion_logo_hor-468x64.png

On the 1.5.x-34184 branch: Merge 34184 from trunk.
------------------------------------------------------------------------
r34587 | pburba | 2008-12-05 20:18:14 +0100 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x-34184
   M /branches/1.5.x-34184/CHANGES
   M /branches/1.5.x-34184/COMMITTERS
   M /branches/1.5.x-34184/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x-34184/subversion/bindings/swig
   M /branches/1.5.x-34184/subversion/libsvn_client/merge.c
   M /branches/1.5.x-34184/subversion/tests/cmdline/update_tests.py
   M /branches/1.5.x-34184/www/images/subversion-diagram.png
   M /branches/1.5.x-34184/www/images/subversion_logo-200x173.png
   M /branches/1.5.x-34184/www/images/subversion_logo-384x332.png
   M /branches/1.5.x-34184/www/images/subversion_logo_hor-468x64.png

On the 1.5.x-34184 branch: Merge 34585 from trunk.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34589 | sussman | 2008-12-05 20:48:13 +0100 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/CHANGES
   M /branches/http-protocol-v2/TODO-1.6
   M /branches/http-protocol-v2/build/ac-macros/swig.m4
   M /branches/http-protocol-v2/build/generator/ezt.py
   M /branches/http-protocol-v2/build/generator/gen_base.py
   M /branches/http-protocol-v2/build/generator/gen_vcnet_vcproj.py
   M /branches/http-protocol-v2/build/generator/gen_win.py
   M /branches/http-protocol-v2/build/win32/make_dist.py
   M /branches/http-protocol-v2/build.conf
   M /branches/http-protocol-v2/contrib/client-side/emacs/dsvn.el
   M /branches/http-protocol-v2/contrib/client-side/emacs/psvn.el
   M /branches/http-protocol-v2/contrib/hook-scripts/enforcer/enforcer
   M /branches/http-protocol-v2/contrib/server-side/svnmirror-test.sh
   M /branches/http-protocol-v2/gen-make.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/examples/log.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/ra.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/trac/test.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/wc.py
   M /branches/http-protocol-v2/subversion/include/svn_auth.h
   M /branches/http-protocol-v2/subversion/include/svn_client.h
   M /branches/http-protocol-v2/subversion/include/svn_fs.h
   M /branches/http-protocol-v2/subversion/include/svn_mergeinfo.h
   M /branches/http-protocol-v2/subversion/include/svn_repos.h
   M /branches/http-protocol-v2/subversion/include/svn_subst.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_client/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_client/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_client/mergeinfo.h
   M /branches/http-protocol-v2/subversion/libsvn_fs/fs-loader.c
   M /branches/http-protocol-v2/subversion/libsvn_fs/fs-loader.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/env.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/tree.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/skel.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/caching.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/dag.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/structure
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/commit.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/util.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/fs-wrap.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/auth.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/cmdline.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/update_editor.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/util.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc.h
   M /branches/http-protocol-v2/subversion/mod_dav_svn/mirror.c
   M /branches/http-protocol-v2/subversion/po/pl.po
   M /branches/http-protocol-v2/subversion/po/zh_CN.po
   M /branches/http-protocol-v2/subversion/svn/cl.h
   M /branches/http-protocol-v2/subversion/svn/diff-cmd.c
   M /branches/http-protocol-v2/subversion/svn/info-cmd.c
   M /branches/http-protocol-v2/subversion/svn/list-cmd.c
   M /branches/http-protocol-v2/subversion/svn/main.c
   M /branches/http-protocol-v2/subversion/svn/tree-conflicts.c
   M /branches/http-protocol-v2/subversion/svn/util.c
   M /branches/http-protocol-v2/subversion/svnadmin/main.c
   M /branches/http-protocol-v2/subversion/tests/cmdline/commit_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/depth_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/externals_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/info_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/merge_authz_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/merge_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/stat_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/actions.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/switch_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/update_tests.py
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs/fs-test.c
   A /branches/http-protocol-v2/subversion/tests/libsvn_fs_fs (from /trunk/subversion/tests/libsvn_fs_fs:34584)
   R /branches/http-protocol-v2/subversion/tests/libsvn_fs_fs/fs-pack-test.c (from /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c:34584)
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/auth-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/http-protocol-v2/subversion/tests/svn_test_fs.c
   M /branches/http-protocol-v2/tools/bdb/svn-bdb-view.py
   M /branches/http-protocol-v2/tools/dev/contribulyze.py
   M /branches/http-protocol-v2/tools/dev/gen-javahl-errors.py
   M /branches/http-protocol-v2/tools/dev/graph-dav-servers.py
   M /branches/http-protocol-v2/tools/dev/normalize-dump.py
   M /branches/http-protocol-v2/tools/dev/po-merge.py
   M /branches/http-protocol-v2/tools/dev/trails.py
   M /branches/http-protocol-v2/tools/dev/which-error.py
   M /branches/http-protocol-v2/tools/examples/svnshell.py
   M /branches/http-protocol-v2/tools/hook-scripts/mailer/mailer.py
   M /branches/http-protocol-v2/tools/hook-scripts/svnperms.py
   M /branches/http-protocol-v2/www/getting.html
   M /branches/http-protocol-v2/www/images/svn-dav-securityspace-survey.png
   M /branches/http-protocol-v2/www/links.html
   M /branches/http-protocol-v2/www/svn-dav-securityspace-survey.html
   M /branches/http-protocol-v2/www/svn_1.6_releasenotes.html

A periodic 'svn merge ^/trunk' to this feature branch.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34591 | pburba | 2008-12-05 20:53:52 +0100 (Fri, 05 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34184 and r34585.
------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34593 | arfrever | 2008-12-05 21:41:02 +0100 (Fri, 05 Dec 2008) | 3 lines
Changed paths:
   M /branches/svnpatch-diff
   M /branches/svnpatch-diff/INSTALL
   M /branches/svnpatch-diff/TODO-1.6
   M /branches/svnpatch-diff/build/generator/gen_win.py
   M /branches/svnpatch-diff/build/run_tests.py
   M /branches/svnpatch-diff/notes/dump-load-format.txt
   M /branches/svnpatch-diff/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/svnpatch-diff/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/ra.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/trac/test.py
   M /branches/svnpatch-diff/subversion/include/private/svn_mergeinfo_private.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_config.h
   M /branches/svnpatch-diff/subversion/include/svn_error.h
   M /branches/svnpatch-diff/subversion/include/svn_repos.h
   M /branches/svnpatch-diff/subversion/include/svn_wc.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/merge.c
   M /branches/svnpatch-diff/subversion/libsvn_delta/compose_delta.c
   M /branches/svnpatch-diff/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/svnpatch-diff/subversion/libsvn_fs/fs-loader.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/tree.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/skel.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/dag.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/tree.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/commit.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/locks.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/merge.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/xml.c
   M /branches/svnpatch-diff/subversion/libsvn_repos/dump.c
   M /branches/svnpatch-diff/subversion/libsvn_repos/reporter.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/auth.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/dirent_uri.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/error.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/genctype.py
   M /branches/svnpatch-diff/subversion/libsvn_subr/mergeinfo.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/path.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/sqlite.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/utf.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/adm_files.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/adm_files.h
   M /branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.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/log.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/status.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/tree_conflicts.c
   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_db.c
   M /branches/svnpatch-diff/subversion/mod_dav_svn/util.c
   M /branches/svnpatch-diff/subversion/po/pl.po
   M /branches/svnpatch-diff/subversion/svn/info-cmd.c
   M /branches/svnpatch-diff/subversion/svn/main.c
   M /branches/svnpatch-diff/subversion/svn/schema/info.rnc
   M /branches/svnpatch-diff/subversion/svn/status.c
   M /branches/svnpatch-diff/subversion/svn/tree-conflicts.c
   M /branches/svnpatch-diff/subversion/svn/tree-conflicts.h
   M /branches/svnpatch-diff/subversion/tests/cmdline/blame_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/changelist_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/depth_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/info_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/log_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/merge_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/svnlook_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/main.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/wc.py
   M /branches/svnpatch-diff/subversion/tests/libsvn_repos/repos-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/auth-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/svnpatch-diff/tools/backup/hot-backup.py.in
   M /branches/svnpatch-diff/tools/dev/iz/find-fix.py
   M /branches/svnpatch-diff/tools/dev/trails.py
   M /branches/svnpatch-diff/tools/examples/blame.py
   M /branches/svnpatch-diff/tools/examples/svnshell.py
   M /branches/svnpatch-diff/tools/hook-scripts/mailer/mailer.py
   M /branches/svnpatch-diff/tools/hook-scripts/svn2feed.py
   M /branches/svnpatch-diff/tools/server-side/fsfs-reshard.py
   M /branches/svnpatch-diff/win-tests.py
   M /branches/svnpatch-diff/www/links.html
   M /branches/svnpatch-diff/www/toctool.py

On the 'svnpatch-diff' branch:
Merge r34300:34400 from trunk.

------------------------------------------------------------------------
r34594 | hwright | 2008-12-05 22:00:17 +0100 (Fri, 05 Dec 2008) | 3 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6:
  Remove another completed item.

------------------------------------------------------------------------
r34595 | arfrever | 2008-12-05 22:28:18 +0100 (Fri, 05 Dec 2008) | 3 lines
Changed paths:
   M /branches/svnpatch-diff
   M /branches/svnpatch-diff/CHANGES
   M /branches/svnpatch-diff/TODO-1.6
   M /branches/svnpatch-diff/build/ac-macros/swig.m4
   M /branches/svnpatch-diff/build/generator/ezt.py
   M /branches/svnpatch-diff/build/generator/gen_base.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/win32/make_dist.py
   M /branches/svnpatch-diff/build.conf
   M /branches/svnpatch-diff/contrib/client-side/emacs/dsvn.el
   M /branches/svnpatch-diff/contrib/client-side/emacs/psvn.el
   M /branches/svnpatch-diff/contrib/hook-scripts/enforcer/enforcer
   M /branches/svnpatch-diff/contrib/server-side/svnmirror-test.sh
   M /branches/svnpatch-diff/gen-make.py
   M /branches/svnpatch-diff/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/svnpatch-diff/subversion/bindings/ctypes-python/examples/log.py
   M /branches/svnpatch-diff/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/ra.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/trac/test.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/wc.py
   M /branches/svnpatch-diff/subversion/include/svn_auth.h
   M /branches/svnpatch-diff/subversion/include/svn_client.h
   M /branches/svnpatch-diff/subversion/include/svn_fs.h
   M /branches/svnpatch-diff/subversion/include/svn_mergeinfo.h
   M /branches/svnpatch-diff/subversion/include/svn_repos.h
   M /branches/svnpatch-diff/subversion/include/svn_subst.h
   M /branches/svnpatch-diff/subversion/include/svn_wc.h
   M /branches/svnpatch-diff/subversion/libsvn_client/deprecated.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_fs/fs-loader.c
   M /branches/svnpatch-diff/subversion/libsvn_fs/fs-loader.h
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/env.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/fs.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/tree.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/skel.h
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/caching.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs.c
   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/structure
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/commit.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/util.c
   M /branches/svnpatch-diff/subversion/libsvn_repos/fs-wrap.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/auth.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/cmdline.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/mergeinfo.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/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/mod_dav_svn/mirror.c
   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/diff-cmd.c
   M /branches/svnpatch-diff/subversion/svn/info-cmd.c
   M /branches/svnpatch-diff/subversion/svn/list-cmd.c
   M /branches/svnpatch-diff/subversion/svn/main.c
   M /branches/svnpatch-diff/subversion/svn/tree-conflicts.c
   M /branches/svnpatch-diff/subversion/svn/util.c
   M /branches/svnpatch-diff/subversion/svnadmin/main.c
   M /branches/svnpatch-diff/subversion/tests/cmdline/commit_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/depth_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/externals_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/info_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/stat_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/switch_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/update_tests.py
   M /branches/svnpatch-diff/subversion/tests/libsvn_fs/fs-test.c
   A /branches/svnpatch-diff/subversion/tests/libsvn_fs_fs (from /trunk/subversion/tests/libsvn_fs_fs:34593)
   R /branches/svnpatch-diff/subversion/tests/libsvn_fs_fs/fs-pack-test.c (from /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c:34593)
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/auth-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/svnpatch-diff/subversion/tests/svn_test_fs.c
   M /branches/svnpatch-diff/tools/bdb/svn-bdb-view.py
   M /branches/svnpatch-diff/tools/dev/contribulyze.py
   M /branches/svnpatch-diff/tools/dev/gen-javahl-errors.py
   M /branches/svnpatch-diff/tools/dev/graph-dav-servers.py
   M /branches/svnpatch-diff/tools/dev/normalize-dump.py
   M /branches/svnpatch-diff/tools/dev/po-merge.py
   M /branches/svnpatch-diff/tools/dev/trails.py
   M /branches/svnpatch-diff/tools/dev/which-error.py
   M /branches/svnpatch-diff/tools/examples/svnshell.py
   M /branches/svnpatch-diff/tools/hook-scripts/mailer/mailer.py
   M /branches/svnpatch-diff/tools/hook-scripts/svnperms.py
   M /branches/svnpatch-diff/www/getting.html
   M /branches/svnpatch-diff/www/images/svn-dav-securityspace-survey.png
   M /branches/svnpatch-diff/www/links.html
   M /branches/svnpatch-diff/www/mailing-lists.html
   M /branches/svnpatch-diff/www/svn-dav-securityspace-survey.html
   M /branches/svnpatch-diff/www/svn_1.6_releasenotes.html

On the 'svnpatch-diff' branch:
Merge r34400:34594 from trunk.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34597 | arfrever | 2008-12-05 23:24:33 +0100 (Fri, 05 Dec 2008) | 4 lines
Changed paths:
   M /trunk/subversion/bindings/ctypes-python/setup.py

* subversion/bindings/ctypes-python/setup.py
  (build.get_apr_config): Rename to ...
  (build.get_build_config): ... this.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34606 | arfrever | 2008-12-08 06:24:05 +0100 (Mon, 08 Dec 2008) | 3 lines
Changed paths:
   M /trunk/COMMITTERS

* COMMITTERS
  (firemeteor, holden, sage): Update areas of commit access.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34608 | julianfoad | 2008-12-08 17:16:36 +0100 (Mon, 08 Dec 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Move one item. Add an issue number to another.
------------------------------------------------------------------------
r34609 | cmpilato | 2008-12-08 19:16:11 +0100 (Mon, 08 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Add votes (approving some changes).
------------------------------------------------------------------------
r34610 | hwright | 2008-12-08 20:22:29 +0100 (Mon, 08 Dec 2008) | 13 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/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_ra_svn/cyrus_auth.c
   M /branches/1.5.x/subversion/libsvn_ra_svn/internal_auth.c
   M /branches/1.5.x/subversion/libsvn_ra_svn/ra_svn.h
   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 r33866 from trunk:

 * r33866
   Make ra_svn's Cyrus auth implementation (like the internal auth
   implementation) always prefer EXTERNAL to ANONYMOUS.  This prevents
   a weird regression vs 1.4 where svn+ssh:// would be treated as
   anonymous in some cases.
   Justification:
     Regression against 1.4 which can prevent users from even checking
     out repositories that they could check out with a 1.4 client.
   Votes:
     +1: glasser, ghudson, cmpilato

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34612 | hwright | 2008-12-08 20:26:14 +0100 (Mon, 08 Dec 2008) | 13 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x/subversion/bindings/swig
   M /branches/1.5.x/subversion/include/svn_mergeinfo.h
   M /branches/1.5.x/subversion/libsvn_client/merge.c
   M /branches/1.5.x/subversion/libsvn_subr/mergeinfo.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 r34423 from trunk:

 * r34423
   Fix issue #3312 "Mergeinfo for '...' maps to an empty revision range"
   due to sparse merging.
   Justification:
     Some people do merge into sparse directories or targets with switched
     subtrees; this produces non-inheritable mergeinfo.  This non-inheritable
     mergeinfo can cause an error during merging or log -g.  See issue #3312
     and http://svn.haxx.se/dev/archive-2008-10/1170.shtml.
   Votes:
     +1: pburba, rhuijben, cmpilato

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34614 | hwright | 2008-12-08 20:28:51 +0100 (Mon, 08 Dec 2008) | 2 lines
Changed paths:
   D /branches/1.5.x-r34050-followups

Remove the 1.5.x-r34050-followups branch, merged to 1.5.x in r34613.

------------------------------------------------------------------------
r34615 | hwright | 2008-12-08 20:43:59 +0100 (Mon, 08 Dec 2008) | 3 lines
Changed paths:
   M /trunk/CHANGES

* CHANGES
  (1.5.5): Bring up-to-date with merges to 1.5.x.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34620 | gstein | 2008-12-09 13:58:46 +0100 (Tue, 09 Dec 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

fixed one, noted another

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34625 | pburba | 2008-12-09 17:26:13 +0100 (Tue, 09 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34547, note the dependency of the r33026 group on it.

------------------------------------------------------------------------
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 <mvitorovic@nil.si>

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34639 | julianfoad | 2008-12-10 12:51:08 +0100 (Wed, 10 Dec 2008) | 16 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/entries.h
   M /trunk/subversion/libsvn_wc/update_editor.c

Add comments and questions about WC entries.

* subversion/include/svn_wc.h
  (svn_wc_entry_t): Add a question about the 'copied' field.

* subversion/libsvn_wc/entries.c
  (fold_scheduling): Add detail to doc string as best I can, and add
    questions in internal comments.

* subversion/libsvn_wc/entries.h
  (SVN_WC__ENTRY_MODIFY_FORCE): Write a proper doc string.
  (svn_wc__entry_modify): Add more info to the doc string.

* subversion/libsvn_wc/update_editor.c
  (edit_baton): Add more info to the doc string of a field.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34641 | julianfoad | 2008-12-10 13:11:17 +0100 (Wed, 10 Dec 2008) | 5 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

Add info to a doc string. Thanks to Bert for the info.

* subversion/include/svn_wc.h
  (svn_wc_entry_t): Update doc string for the 'copied' field.

------------------------------------------------------------------------
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.


------------------------------------------------------------------------
r34643 | gstein | 2008-12-10 13:27:36 +0100 (Wed, 10 Dec 2008) | 13 lines
Changed paths:
   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/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

Switch to new names for the skel functions.

* 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/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:
  - change skel function names

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34645 | gstein | 2008-12-10 14:08:47 +0100 (Wed, 10 Dec 2008) | 6 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_fs_base/skel-test.c
   M /trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c

Rename skels functions in the tests

* subversion/tests/libsvn_fs_base/skel-test.c:
* subversion/tests/libsvn_fs_base/strings-reps-test.c:
  - rename skel function calls

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34647 | hwright | 2008-12-10 17:56:20 +0100 (Wed, 10 Dec 2008) | 3 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

Revert r34532.  The old wcprops writing code will disappear eventually, but
for now, it lives to see another day.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34650 | hwright | 2008-12-10 19:04:16 +0100 (Wed, 10 Dec 2008) | 11 lines
Changed paths:
   M /trunk/build.conf
   M /trunk/subversion/tests/libsvn_fs_base
   D /trunk/subversion/tests/libsvn_fs_base/skel-test.c
   M /trunk/subversion/tests/libsvn_subr
   A /trunk/subversion/tests/libsvn_subr/skel-test.c (from /trunk/subversion/tests/libsvn_fs_base/skel-test.c:34647)

Move skel-test from libsvn_fs_base to libsvn_fs_subr, following the move
of the skel serialization code to libsvn_subr in r34638.

* build.conf
  (skel-test): Update locations and description.

* subversion/tests/libsvn_fs_base/skel-test.c:
  Move from here...
* subversion/tests/libsvn_subr/skel-test.c:
  ...to here.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34653 | hwright | 2008-12-10 19:33:20 +0100 (Wed, 10 Dec 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/fs.c

Don't auto-upgrade ancient bdb filesystems to the latest and greatest.  We
stopped autoupgrading in 1.5, so only autoupgrade to 1.4.

Found by: cmpilato

* subversion/libsvn_fs_base/fs.c
  (base_open): Only autoupgrade to format 2.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34655 | hwright | 2008-12-10 19:37:18 +0100 (Wed, 10 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34653, with IRC vote from cmpilato.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34657 | hwright | 2008-12-10 19:45:35 +0100 (Wed, 10 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Add r34656, to r34653 group, with IRC vote from cmpilato.

------------------------------------------------------------------------
r34658 | hwright | 2008-12-10 19:47:03 +0100 (Wed, 10 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.4.x/STATUS

* STATUS: Nominate r34653, r34656, with IRC votes from cmpilato.

------------------------------------------------------------------------
r34659 | julianfoad | 2008-12-10 20:20:35 +0100 (Wed, 10 Dec 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add to-do items about test failures.
------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34662 | hwright | 2008-12-11 01:07:08 +0100 (Thu, 11 Dec 2008) | 3 lines
Changed paths:
   M /trunk/notes/wc-ng-design

* notes/wc-ng-design
  (Implementation Plan): New section.

------------------------------------------------------------------------
r34663 | neels | 2008-12-11 03:50:34 +0100 (Thu, 11 Dec 2008) | 4 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_is_wc_root): Add a detail to the function comment.


------------------------------------------------------------------------
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.


------------------------------------------------------------------------
r34665 | neels | 2008-12-11 06:33:49 +0100 (Thu, 11 Dec 2008) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_client/commit_util.c

* subversion/libsvn_client/commit_util.c
  (bail_on_tree_conflicted_children): Clarify comment.


------------------------------------------------------------------------
r34666 | zhakov | 2008-12-11 13:24:22 +0100 (Thu, 11 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r34184 and r34585, approving.
------------------------------------------------------------------------
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 *'.

------------------------------------------------------------------------
r34668 | hwright | 2008-12-11 16:14:25 +0100 (Thu, 11 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/libsvn_client/copy.c
   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/copy_tests.py
   M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py
   M /branches/1.5.x/subversion/tests/cmdline/revert_tests.py
   M /branches/1.5.x/subversion/tests/cmdline/svntest/actions.py
   M /branches/1.5.x/subversion/tests/cmdline/update_tests.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 r34184, r34585 from the 1.5.x-34184 branch:

 * r34184, r34585
   Don't create explicit mergeinfo on a WC-to-WC move/copy destination
   unless the source already had some.
   Notes:
     r34184 is the main fix, r34585 is a minor follow-up that tweaks a
     test that is failing on trunk for unlreated reasons, but not on
     1.5.x.  There were some minor conflicts on libsvn_client\copy.c,
     copy_tests.py, and merge_tests.py.  Mostly due to whitespace differences
     and some changes to the tests that have not been backported yet.
     A backport branch can be found at:
     http://svn.collab.net/repos/svn/branches/1.5.x-34184
   Justification:
     WC-to-WC copy/move's creation of explicit, usually empty, mergeinfo on
     the destination path isn't technically a bug, but it is arguably the
     primary cause of excessive subtree mergeinfo, which has caused a lot of
     user frustration and confusion, makes merges slower, and has been a
     factor in a number of serious bugs (see issue #3067 for example).
     See this thread for more:
     subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=98145.
   Votes:
     +1: pburba, cmpilato, zhakov

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34670 | pburba | 2008-12-11 16:41:20 +0100 (Thu, 11 Dec 2008) | 2 lines
Changed paths:
   A /branches/1.5.x-34432 (from /branches/1.5.x:34669)

Create a 1.5.x backport branch for r34432

------------------------------------------------------------------------
r34671 | hwright | 2008-12-11 16:44:18 +0100 (Thu, 11 Dec 2008) | 2 lines
Changed paths:
   D /branches/1.5.x-34184

Remove the 1.5.x-34184 branch, merged to 1.5.x in r34668.

------------------------------------------------------------------------
r34672 | hwright | 2008-12-11 16:54:07 +0100 (Thu, 11 Dec 2008) | 3 lines
Changed paths:
   M /branches/ignore-mergeinfo
   M /branches/ignore-mergeinfo/CHANGES
   M /branches/ignore-mergeinfo/COMMITTERS
   M /branches/ignore-mergeinfo/INSTALL
   M /branches/ignore-mergeinfo/Makefile.in
   M /branches/ignore-mergeinfo/TODO-1.6
   M /branches/ignore-mergeinfo/build/ac-macros/swig.m4
   M /branches/ignore-mergeinfo/build/generator/ezt.py
   M /branches/ignore-mergeinfo/build/generator/gen_base.py
   M /branches/ignore-mergeinfo/build/generator/gen_make.py
   M /branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py
   M /branches/ignore-mergeinfo/build/generator/gen_win.py
   M /branches/ignore-mergeinfo/build/run_tests.py
   M /branches/ignore-mergeinfo/build/win32/make_dist.py
   M /branches/ignore-mergeinfo/build.conf
   M /branches/ignore-mergeinfo/configure.ac
   M /branches/ignore-mergeinfo/contrib/client-side/emacs/dsvn.el
   M /branches/ignore-mergeinfo/contrib/client-side/emacs/psvn.el
   M /branches/ignore-mergeinfo/contrib/client-side/svnmucc/svnmucc-test.py
   M /branches/ignore-mergeinfo/contrib/client-side/svnmucc/svnmucc.c
   M /branches/ignore-mergeinfo/contrib/hook-scripts/commit-email.pl.in
   M /branches/ignore-mergeinfo/contrib/hook-scripts/enforcer/enforcer
   M /branches/ignore-mergeinfo/contrib/server-side/svnmirror-test.sh
   M /branches/ignore-mergeinfo/gen-make.py
   M /branches/ignore-mergeinfo/notes/dump-load-format.txt
   M /branches/ignore-mergeinfo/notes/http-protocol-v2.txt
   M /branches/ignore-mergeinfo/notes/tree-conflicts/design-overview.txt
   A /branches/ignore-mergeinfo/notes/tree-conflicts/use-cases-resolution.txt (from /trunk/notes/tree-conflicts/use-cases-resolution.txt:34671)
   M /branches/ignore-mergeinfo/notes/wc-ng-design
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/log.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/setup.py
   M /branches/ignore-mergeinfo/subversion/bindings/ctypes-python/test/wc.py
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/ignore-mergeinfo/subversion/bindings/swig/core.i
   M /branches/ignore-mergeinfo/subversion/bindings/swig/include/svn_global.swg
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/libsvn_swig_py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/auth.py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/client.py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/ra.py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/trac/test.py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/wc.py
   M /branches/ignore-mergeinfo/subversion/bindings/swig/svn_client.i
   M /branches/ignore-mergeinfo/subversion/include/private/svn_auth_private.h
   M /branches/ignore-mergeinfo/subversion/include/private/svn_fs_util.h
   M /branches/ignore-mergeinfo/subversion/include/private/svn_mergeinfo_private.h
   A /branches/ignore-mergeinfo/subversion/include/private/svn_skel.h (from /trunk/subversion/include/private/svn_skel.h:34671)
   M /branches/ignore-mergeinfo/subversion/include/private/svn_sqlite.h
   M /branches/ignore-mergeinfo/subversion/include/private/svn_wc_private.h
   M /branches/ignore-mergeinfo/subversion/include/svn_auth.h
   M /branches/ignore-mergeinfo/subversion/include/svn_checksum.h
   M /branches/ignore-mergeinfo/subversion/include/svn_client.h
   M /branches/ignore-mergeinfo/subversion/include/svn_config.h
   M /branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h
   M /branches/ignore-mergeinfo/subversion/include/svn_error.h
   M /branches/ignore-mergeinfo/subversion/include/svn_fs.h
   M /branches/ignore-mergeinfo/subversion/include/svn_io.h
   M /branches/ignore-mergeinfo/subversion/include/svn_mergeinfo.h
   M /branches/ignore-mergeinfo/subversion/include/svn_opt.h
   M /branches/ignore-mergeinfo/subversion/include/svn_ra.h
   M /branches/ignore-mergeinfo/subversion/include/svn_repos.h
   M /branches/ignore-mergeinfo/subversion/include/svn_string.h
   M /branches/ignore-mergeinfo/subversion/include/svn_subst.h
   M /branches/ignore-mergeinfo/subversion/include/svn_wc.h
   M /branches/ignore-mergeinfo/subversion/include/svn_xml.h
   M /branches/ignore-mergeinfo/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/ignore-mergeinfo/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/ignore-mergeinfo/subversion/libsvn_client/blame.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/client.h
   M /branches/ignore-mergeinfo/subversion/libsvn_client/commit.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/commit_util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/copy.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/deprecated.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/diff.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/export.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/externals.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/info.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/merge.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/mergeinfo.h
   M /branches/ignore-mergeinfo/subversion/libsvn_client/ra.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/repos_diff.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/resolved.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/status.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/switch.c
   M /branches/ignore-mergeinfo/subversion/libsvn_client/update.c
   M /branches/ignore-mergeinfo/subversion/libsvn_delta/compose_delta.c
   M /branches/ignore-mergeinfo/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/ignore-mergeinfo/subversion/libsvn_diff/diff_file.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/copies-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/locks-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/nodes-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/rev-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/dag.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/fs.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/key-gen.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/key-gen.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/tree.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_base/util/fs_skels.h
   D /branches/ignore-mergeinfo/subversion/libsvn_fs_base/util/skel.c
   D /branches/ignore-mergeinfo/subversion/libsvn_fs_base/util/skel.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/caching.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/dag.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/dag.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/structure
   M /branches/ignore-mergeinfo/subversion/libsvn_fs_fs/tree.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/commit.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/fetch.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/session.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_neon/util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/commit.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/locks.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/merge.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/serf.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/update.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_serf/xml.c
   M /branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/fs-wrap.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/hooks.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/reporter.c
   M /branches/ignore-mergeinfo/subversion/libsvn_repos/repos.h
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/auth.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/checksum.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/cmdline.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/config_file.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/error.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/genctype.py
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/io.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/mergeinfo.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/path.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/pool.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/simple_providers.c
   A /branches/ignore-mergeinfo/subversion/libsvn_subr/skel.c (from /trunk/subversion/libsvn_subr/skel.c:34671)
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/sqlite.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/ssl_client_cert_providers.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/stream.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/subst.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/svn_string.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/time.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/utf.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/win32_crypto.c
   M /branches/ignore-mergeinfo/subversion/libsvn_subr/xml.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/README
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_crawler.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_files.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/adm_ops.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/ambient_depth_filter_editor.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/copy.c
   A /branches/ignore-mergeinfo/subversion/libsvn_wc/crop.c (from /trunk/subversion/libsvn_wc/crop.c:34671)
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/deprecated.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/diff.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/entries.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/entries.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/lock.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/lock.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/log.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/log.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/merge.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/props.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/questions.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/relocate.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/status.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/translate.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/tree_conflicts.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/update_editor.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/util.c
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/wc.h
   M /branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db.c
   M /branches/ignore-mergeinfo/subversion/mod_dav_svn/activity.c
   M /branches/ignore-mergeinfo/subversion/mod_dav_svn/mirror.c
   M /branches/ignore-mergeinfo/subversion/mod_dav_svn/repos.c
   M /branches/ignore-mergeinfo/subversion/mod_dav_svn/util.c
   M /branches/ignore-mergeinfo/subversion/po/fr.po
   M /branches/ignore-mergeinfo/subversion/po/ko.po
   M /branches/ignore-mergeinfo/subversion/po/pl.po
   M /branches/ignore-mergeinfo/subversion/po/zh_CN.po
   M /branches/ignore-mergeinfo/subversion/svn/cl.h
   M /branches/ignore-mergeinfo/subversion/svn/diff-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/info-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/list-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/log-cmd.c
   M /branches/ignore-mergeinfo/subversion/svn/main.c
   M /branches/ignore-mergeinfo/subversion/svn/notify.c
   M /branches/ignore-mergeinfo/subversion/svn/schema/info.rnc
   M /branches/ignore-mergeinfo/subversion/svn/status.c
   M /branches/ignore-mergeinfo/subversion/svn/tree-conflicts.c
   M /branches/ignore-mergeinfo/subversion/svn/tree-conflicts.h
   M /branches/ignore-mergeinfo/subversion/svn/util.c
   M /branches/ignore-mergeinfo/subversion/svn_private_config.hw
   M /branches/ignore-mergeinfo/subversion/svnadmin/main.c
   M /branches/ignore-mergeinfo/subversion/svndumpfilter/main.c
   M /branches/ignore-mergeinfo/subversion/svnlook/main.c
   M /branches/ignore-mergeinfo/subversion/svnsync/main.c
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/blame_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/changelist_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/commit_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/copy_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/depth_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/externals_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/info_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/log_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/merge_authz_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/merge_tests.py
   A /branches/ignore-mergeinfo/subversion/tests/cmdline/resolved_tests.py (from /trunk/subversion/tests/cmdline/resolved_tests.py:34671)
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/revert_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/stat_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnlook_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/actions.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/main.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/tree.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/wc.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/switch_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/cmdline/update_tests.py
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_fs/fs-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_fs_base
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_fs_base/changes-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_fs_base/fs-base-test.c
   D /branches/ignore-mergeinfo/subversion/tests/libsvn_fs_base/skel-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_fs_base/strings-reps-test.c
   A /branches/ignore-mergeinfo/subversion/tests/libsvn_fs_fs (from /trunk/subversion/tests/libsvn_fs_fs:34671)
   R /branches/ignore-mergeinfo/subversion/tests/libsvn_fs_fs/fs-pack-test.c (from /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c:34671)
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_repos/repos-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr
   A /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/auth-test.c (from /trunk/subversion/tests/libsvn_subr/auth-test.c:34671)
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c
   A /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/skel-test.c (from /trunk/subversion/tests/libsvn_subr/skel-test.c:34671)
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_subr/translate-test.c
   M /branches/ignore-mergeinfo/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/ignore-mergeinfo/subversion/tests/svn_test.h
   M /branches/ignore-mergeinfo/subversion/tests/svn_test_fs.c
   M /branches/ignore-mergeinfo/subversion/tests/svn_test_fs.h
   M /branches/ignore-mergeinfo/subversion/tests/svn_test_main.c
   M /branches/ignore-mergeinfo/tools/backup/hot-backup.py.in
   M /branches/ignore-mergeinfo/tools/bdb/svn-bdb-view.py
   M /branches/ignore-mergeinfo/tools/dev/contribulyze.py
   M /branches/ignore-mergeinfo/tools/dev/gen-javahl-errors.py
   M /branches/ignore-mergeinfo/tools/dev/graph-dav-servers.py
   M /branches/ignore-mergeinfo/tools/dev/iz/find-fix.py
   M /branches/ignore-mergeinfo/tools/dev/normalize-dump.py
   M /branches/ignore-mergeinfo/tools/dev/po-merge.py
   M /branches/ignore-mergeinfo/tools/dev/trails.py
   M /branches/ignore-mergeinfo/tools/dev/which-error.py
   M /branches/ignore-mergeinfo/tools/examples/blame.py
   M /branches/ignore-mergeinfo/tools/examples/svnshell.py
   M /branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py
   M /branches/ignore-mergeinfo/tools/hook-scripts/svn2feed.py
   M /branches/ignore-mergeinfo/tools/hook-scripts/svnperms.py
   M /branches/ignore-mergeinfo/tools/po/po-update.sh
   M /branches/ignore-mergeinfo/tools/server-side/fsfs-reshard.py
   M /branches/ignore-mergeinfo/win-tests.py
   M /branches/ignore-mergeinfo/www/faq.html
   A /branches/ignore-mergeinfo/www/faq.zh.html (from /trunk/www/faq.zh.html:34671)
   M /branches/ignore-mergeinfo/www/getting.html
   M /branches/ignore-mergeinfo/www/hacking.html
   M /branches/ignore-mergeinfo/www/images/svn-dav-securityspace-survey.png
   M /branches/ignore-mergeinfo/www/index.html
   M /branches/ignore-mergeinfo/www/links.html
   M /branches/ignore-mergeinfo/www/mailing-lists.html
   M /branches/ignore-mergeinfo/www/poole-response.html
   M /branches/ignore-mergeinfo/www/svn-dav-securityspace-survey.html
   M /branches/ignore-mergeinfo/www/svn_1.6_releasenotes.html
   M /branches/ignore-mergeinfo/www/toctool.py
   M /branches/ignore-mergeinfo/www/tools_contrib.html
   A /branches/ignore-mergeinfo/www/tools_contrib.zh.html (from /trunk/www/tools_contrib.zh.html:34671)

On the ignore-mergeinfo branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r34674 | pburba | 2008-12-11 17:00:06 +0100 (Thu, 11 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Add r34669 to r34432 group.

------------------------------------------------------------------------
r34675 | kameshj | 2008-12-11 19:03:04 +0100 (Thu, 11 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r34432, r34669 group.

------------------------------------------------------------------------
r34676 | pburba | 2008-12-11 19:45:13 +0100 (Thu, 11 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote and approve r34506.
------------------------------------------------------------------------
r34677 | pburba | 2008-12-11 20:31:00 +0100 (Thu, 11 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote and approve r34653 group.
------------------------------------------------------------------------
r34678 | pburba | 2008-12-11 20:31:07 +0100 (Thu, 11 Dec 2008) | 1 line
Changed paths:
   M /branches/1.4.x/STATUS

* STATUS: Vote and approve r34653 group.
------------------------------------------------------------------------
r34679 | hwright | 2008-12-11 21:19:51 +0100 (Thu, 11 Dec 2008) | 9 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/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_fs_base/tree.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 r34506 from trunk:

 * r34506
   Fix a pair of bugs in the BDB backend's node-origins cache-miss fallback
   logic, one of which can cause a SEGFAULT, the other of which can result
   in an incorrect return value.
   Votes:
     +1: cmpilato, glasser, pburba

------------------------------------------------------------------------
r34680 | hwright | 2008-12-11 21:22:14 +0100 (Thu, 11 Dec 2008) | 9 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/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_fs_base/fs.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 r34653, r34656 from trunk:

 * r34653, r34656
   Don't autoupgrade ancient BDB filesystems to 1.5 or 1.4 format.
   Justification:
     Small fix, but avoids confusing/surprising users.
   Votes:
     +1: hwright, cmpilato, pburba

------------------------------------------------------------------------
r34681 | hwright | 2008-12-11 21:27:17 +0100 (Thu, 11 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: A couple of layout fixes.

------------------------------------------------------------------------
r34682 | hwright | 2008-12-11 21:35:20 +0100 (Thu, 11 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: A couple of layout fixes.

------------------------------------------------------------------------
r34683 | pburba | 2008-12-11 21:46:36 +0100 (Thu, 11 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Add a justification for r34547.
------------------------------------------------------------------------
r34684 | pburba | 2008-12-11 21:48:03 +0100 (Thu, 11 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Follow-up to r34683.  This time I *actually* saved the file
  before committing it. 
------------------------------------------------------------------------
r34685 | julianfoad | 2008-12-12 00:33:05 +0100 (Fri, 12 Dec 2008) | 2 lines
Changed paths:
   M /branches/tc-issue-3334
   M /branches/tc-issue-3334/TODO-1.6
   M /branches/tc-issue-3334/build.conf
   M /branches/tc-issue-3334/contrib/client-side/emacs/psvn.el
   M /branches/tc-issue-3334/notes/wc-ng-design
   A /branches/tc-issue-3334/subversion/include/private/svn_skel.h (from /trunk/subversion/include/private/svn_skel.h:34684)
   M /branches/tc-issue-3334/subversion/include/private/svn_wc_private.h
   M /branches/tc-issue-3334/subversion/include/svn_checksum.h
   M /branches/tc-issue-3334/subversion/include/svn_wc.h
   M /branches/tc-issue-3334/subversion/libsvn_client/commit.c
   M /branches/tc-issue-3334/subversion/libsvn_client/commit_util.c
   M /branches/tc-issue-3334/subversion/libsvn_client/export.c
   M /branches/tc-issue-3334/subversion/libsvn_client/merge.c
   M /branches/tc-issue-3334/subversion/libsvn_client/resolved.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/copies-table.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/locks-table.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/nodes-table.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/rev-table.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/dag.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/fs.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/key-gen.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/key-gen.h
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/util/fs_skels.h
   D /branches/tc-issue-3334/subversion/libsvn_fs_base/util/skel.c
   D /branches/tc-issue-3334/subversion/libsvn_fs_base/util/skel.h
   M /branches/tc-issue-3334/subversion/libsvn_subr/checksum.c
   A /branches/tc-issue-3334/subversion/libsvn_subr/skel.c (from /trunk/subversion/libsvn_subr/skel.c:34684)
   M /branches/tc-issue-3334/subversion/libsvn_wc/adm_ops.c
   M /branches/tc-issue-3334/subversion/libsvn_wc/entries.c
   M /branches/tc-issue-3334/subversion/libsvn_wc/entries.h
   M /branches/tc-issue-3334/subversion/libsvn_wc/props.c
   M /branches/tc-issue-3334/subversion/libsvn_wc/questions.c
   M /branches/tc-issue-3334/subversion/libsvn_wc/update_editor.c
   M /branches/tc-issue-3334/subversion/svnadmin/main.c
   M /branches/tc-issue-3334/subversion/tests/cmdline/merge_tests.py
   M /branches/tc-issue-3334/subversion/tests/cmdline/svntest/wc.py
   M /branches/tc-issue-3334/subversion/tests/libsvn_fs_base
   M /branches/tc-issue-3334/subversion/tests/libsvn_fs_base/changes-test.c
   D /branches/tc-issue-3334/subversion/tests/libsvn_fs_base/skel-test.c
   M /branches/tc-issue-3334/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/tc-issue-3334/subversion/tests/libsvn_subr
   A /branches/tc-issue-3334/subversion/tests/libsvn_subr/skel-test.c (from /trunk/subversion/tests/libsvn_subr/skel-test.c:34684)

On the tc-issue-3334 branch: Merge all changes from trunk up to r34684.

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34690 | gstein | 2008-12-12 08:25:40 +0100 (Fri, 12 Dec 2008) | 16 lines
Changed paths:
   M /trunk/subversion/include/private/svn_skel.h
   M /trunk/subversion/libsvn_fs_base/util/fs_skels.c
   M /trunk/subversion/libsvn_subr/skel.c

Remove the last vestiges of the old names for the skel functions.

Removed some skel functions that nobody ever used.

* subversion/include/private/svn_skel.h:
  (svn_skel__append, svn_skel__atom_matches_string, svn_skel__equal,
    svn_skel__copy): removed
  - removed #defines mapping old names to new

* subversion/libsvn_subr/skel.c:
  (svn_skel__append, svn_skel__atom_matches_string, svn_skel__equal,
    svn_skel__copy): removed

* subversion/libsvn_fs_base/util/fs_skels.c:
  - renamed function calls to new skel names

------------------------------------------------------------------------
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 <alexander@collab.net>

------------------------------------------------------------------------
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 <alexander@collab.net>
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.

------------------------------------------------------------------------
r34697 | julianfoad | 2008-12-12 15:05:56 +0100 (Fri, 12 Dec 2008) | 2 lines
Changed paths:
   M /branches/tc-issue-3334
   M /branches/tc-issue-3334/subversion/include/private/svn_skel.h
   M /branches/tc-issue-3334/subversion/include/svn_auth.h
   M /branches/tc-issue-3334/subversion/include/svn_client.h
   M /branches/tc-issue-3334/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/tc-issue-3334/subversion/libsvn_client/commit_util.c
   M /branches/tc-issue-3334/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/tc-issue-3334/subversion/libsvn_subr/simple_providers.c
   M /branches/tc-issue-3334/subversion/libsvn_subr/skel.c
   M /branches/tc-issue-3334/subversion/libsvn_subr/ssl_client_cert_providers.c
   M /branches/tc-issue-3334/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/tc-issue-3334/subversion/libsvn_subr/username_providers.c
   M /branches/tc-issue-3334/subversion/tests/cmdline/svntest/actions.py
   M /branches/tc-issue-3334/subversion/tests/libsvn_subr/skel-test.c

On the tc-issue-3334 branch: Merge all changes from trunk up to r34695.

------------------------------------------------------------------------
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.


------------------------------------------------------------------------
r34701 | julianfoad | 2008-12-12 20:23:58 +0100 (Fri, 12 Dec 2008) | 1 line
Changed paths:
   D /branches/tc-issue-3334

Remove the tc-issue-3334 branch, merged to trunk in r34700.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34704 | hwright | 2008-12-13 22:51:01 +0100 (Sat, 13 Dec 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc_db.h

* subversion/libsvn_wc/wc_db.h:
  Add a few questions.

------------------------------------------------------------------------
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'.

------------------------------------------------------------------------
r34711 | kameshj | 2008-12-15 16:04:10 +0100 (Mon, 15 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r34547.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34713 | kameshj | 2008-12-15 16:48:41 +0100 (Mon, 15 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r30257, r33024, r33026 group.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34716 | sussman | 2008-12-15 17:00:33 +0100 (Mon, 15 Dec 2008) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/CHANGES
   M /branches/http-protocol-v2/COMMITTERS
   M /branches/http-protocol-v2/Makefile.in
   M /branches/http-protocol-v2/TODO-1.6
   M /branches/http-protocol-v2/build/generator/gen_make.py
   M /branches/http-protocol-v2/build.conf
   M /branches/http-protocol-v2/contrib/client-side/emacs/psvn.el
   M /branches/http-protocol-v2/notes/wc-ng-design
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/setup.py
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/svn/client.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/svn/info.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/svn/ra.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_fs.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_info.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_ra.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_repos.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_wc.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/util.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/windows_util.rb
   A /branches/http-protocol-v2/subversion/include/private/svn_skel.h (from /trunk/subversion/include/private/svn_skel.h:34714)
   M /branches/http-protocol-v2/subversion/include/private/svn_wc_private.h
   M /branches/http-protocol-v2/subversion/include/svn_auth.h
   M /branches/http-protocol-v2/subversion/include/svn_checksum.h
   M /branches/http-protocol-v2/subversion/include/svn_client.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/http-protocol-v2/subversion/libsvn_client/client.h
   M /branches/http-protocol-v2/subversion/libsvn_client/commit.c
   M /branches/http-protocol-v2/subversion/libsvn_client/commit_util.c
   M /branches/http-protocol-v2/subversion/libsvn_client/export.c
   M /branches/http-protocol-v2/subversion/libsvn_client/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_client/resolved.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/copies-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/locks-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/nodes-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/rev-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/dag.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/key-gen.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/key-gen.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/fs_skels.h
   D /branches/http-protocol-v2/subversion/libsvn_fs_base/util/skel.c
   D /branches/http-protocol-v2/subversion/libsvn_fs_base/util/skel.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/structure
   M /branches/http-protocol-v2/subversion/libsvn_subr/checksum.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/simple_providers.c
   A /branches/http-protocol-v2/subversion/libsvn_subr/skel.c (from /trunk/subversion/libsvn_subr/skel.c:34714)
   M /branches/http-protocol-v2/subversion/libsvn_subr/ssl_client_cert_providers.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/username_providers.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_ops.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/entries.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/entries.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/lock.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/lock.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/props.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/questions.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/update_editor.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc_db.h
   M /branches/http-protocol-v2/subversion/po/fr.po
   M /branches/http-protocol-v2/subversion/svnadmin/main.c
   M /branches/http-protocol-v2/subversion/tests/cmdline/commit_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/merge_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/revert_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/stat_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/actions.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/wc.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/switch_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/update_tests.py
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs_base
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs_base/changes-test.c
   D /branches/http-protocol-v2/subversion/tests/libsvn_fs_base/skel-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr
   A /branches/http-protocol-v2/subversion/tests/libsvn_subr/skel-test.c (from /trunk/subversion/tests/libsvn_subr/skel-test.c:34714)
   M /branches/http-protocol-v2/www/links.html
   A /branches/http-protocol-v2/www/links.zh.html (from /trunk/www/links.zh.html:34714)
   M /branches/http-protocol-v2/www/mailing-lists.html
   M /branches/http-protocol-v2/www/svn_1.6_releasenotes.html

Weekly sync with trunk.
------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34721 | julianfoad | 2008-12-15 22:50:55 +0100 (Mon, 15 Dec 2008) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Simplify a tiny bit of logic. No functional change.

* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__noderev_same_rep_key): Simplify.

------------------------------------------------------------------------
r34722 | stylesen | 2008-12-16 12:29:50 +0100 (Tue, 16 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r34385, r34393 group.

------------------------------------------------------------------------
r34723 | kameshj | 2008-12-16 15:06:09 +0100 (Tue, 16 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r34560, r34562 group.

------------------------------------------------------------------------
r34724 | rhuijben | 2008-12-16 15:21:54 +0100 (Tue, 16 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast vote on the r34432 group, approving.
------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34726 | hwright | 2008-12-16 15:31:55 +0100 (Tue, 16 Dec 2008) | 2 lines
Changed paths:
   D /branches/1.5.x-34432

Remove the 1.5.x-34432 branch, merged to 1.5.x in r34725.

------------------------------------------------------------------------
r34727 | cmpilato | 2008-12-16 16:10:14 +0100 (Tue, 16 Dec 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/tree.c

* subversion/libsvn_fs_base/tree.c
  (deltify_mutable): Itty bitty comment tweak.

------------------------------------------------------------------------
r34728 | hwright | 2008-12-16 17:01:44 +0100 (Tue, 16 Dec 2008) | 7 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for the issue #3275 fixes.

While I don't have a proxy server to test this with, and I'm not super-
familiar with the mod_dav_svn code, I think I've given this due diligence.
The logs and diff looked good, and the comments in the issue tracker seemed
to indicate that this is the correct fix.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34730 | cmpilato | 2008-12-16 18:57:20 +0100 (Tue, 16 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Votey.  Approvey.
------------------------------------------------------------------------
r34731 | cmpilato | 2008-12-16 18:59:46 +0100 (Tue, 16 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Mo 'votey.  Mo' approvey.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34733 | cmpilato | 2008-12-16 19:03:59 +0100 (Tue, 16 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Still votin'.  Still approvin'.
------------------------------------------------------------------------
r34734 | hwright | 2008-12-16 19:04:52 +0100 (Tue, 16 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/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 r34385, r34393 from trunk:

 * r34385, r34393
   Fix broken merge when the merge target's natural history includes
   resurrections.
   Notes:
     r34385 is a new test.  r34393 is the fix.
   Justification:
     This problem was encountered 'in the wild' - see
     http://svn.haxx.se/dev/archive-2008-11/0618.shtml.  When encountered
     cherry harvest merges are completely broken.
   Votes:
     +1: pburba, stylesen, cmpilato


------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34736 | rhuijben | 2008-12-16 19:08:46 +0100 (Tue, 16 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast a +0 vote on the issue #3275 group
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34743 | hwright | 2008-12-16 21:07:29 +0100 (Tue, 16 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

*STATUS: Nominate the 1.5.x-build-fixes branch.

------------------------------------------------------------------------
r34744 | stsp | 2008-12-16 21:20:19 +0100 (Tue, 16 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast +0 vote on reintegrate improvements.

------------------------------------------------------------------------
r34745 | hwright | 2008-12-16 21:38:18 +0100 (Tue, 16 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate a fix for merge_tests 106, in followup to the merge in
    r34393.

------------------------------------------------------------------------
r34746 | pburba | 2008-12-16 22:17:02 +0100 (Tue, 16 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for some fixes related to the r34393 fiasco I created.
------------------------------------------------------------------------
r34747 | stsp | 2008-12-16 22:43:51 +0100 (Tue, 16 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for "Remove exit_code on merge_test.py 106", approving.

------------------------------------------------------------------------
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'.

------------------------------------------------------------------------
r34751 | jerenkrantz | 2008-12-17 07:31:48 +0100 (Wed, 17 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote on some backports; still reviewing reintegrate improvements...

------------------------------------------------------------------------
r34752 | jerenkrantz | 2008-12-17 07:43:00 +0100 (Wed, 17 Dec 2008) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c

Minor style cleanups to ease reviewing.

No functional changes.

* subversion/libsvn_client/merge.c
  (ensure_all_missing_ranges_are_phantoms, find_unmerged_merginfo): Clean up
  whitespace and small style issues.

------------------------------------------------------------------------
r34753 | jerenkrantz | 2008-12-17 07:48:13 +0100 (Wed, 17 Dec 2008) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c

One more non-functional whitespace change to ease reviewing.

* subversion/libsvn_client/merge.c
  (find_unmerged_mergeinfo): A space saved is a byte saved!

------------------------------------------------------------------------
r34754 | jerenkrantz | 2008-12-17 07:49:05 +0100 (Wed, 17 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for reintegrate-improvements.  Looks good to me.

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34757 | julianfoad | 2008-12-17 13:33:27 +0100 (Wed, 17 Dec 2008) | 6 lines
Changed paths:
   M /branches/1.5.x/STATUS

On the 1.5.x branch:

* STATUS
  Nominate r30756 - Allow 'svn merge' to merge diffs which add 'svn:eol-style'
  properties to files that used to have inconsistent newlines.

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34761 | julianfoad | 2008-12-17 14:29:22 +0100 (Wed, 17 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Veto 1.5.x-build-fixes.

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34763 | julianfoad | 2008-12-17 15:03:45 +0100 (Wed, 17 Dec 2008) | 7 lines
Changed paths:
   M /branches/1.5.x-build-fixes/subversion/libsvn_subr/mergeinfo.c

On the 1.5.x-build-fixes branch:
Remove functions that were introduced by r34740 and r34741, but not needed.

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo__catalog_to_formatted_string,
   svn_mergeinfo__to_formatted_string): Remove.

------------------------------------------------------------------------
r34764 | julianfoad | 2008-12-17 15:23:10 +0100 (Wed, 17 Dec 2008) | 4 lines
Changed paths:
   M /branches/1.5.x-build-fixes/subversion/libsvn_subr/mergeinfo.c

On the 1.5.x-build-fixes branch:
Revert r34741, as it was only needed to support two functions that were
introduced in r34740 but removed in r34763.

------------------------------------------------------------------------
r34765 | julianfoad | 2008-12-17 16:15:04 +0100 (Wed, 17 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Remove my veto.
------------------------------------------------------------------------
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 <http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985193>.
   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.

------------------------------------------------------------------------
r34770 | hwright | 2008-12-17 17:31:51 +0100 (Wed, 17 Dec 2008) | 23 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/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 r30257, r33024, r33026 from trunk:

 * r30257, r33024, r33026
   Don't try to filter natural history from added mergeinfo during
   reverse merges.
   Notes:
     r30257 is the urelated removal of an unused private struct in merge.c,
     not required but avoids a conflict with r33024.  r33024 is a change to
     include more information in the merge command baton, it results in no
     functional change itself but r33026 relies on this new information.
     There's a single trailing whitespace conflict during merge of r33024.
     r33026 is the core change.  To solve the specific problem noted in
     http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=142777,
     this group relies upon the r34547 group.
   Justification:
     A reverse merge should simply return mergeinfo to a previous
     representation -- see
     http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=142777.
     This change also improves reverse merge performance as it eliminates
     some unnecessary communication with the repository.
   Votes:
     +1: pburba, kameshj, cmpilato

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34772 | hwright | 2008-12-17 17:57:59 +0100 (Wed, 17 Dec 2008) | 13 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/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/mod_dav_svn/mirror.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 r34082, r34096, r34545 from trunk:

 * r34082, r34096, r34545
   Fix issue #3275 by making WebDAV proxy slave servers pass through
   any GET or PROPFIND requests aimed at working resource URLs, even
   though those requests are read-only.  Why?  It does no good for the
   slave server to try to answer a read request aimed at an
   uncommitted transaction when said transaction's data lives solely
   on the master server.
   Votes:
     +1: cmpilato, hwright, jerenkrantz
     +0: rhuijben (Looks OK, does no harm. No time to setup test environment)

------------------------------------------------------------------------
r34773 | stsp | 2008-12-17 18:02:13 +0100 (Wed, 17 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r30756.

------------------------------------------------------------------------
r34774 | cmpilato | 2008-12-17 18:25:15 +0100 (Wed, 17 Dec 2008) | 24 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/svn/changelist-cmd.c
   M /trunk/subversion/svn/main.c

Finish issue #3344 - Disallow the creation of empty-string
changelists.

As it turns out, we don't really seem to allow the storage of
empty-string changelists today, even though the command-line client
will happily tell you that it successfully added its target path to an
empty-string changelist.  This just codifies the rules a little
better, and provides instruction to users tempted to try out
empty-string changelists.

* subversion/include/svn_wc.h
  (svn_wc_set_changelist): Note that the changelist cannot be the
    empty string.

* subversion/libsvn_wc/adm_ops.c
  (svn_wc_set_changelist): Assert that we have a valid changelist 
    name (or no changelist at all).

* subversion/svn/changelist-cmd.c
  (svn_cl__changelist): Disallow empty changelist names.

* subversion/svn/main.c
  (main): Disallow empty --changelist arguments.

------------------------------------------------------------------------
r34775 | cmpilato | 2008-12-17 18:28:19 +0100 (Wed, 17 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Recommend r34774 for backport.
------------------------------------------------------------------------
r34776 | cmpilato | 2008-12-17 18:29:35 +0100 (Wed, 17 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Add the issue number associated with r34774.
------------------------------------------------------------------------
r34777 | hwright | 2008-12-17 18:33:27 +0100 (Wed, 17 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_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 r34560, r34562 from trunk:

 * r34560, r34562
   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.  If all these planets align
   properly then invalid mergeinfo is created on the added subtree.
   Notes:
     The SVN_ERR_ASSERT() in r34562 needs to be changed to an assert()
     as the former doesn't exist on 1.5.x.
   Justification:
     Rare bug, but it results in incorrect mergeinfo.
   Votes:
     +1: pburba, kameshj, jerenkrantz

------------------------------------------------------------------------
r34778 | pburba | 2008-12-17 18:39:23 +0100 (Wed, 17 Dec 2008) | 1 line
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/svn_client.h
   M /branches/1.5.x-reintegrate-improvements/subversion/include/svn_mergeinfo.h
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/copy.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/ra.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_ra_svn/internal_auth.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_ra_svn/ra_svn.h
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_subr/mergeinfo.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_wc/adm_ops.c
   M /branches/1.5.x-reintegrate-improvements/subversion/po/zh_CN.po
   M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/copy_tests.py
   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 r34512-34667 from 1.5.x.
------------------------------------------------------------------------
r34779 | stsp | 2008-12-17 18:55:44 +0100 (Wed, 17 Dec 2008) | 2 lines
Changed paths:
   A /branches/1.5.x-r30756 (from /branches/1.5.x:34778)

Create backport branch for r30756 and related changes.

------------------------------------------------------------------------
r34780 | pburba | 2008-12-17 19:03:18 +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/libsvn_client/copy.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_fs_base/fs.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_fs_base/tree.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_wc/adm_ops.c
   M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/copy_tests.py
   M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/merge_tests.py
   M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/revert_tests.py
   M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py
   M /branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/update_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 r34668-34724 from 1.5.x.

Resolve some minor conflicts with r34668 in merge_tests.py.
------------------------------------------------------------------------
r34781 | hwright | 2008-12-17 19:07:35 +0100 (Wed, 17 Dec 2008) | 3 lines
Changed paths:
   M /trunk/CHANGES

* CHANGES:
  (1.5.5): Bring up-to-date with current merges to 1.5.x.

------------------------------------------------------------------------
r34782 | pburba | 2008-12-17 19:23:22 +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/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/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 r34725 from 1.5.x.

All of merge.c conflicted, not sure why, but resolved easily enough.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34784 | stsp | 2008-12-17 19:41:40 +0100 (Wed, 17 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Add more revs to r30756 group, and mention the group's
    backport branch.

------------------------------------------------------------------------
r34785 | arfrever | 2008-12-17 19:49:06 +0100 (Wed, 17 Dec 2008) | 3 lines
Changed paths:
   M /branches/svnpatch-diff
   M /branches/svnpatch-diff/CHANGES
   M /branches/svnpatch-diff/COMMITTERS
   M /branches/svnpatch-diff/Makefile.in
   M /branches/svnpatch-diff/TODO-1.6
   M /branches/svnpatch-diff/build/generator/gen_make.py
   M /branches/svnpatch-diff/build.conf
   M /branches/svnpatch-diff/contrib/client-side/emacs/psvn.el
   M /branches/svnpatch-diff/notes/wc-ng-design
   M /branches/svnpatch-diff/subversion/bindings/ctypes-python
   M /branches/svnpatch-diff/subversion/bindings/ctypes-python/setup.py
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/svn/client.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/svn/info.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/svn/ra.rb
   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/ruby/test/test_fs.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_info.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_ra.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_repos.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_wc.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/util.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/windows_util.rb
   M /branches/svnpatch-diff/subversion/include/private/svn_mergeinfo_private.h
   A /branches/svnpatch-diff/subversion/include/private/svn_skel.h (from /trunk/subversion/include/private/svn_skel.h:34781)
   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_wc.h
   M /branches/svnpatch-diff/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/svnpatch-diff/subversion/libsvn_client/client.h
   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/export.c
   M /branches/svnpatch-diff/subversion/libsvn_client/merge.c
   M /branches/svnpatch-diff/subversion/libsvn_client/resolved.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/copies-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/locks-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/nodes-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/rev-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/dag.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/fs.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/key-gen.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/key-gen.h
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/tree.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/fs_skels.h
   D /branches/svnpatch-diff/subversion/libsvn_fs_base/util/skel.c
   D /branches/svnpatch-diff/subversion/libsvn_fs_base/util/skel.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/structure
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/util.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/checksum.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/dirent_uri.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/mergeinfo.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/simple_providers.c
   A /branches/svnpatch-diff/subversion/libsvn_subr/skel.c (from /trunk/subversion/libsvn_subr/skel.c:34781)
   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/username_providers.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/entries.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/entries.h
   M /branches/svnpatch-diff/subversion/libsvn_wc/lock.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/lock.h
   M /branches/svnpatch-diff/subversion/libsvn_wc/log.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/props.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/props.h
   M /branches/svnpatch-diff/subversion/libsvn_wc/questions.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/status.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/update_editor.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/svnpatch-diff/subversion/libsvn_wc/wc_db.h
   M /branches/svnpatch-diff/subversion/po/fr.po
   M /branches/svnpatch-diff/subversion/svn/changelist-cmd.c
   M /branches/svnpatch-diff/subversion/svn/main.c
   M /branches/svnpatch-diff/subversion/svnadmin/main.c
   M /branches/svnpatch-diff/subversion/tests/cmdline/commit_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/merge_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/revert_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/stat_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/wc.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/switch_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/update_tests.py
   M /branches/svnpatch-diff/subversion/tests/libsvn_fs_base
   M /branches/svnpatch-diff/subversion/tests/libsvn_fs_base/changes-test.c
   D /branches/svnpatch-diff/subversion/tests/libsvn_fs_base/skel-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr
   A /branches/svnpatch-diff/subversion/tests/libsvn_subr/skel-test.c (from /trunk/subversion/tests/libsvn_subr/skel-test.c:34781)
   M /branches/svnpatch-diff/www/links.html
   A /branches/svnpatch-diff/www/links.zh.html (from /trunk/www/links.zh.html:34781)
   M /branches/svnpatch-diff/www/svn_1.6_releasenotes.html

On the 'svnpatch-diff' branch:
Merge r34594:r34781 from trunk.

------------------------------------------------------------------------
r34786 | pburba | 2008-12-17 19:54:46 +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/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/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 r34725 from 1.5.x.

Resolve some conflicts in merge_tests.py due to placement of added tests.
------------------------------------------------------------------------
r34787 | pburba | 2008-12-17 19:59:00 +0100 (Wed, 17 Dec 2008) | 1 line
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/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/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 r34735-34765 from 1.5.x.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34789 | julianfoad | 2008-12-17 20:19:55 +0100 (Wed, 17 Dec 2008) | 4 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Nominate more revisions in the r30756 (merging EOL-style changes) group,
  and vote for that group.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34791 | stsp | 2008-12-17 20:27:57 +0100 (Wed, 17 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r32930.

------------------------------------------------------------------------
r34792 | pburba | 2008-12-17 20:29:50 +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/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/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 r34769-34770 from 1.5.x.

Resolved some minor conflicts in merge.c from r34770.

------------------------------------------------------------------------
r34793 | hwright | 2008-12-17 20:42:55 +0100 (Wed, 17 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r34774.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34795 | cmpilato | 2008-12-17 20:55:29 +0100 (Wed, 17 Dec 2008) | 3 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/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:
Merge from trunk r34794, which contains only some comment tweaks.

------------------------------------------------------------------------
r34796 | cmpilato | 2008-12-17 20:57:45 +0100 (Wed, 17 Dec 2008) | 5 lines
Changed paths:
   M /branches/1.5.x/STATUS

Add r34794 to the r30756 group, and vote affirmatively.  As there were
already two other +1 votes on all the revs *except* r34794, and as
r34794 was merely a comment formatting change, I've called the whole
thing "approved".

------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r34798 | pburba | 2008-12-17 21:10:27 +0100 (Wed, 17 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/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/mod_dav_svn/mirror.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, merge r34772-34776 from 1.5.x.

------------------------------------------------------------------------
r34799 | hwright | 2008-12-17 21:20:41 +0100 (Wed, 17 Dec 2008) | 22 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/libsvn_wc/merge.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-r30756 branch to 1.5.x:

 * r30756, r32907, r32913, small parts of r32405, r32930, r34794
   Issue #3262: Allow 'svn merge' to merge diffs which add 'svn:eol-style'
   properties to files that used to have inconsistent newlines.
   Backport branch:
     https://svn.collab.net/repos/svn/branches/1.5.x-r30756
   Justification:
     Fixes the merging of certain changes involving EOL-style changes, that
     otherwise fail with a poor error message and little recourse. Fix has
     been available for a long time and accepted by users and just needs
     review.
     See <http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=985219>.
   Notes:
     r30756, r32913 are two similar fixes for two instances of this problem.
     r32907, r32930 add a test for the second instance of this problem,
     merge_tests.py "merge an EOL unification and set svn:eol-style" (#107
     when created, #108 in trunk).
     Parts of r32405 are adding some helper functions in to the test suite.
   Votes:
     +1: stsp, julianfoad, cmpilato

------------------------------------------------------------------------
r34800 | hwright | 2008-12-17 21:21:22 +0100 (Wed, 17 Dec 2008) | 2 lines
Changed paths:
   D /branches/1.5.x-r30756

Remove the 1.5.x-r30756 branch, merged to 1.5.x in r34799.

------------------------------------------------------------------------
r34801 | pburba | 2008-12-17 21:22:27 +0100 (Wed, 17 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/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 r34777-34796 from 1.5.x.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34805 | stylesen | 2008-12-18 10:11:03 +0100 (Thu, 18 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r34774.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34807 | kameshj | 2008-12-18 11:39:51 +0100 (Thu, 18 Dec 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c

Typo fix.

* subversion/libsvn_client/merge.c
  (find_unmerged_mergeinfo): SORUCE -> SOURCE.


------------------------------------------------------------------------
r34808 | julianfoad | 2008-12-18 16:04:53 +0100 (Thu, 18 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Veto one change. Move another to the 'Approved' section.
------------------------------------------------------------------------
r34809 | hwright | 2008-12-18 16:08:56 +0100 (Thu, 18 Dec 2008) | 14 lines
Changed paths:
   M /branches/1.5.x
   M /branches/1.5.x/CHANGES
   M /branches/1.5.x/COMMITTERS
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/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/svn_wc.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_wc/adm_ops.c
   M /branches/1.5.x/subversion/svn/changelist-cmd.c
   M /branches/1.5.x/subversion/svn/main.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 r34774 from trunk:

 * r34774
   Disallow (at the API and UI levels) attempts to set empty-string
   changelists.  (Issue #3344)
   Justifications:
     The code was never intended to allow this, so if it did, it was a bug.
     But while the current code does not, in fact, really allow this, the
     client notifications claim that it *does*.  A(nother?) bug.
   Votes:
     +1: cmpilato, hwright, stylesen

[ This required a tiny change from SVN_ERR_ASSERT() to assert(). ]

------------------------------------------------------------------------
r34810 | hwright | 2008-12-18 16:24:26 +0100 (Thu, 18 Dec 2008) | 3 lines
Changed paths:
   M /trunk/CHANGES

* CHANGES
  (1.5.5): Bring up-to-date with merges to 1.5.x.

------------------------------------------------------------------------
r34811 | cmpilato | 2008-12-18 18:08:23 +0100 (Thu, 18 Dec 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo_catalog_dup): Simplify.

------------------------------------------------------------------------
r34812 | cmpilato | 2008-12-18 18:11:27 +0100 (Thu, 18 Dec 2008) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo__remove_prefix_from_catalog): Wrap long line.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34815 | cmpilato | 2008-12-18 18:37:39 +0100 (Thu, 18 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/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_subr/mergeinfo.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:
Merge from trunk r34814.

------------------------------------------------------------------------
r34816 | cmpilato | 2008-12-18 18:38:03 +0100 (Thu, 18 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Add r34814 to the r34091 group.
------------------------------------------------------------------------
r34817 | cmpilato | 2008-12-18 18:55:08 +0100 (Thu, 18 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/include/svn_wc.h
   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/libsvn_wc/merge.c
   M /branches/1.5.x-reintegrate-improvements/subversion/svn/changelist-cmd.c
   M /branches/1.5.x-reintegrate-improvements/subversion/svn/main.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 from 1.5.x r34797-34816 (and pray that the results are right).

------------------------------------------------------------------------
r34818 | cmpilato | 2008-12-18 19:30:13 +0100 (Thu, 18 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Recommend some more revisions for backport with the r34091 group.
------------------------------------------------------------------------
r34819 | cmpilato | 2008-12-18 19:31:18 +0100 (Thu, 18 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/include/private
   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
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_subr/mergeinfo.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:
Merge from trunk r34331 and r34742.  Fewer typos; no build warnings.

------------------------------------------------------------------------
r34820 | pburba | 2008-12-18 19:38:09 +0100 (Thu, 18 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r34331, r34742, and r34814.
------------------------------------------------------------------------
r34821 | cmpilato | 2008-12-18 19:41:47 +0100 (Thu, 18 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Vote for the bits I understand.
------------------------------------------------------------------------
r34822 | cmpilato | 2008-12-18 22:00:27 +0100 (Thu, 18 Dec 2008) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_neon/mergeinfo.c

Fix a bogus assumption in libsvn_ra_neon that paths coming back from
the mergeinfo REPORT won't be broken across parser chunks.

* subversion/libsvn_ra_neon/mergeinfo.c
  (struct mergeinfo_baton): Make 'curr_path' into an svn_stringbuf_t *.
  (start_element): Also set curr_path to an empty stringbuf instead of
    to NULL.
  (end_element): Assert that we have a valid path, and be sure to dup
    that path into the right pool when using it as a hash key.
  (cdata_handler): Append bytes to curr_path as we do curr_info.
  (svn_ra_neon__get_mergeinfo): Initialized curr_path as an empty stringbuf.

------------------------------------------------------------------------
r34823 | cmpilato | 2008-12-18 22:04:49 +0100 (Thu, 18 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Suggest r34822 for backport, and add note about why the r34091 group needs it.
------------------------------------------------------------------------
r34824 | julianfoad | 2008-12-18 22:53:47 +0100 (Thu, 18 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Remove my veto and add notes about the resolution.
------------------------------------------------------------------------
r34825 | hwright | 2008-12-18 22:57:44 +0100 (Thu, 18 Dec 2008) | 3 lines
Changed paths:
   M /trunk/tools/dist/construct-rolling-environment.sh

* tools/dist/construct-rolling-environment.sh:
  Update some versions, specifically APR, APR-UTIL, and Apache.

------------------------------------------------------------------------
r34826 | julianfoad | 2008-12-18 23:20:46 +0100 (Thu, 18 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r34822.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34829 | kameshj | 2008-12-19 09:20:14 +0100 (Fri, 19 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r34822 and move to Approved changes section.

------------------------------------------------------------------------
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 <assert.h>" 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.]
------------------------------------------------------------------------
r34833 | kameshj | 2008-12-19 13:49:24 +0100 (Fri, 19 Dec 2008) | 4 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r34091, r34094, r34244, r34256, r34306, r34331, r34742, r34814.
  Remove the already merged pre-requisite.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34836 | julianfoad | 2008-12-19 15:11:10 +0100 (Fri, 19 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34835.
------------------------------------------------------------------------
r34837 | sussman | 2008-12-19 15:30:57 +0100 (Fri, 19 Dec 2008) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/CHANGES
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/svn/client.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_repos.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/util.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/windows_util.rb
   M /branches/http-protocol-v2/subversion/include/private/svn_mergeinfo_private.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_client/copy.c
   M /branches/http-protocol-v2/subversion/libsvn_client/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/tree.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/util.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/dirent_uri.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_ops.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/props.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/props.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/status.c
   M /branches/http-protocol-v2/subversion/po/zh_CN.po
   M /branches/http-protocol-v2/subversion/svn/changelist-cmd.c
   M /branches/http-protocol-v2/subversion/svn/main.c
   M /branches/http-protocol-v2/subversion/tests/cmdline/merge_tests.py
   M /branches/http-protocol-v2/tools/dist/construct-rolling-environment.sh

Catch up with ^/trunk
------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34839 | hwright | 2008-12-19 15:43:51 +0100 (Fri, 19 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r34835.

------------------------------------------------------------------------
r34840 | cmpilato | 2008-12-19 15:49:32 +0100 (Fri, 19 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Vote for r34835, approving.
------------------------------------------------------------------------
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 <http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=987356>.
   Votes:
     +1: julianfoad, hwright, cmpilato


------------------------------------------------------------------------
r34842 | hwright | 2008-12-19 15:53:06 +0100 (Fri, 19 Dec 2008) | 2 lines
Changed paths:
   A /branches/1.5.x-rb-test-fix (from /branches/1.5.x:34841)

Create backport branch for r34838.

------------------------------------------------------------------------
r34843 | hwright | 2008-12-19 16:19:03 +0100 (Fri, 19 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x-rb-test-fix
   M /branches/1.5.x-rb-test-fix/CHANGES
   M /branches/1.5.x-rb-test-fix/COMMITTERS
   M /branches/1.5.x-rb-test-fix/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x-rb-test-fix/subversion/bindings/swig
   M /branches/1.5.x-rb-test-fix/subversion/bindings/swig/ruby/test/test_wc.rb
   M /branches/1.5.x-rb-test-fix/subversion/include/private
   M /branches/1.5.x-rb-test-fix/subversion/libsvn_client/merge.c
   M /branches/1.5.x-rb-test-fix/subversion/libsvn_subr
   M /branches/1.5.x-rb-test-fix/subversion/libsvn_wc/adm_ops.c
   M /branches/1.5.x-rb-test-fix/subversion/tests/cmdline/svntest/actions.py
   M /branches/1.5.x-rb-test-fix/www/images/subversion-diagram.png
   M /branches/1.5.x-rb-test-fix/www/images/subversion_logo-200x173.png
   M /branches/1.5.x-rb-test-fix/www/images/subversion_logo-384x332.png
   M /branches/1.5.x-rb-test-fix/www/images/subversion_logo_hor-468x64.png

On the 1.5.x-rb-test-fixes branch:
Merge r34838 from trunk.

------------------------------------------------------------------------
r34844 | hwright | 2008-12-19 16:20:30 +0100 (Fri, 19 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34838.

------------------------------------------------------------------------
r34845 | jerenkrantz | 2008-12-19 16:26:30 +0100 (Fri, 19 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for a backport.

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34847 | hwright | 2008-12-19 16:32:26 +0100 (Fri, 19 Dec 2008) | 2 lines
Changed paths:
   D /branches/1.5.x-rb-test-fix

Remove the 1.5.x-rb-test-fix branch, merged to 1.5.x in r34846.

------------------------------------------------------------------------
r34848 | pburba | 2008-12-19 17:01:32 +0100 (Fri, 19 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/bindings/swig/ruby/test/test_wc.rb
   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_ra_neon/mergeinfo.c
   M /branches/1.5.x-reintegrate-improvements/subversion/libsvn_ra_svn/cyrus_auth.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/po/zh_CN.po
   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, synch with 1.5.x.
(r34817-34847) in preparation to reintegrate it back.

------------------------------------------------------------------------
r34849 | markphip | 2008-12-19 17:55:25 +0100 (Fri, 19 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate and vote for r34196.
------------------------------------------------------------------------
r34850 | hwright | 2008-12-19 17:57:35 +0100 (Fri, 19 Dec 2008) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Vote for r34196, approving.

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34852 | pburba | 2008-12-19 18:06:17 +0100 (Fri, 19 Dec 2008) | 5 lines
Changed paths:
   M /branches/1.5.x/STATUS

*STATUS: Move the r34091 to approved, it already has enough votes.

Note: r34331, r34742, and r34814 were voted for by cmpilato but not
jerenkrantz, but given the minor nature of these changes I feel we are
safe in calling this group approved.  Hate mail to me if you disagree.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34855 | hwright | 2008-12-19 18:19:39 +0100 (Fri, 19 Dec 2008) | 3 lines
Changed paths:
   M /trunk/CHANGES

* CHANGES:
  (1.5.5): Update for latest 1.5.x merges.

------------------------------------------------------------------------
r34856 | hwright | 2008-12-19 18:20:35 +0100 (Fri, 19 Dec 2008) | 3 lines
Changed paths:
   M /trunk/CHANGES

* CHANGES:
  (1.5.5): Set a (temporary) date for release.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34861 | hwright | 2008-12-19 20:08:57 +0100 (Fri, 19 Dec 2008) | 19 lines
Changed paths:
   D /branches/1.5.x-reintegrate-improvements

It is with a bittersweet feeling that I
Remove the 1.5.x-reintegrate-improvements branch, merged to 1.5.x in r34853.

Those who fought through the Great Merge of 2008 will understand the feelings
behind this action.  To paraphrase the Bard:

      This story shall the good man teach his son;
      And Dec'm'ber Nineteen shall ne'er go by,
      From this day to the ending of the world,
      But we in it shall be remembered-
      We few, we happy few, we band of brothers;
      For he to-day that did this merge with me
      Shall be my brother; be he ne'er so vile,
      This day shall gentle his condition;
      And hack'rs in their basements now-a-bed
      Shall think themselves accurs'd they were not here,
      And hold their manhoods cheap whiles any speaks
      That merg'd with us to roll 1.5.5 away.

------------------------------------------------------------------------
r34862 | hwright | 2008-12-19 20:12:11 +0100 (Fri, 19 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/CHANGES

* CHANGES:
  Bring the 1.5.5 section up-to-date with trunk.

------------------------------------------------------------------------
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().

------------------------------------------------------------------------
r34864 | hwright | 2008-12-19 20:58:27 +0100 (Fri, 19 Dec 2008) | 1 line
Changed paths:
   A /tags/1.5.5 (from /branches/1.5.x:34862)
   M /tags/1.5.5/subversion/include/svn_version.h

Tagging 1.5.5 with svn_version.h matching tarball.
------------------------------------------------------------------------
r34865 | hwright | 2008-12-19 21:02:22 +0100 (Fri, 19 Dec 2008) | 8 lines
Changed paths:
   M /branches/1.5.x/STATUS
   M /branches/1.5.x/subversion/include/svn_version.h

Various post-release housekeeping items.

* subversion/include/svn_version.h
  (SVN_VER_PATCH): Bump version number.

  * STATUS:
    1.5.5 -> 1.5.6

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34868 | hwright | 2008-12-19 22:43:10 +0100 (Fri, 19 Dec 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

 * TODO-1.6: Remove a completed item.

------------------------------------------------------------------------
r34869 | hwright | 2008-12-19 23:15:07 +0100 (Fri, 19 Dec 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc_db.h

* subversion/libsvn_wc/wc_db.h:
  A few more comments about trees and APIs.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34871 | hwright | 2008-12-20 00:01:13 +0100 (Sat, 20 Dec 2008) | 3 lines
Changed paths:
   M /trunk/tools/buildbot/slaves/README

* tools/buildbot/slaves/README:
  Set svn:eol-style property.

------------------------------------------------------------------------
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).

------------------------------------------------------------------------
r34877 | rhuijben | 2008-12-20 14:09:22 +0100 (Sat, 20 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r34875 for 1.5.6
------------------------------------------------------------------------
r34878 | cauchy | 2008-12-21 06:23:14 +0100 (Sun, 21 Dec 2008) | 2 lines
Changed paths:
   M /trunk/subversion/svnlook/main.c

Remove extra spaces, aligned commands.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34885 | julianfoad | 2008-12-22 18:12:10 +0100 (Mon, 22 Dec 2008) | 2 lines
Changed paths:
   M /trunk/subversion/include/svn_path.h

* subversion/include/svn_path.h
  (svn_path_join): Tweak the doc string.
------------------------------------------------------------------------
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 <joe.swatosh@gmail.com>

* 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.

------------------------------------------------------------------------
r34891 | steveking | 2008-12-22 21:38:18 +0100 (Mon, 22 Dec 2008) | 3 lines
Changed paths:
   M /trunk/INSTALL

* INSTALL
  clarify which SDK is required to build Subversion with VC6 and where to get
  that version.
------------------------------------------------------------------------
r34892 | hwright | 2008-12-22 22:22:55 +0100 (Mon, 22 Dec 2008) | 8 lines
Changed paths:
   M /trunk/www/getting.html
   M /trunk/www/index.html
   M /trunk/www/release-history.html
   M /trunk/www/roadmap.html

Announce the 1.5.5 release.

* www/release-history.html,
  www/getting.html,
  www/index.html,
  www/roadmap.html:
  Update website for 1.5.5.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34895 | julianfoad | 2008-12-23 14:34:01 +0100 (Tue, 23 Dec 2008) | 2 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_entry_t): Expand some doc strings.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34909 | hwright | 2008-12-24 00:35:37 +0100 (Wed, 24 Dec 2008) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_delta/depth_filter_editor.c

* subversion/libsvn_delta/depth_filter_editor.c
  (okay_to_edit): Remove never-reached statement.

------------------------------------------------------------------------
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().

------------------------------------------------------------------------
r34913 | sussman | 2008-12-24 03:57:28 +0100 (Wed, 24 Dec 2008) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/CHANGES
   M /branches/http-protocol-v2/INSTALL
   M /branches/http-protocol-v2/Makefile.in
   M /branches/http-protocol-v2/TODO-1.6
   M /branches/http-protocol-v2/configure.ac
   M /branches/http-protocol-v2/contrib/client-side/svn2cl/NEWS
   M /branches/http-protocol-v2/contrib/client-side/svn2cl/svn2cl.1
   M /branches/http-protocol-v2/contrib/client-side/svn2cl/svn2cl.sh
   M /branches/http-protocol-v2/contrib/client-side/svn2cl/svn2cl.xsl
   M /branches/http-protocol-v2/contrib/client-side/svn2cl/svn2html.xsl
   M /branches/http-protocol-v2/packages/rpm/redhat-8+/subversion.spec
   M /branches/http-protocol-v2/packages/rpm/rhel-3/subversion.spec
   M /branches/http-protocol-v2/packages/rpm/rhel-4/subversion.spec
   M /branches/http-protocol-v2/packages/rpm/rhel-5/subversion.spec
   M /branches/http-protocol-v2/subversion/bindings/swig/python/svn/fs.py
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_repos.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_wc.rb
   M /branches/http-protocol-v2/subversion/include/private/svn_wc_private.h
   M /branches/http-protocol-v2/subversion/include/svn_delta.h
   M /branches/http-protocol-v2/subversion/include/svn_path.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_client/client.h
   M /branches/http-protocol-v2/subversion/libsvn_client/commit_util.c
   M /branches/http-protocol-v2/subversion/libsvn_client/copy.c
   M /branches/http-protocol-v2/subversion/libsvn_client/url.c
   M /branches/http-protocol-v2/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/tree.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/structure
   M /branches/http-protocol-v2/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_ops.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/entries.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/questions.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/status.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/update_editor.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc_db.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc_db.h
   M /branches/http-protocol-v2/subversion/po/pl.po
   M /branches/http-protocol-v2/subversion/po/zh_CN.po
   M /branches/http-protocol-v2/subversion/svnlook/main.c
   M /branches/http-protocol-v2/subversion/tests/cmdline/basic_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/commit_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/depth_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/log_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/prop_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/resolved_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/actions.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/main.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/verify.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/switch_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/update_tests.py
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs_base/fs-base-test.c
   M /branches/http-protocol-v2/tools/backup/hot-backup.py.in
   M /branches/http-protocol-v2/tools/bdb/erase-all-text-data.py
   M /branches/http-protocol-v2/tools/bdb/svn-bdb-view.py
   M /branches/http-protocol-v2/tools/bdb/whatis-rep.py
   M /branches/http-protocol-v2/tools/buildbot/slaves/README
   A /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64 (from /trunk/tools/buildbot/slaves/ubuntu-x64:34912)
   R /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c (from /trunk/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c:34912)
   R /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh:34912)
   R /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/svncheck.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh:34912)
   R /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/svnclean.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh:34912)
   R /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/svnlog.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh:34912)
   R /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c (from /trunk/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c:34912)
   M /branches/http-protocol-v2/tools/client-side/bash_completion
   M /branches/http-protocol-v2/tools/client-side/change-svn-wc-format.py
   M /branches/http-protocol-v2/tools/client-side/server-version.py
   M /branches/http-protocol-v2/tools/dev/check-license.py
   M /branches/http-protocol-v2/tools/dev/contribulyze.py
   M /branches/http-protocol-v2/tools/dev/datecheck.py
   M /branches/http-protocol-v2/tools/dev/gen-javahl-errors.py
   M /branches/http-protocol-v2/tools/dev/graph-dav-servers.py
   M /branches/http-protocol-v2/tools/dev/iz/ff2csv.py
   M /branches/http-protocol-v2/tools/dev/iz/find-fix.py
   M /branches/http-protocol-v2/tools/dev/mlpatch.py
   M /branches/http-protocol-v2/tools/dev/normalize-dump.py
   M /branches/http-protocol-v2/tools/dev/po-merge.py
   M /branches/http-protocol-v2/tools/dev/random-commits.py
   M /branches/http-protocol-v2/tools/dev/scramble-tree.py
   M /branches/http-protocol-v2/tools/dev/svn-merge-revs.py
   M /branches/http-protocol-v2/tools/dev/verify-history.py
   M /branches/http-protocol-v2/tools/dev/which-error.py
   M /branches/http-protocol-v2/tools/dist/construct-rolling-environment.sh
   M /branches/http-protocol-v2/tools/dist/gen_nightly_ann.py
   M /branches/http-protocol-v2/tools/dist/getsigs.py
   M /branches/http-protocol-v2/tools/dist/post-to-tigris.py
   M /branches/http-protocol-v2/tools/dist/write-announcement.py
   M /branches/http-protocol-v2/tools/examples/blame.py
   M /branches/http-protocol-v2/tools/examples/check-modified.py
   M /branches/http-protocol-v2/tools/examples/dumpprops.py
   M /branches/http-protocol-v2/tools/examples/get-location-segments.py
   M /branches/http-protocol-v2/tools/examples/getfile.py
   M /branches/http-protocol-v2/tools/examples/geturl.py
   M /branches/http-protocol-v2/tools/examples/putfile.py
   M /branches/http-protocol-v2/tools/examples/revplist.py
   M /branches/http-protocol-v2/tools/examples/svnlook.py
   M /branches/http-protocol-v2/tools/examples/svnshell.py
   M /branches/http-protocol-v2/tools/hook-scripts/mailer/tests/mailer-tweak.py
   M /branches/http-protocol-v2/tools/hook-scripts/svn2feed.py
   M /branches/http-protocol-v2/tools/po/l10n-report.py
   M /branches/http-protocol-v2/tools/server-side/fsfs-reshard.py
   M /branches/http-protocol-v2/tools/server-side/svn-backup-dumps.py
   M /branches/http-protocol-v2/win-tests.py
   M /branches/http-protocol-v2/www/getting.html
   M /branches/http-protocol-v2/www/index.html
   M /branches/http-protocol-v2/www/release-history.html
   M /branches/http-protocol-v2/www/roadmap.html

Sync my branch with trunk.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34916 | kameshj | 2008-12-24 13:21:20 +0100 (Wed, 24 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Propose r34915.

------------------------------------------------------------------------
r34917 | kameshj | 2008-12-24 13:57:44 +0100 (Wed, 24 Dec 2008) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_neon/util.c

Revert r34915.

0.x releases need not ensure API compatiblity.

0.25 had 'ne_set_request_body_provider64' which has been removed in 0.27.

------------------------------------------------------------------------
r34918 | kameshj | 2008-12-24 14:01:00 +0100 (Wed, 24 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Un-Propose r34915 as it has been reverted in trunk.

------------------------------------------------------------------------
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.
    

------------------------------------------------------------------------
r34921 | julianfoad | 2008-12-24 14:49:52 +0100 (Wed, 24 Dec 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Update status of #3334.
------------------------------------------------------------------------
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 <math.h>.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34930 | arfrever | 2008-12-25 00:22:06 +0100 (Thu, 25 Dec 2008) | 3 lines
Changed paths:
   M /branches/svnpatch-diff
   M /branches/svnpatch-diff/CHANGES
   M /branches/svnpatch-diff/INSTALL
   M /branches/svnpatch-diff/Makefile.in
   M /branches/svnpatch-diff/TODO-1.6
   M /branches/svnpatch-diff/configure.ac
   M /branches/svnpatch-diff/contrib/client-side/svn2cl/NEWS
   M /branches/svnpatch-diff/contrib/client-side/svn2cl/svn2cl.1
   M /branches/svnpatch-diff/contrib/client-side/svn2cl/svn2cl.sh
   M /branches/svnpatch-diff/contrib/client-side/svn2cl/svn2cl.xsl
   M /branches/svnpatch-diff/contrib/client-side/svn2cl/svn2html.xsl
   M /branches/svnpatch-diff/packages/rpm/redhat-8+/subversion.spec
   M /branches/svnpatch-diff/packages/rpm/rhel-3/subversion.spec
   M /branches/svnpatch-diff/packages/rpm/rhel-4/subversion.spec
   M /branches/svnpatch-diff/packages/rpm/rhel-5/subversion.spec
   M /branches/svnpatch-diff/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/svnpatch-diff/subversion/bindings/swig/python/svn/fs.py
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_repos.rb
   M /branches/svnpatch-diff/subversion/bindings/swig/ruby/test/test_wc.rb
   M /branches/svnpatch-diff/subversion/include/private/svn_skel.h
   M /branches/svnpatch-diff/subversion/include/private/svn_wc_private.h
   M /branches/svnpatch-diff/subversion/include/svn_delta.h
   M /branches/svnpatch-diff/subversion/include/svn_path.h
   M /branches/svnpatch-diff/subversion/include/svn_wc.h
   M /branches/svnpatch-diff/subversion/libsvn_client/client.h
   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/merge.c
   M /branches/svnpatch-diff/subversion/libsvn_client/url.c
   M /branches/svnpatch-diff/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/copies-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/locks-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/nodes-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/rev-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/dag.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/tree.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/structure
   M /branches/svnpatch-diff/subversion/libsvn_ra_neon/mergeinfo.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_neon/util.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/util.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/mergeinfo.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/skel.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/entries.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/log.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/merge.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/questions.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/status.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/tree_conflicts.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/update_editor.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/wc_db.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/wc_db.h
   M /branches/svnpatch-diff/subversion/po/pl.po
   M /branches/svnpatch-diff/subversion/po/zh_CN.po
   M /branches/svnpatch-diff/subversion/svnlook/main.c
   M /branches/svnpatch-diff/subversion/tests/cmdline/basic_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/commit_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/depth_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/log_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/prop_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/resolved_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/main.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/tree_conflict_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/update_tests.py
   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_subr/skel-test.c
   M /branches/svnpatch-diff/tools/backup/hot-backup.py.in
   M /branches/svnpatch-diff/tools/bdb/erase-all-text-data.py
   M /branches/svnpatch-diff/tools/bdb/svn-bdb-view.py
   M /branches/svnpatch-diff/tools/bdb/whatis-rep.py
   M /branches/svnpatch-diff/tools/buildbot/slaves/README
   A /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64 (from /trunk/tools/buildbot/slaves/ubuntu-x64:34929)
   R /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c (from /trunk/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c:34929)
   R /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh:34929)
   R /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64/svncheck.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh:34929)
   R /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64/svnclean.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh:34929)
   R /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64/svnlog.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh:34929)
   R /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c (from /trunk/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c:34929)
   M /branches/svnpatch-diff/tools/client-side/bash_completion
   M /branches/svnpatch-diff/tools/client-side/change-svn-wc-format.py
   M /branches/svnpatch-diff/tools/client-side/server-version.py
   M /branches/svnpatch-diff/tools/dev/check-license.py
   M /branches/svnpatch-diff/tools/dev/contribulyze.py
   M /branches/svnpatch-diff/tools/dev/datecheck.py
   M /branches/svnpatch-diff/tools/dev/gen-javahl-errors.py
   M /branches/svnpatch-diff/tools/dev/graph-dav-servers.py
   M /branches/svnpatch-diff/tools/dev/iz/ff2csv.py
   M /branches/svnpatch-diff/tools/dev/iz/find-fix.py
   M /branches/svnpatch-diff/tools/dev/mlpatch.py
   M /branches/svnpatch-diff/tools/dev/normalize-dump.py
   M /branches/svnpatch-diff/tools/dev/po-merge.py
   M /branches/svnpatch-diff/tools/dev/random-commits.py
   M /branches/svnpatch-diff/tools/dev/scramble-tree.py
   M /branches/svnpatch-diff/tools/dev/svn-merge-revs.py
   M /branches/svnpatch-diff/tools/dev/verify-history.py
   M /branches/svnpatch-diff/tools/dev/which-error.py
   M /branches/svnpatch-diff/tools/dist/construct-rolling-environment.sh
   M /branches/svnpatch-diff/tools/dist/gen_nightly_ann.py
   M /branches/svnpatch-diff/tools/dist/getsigs.py
   M /branches/svnpatch-diff/tools/dist/post-to-tigris.py
   M /branches/svnpatch-diff/tools/dist/write-announcement.py
   M /branches/svnpatch-diff/tools/examples/blame.py
   M /branches/svnpatch-diff/tools/examples/check-modified.py
   M /branches/svnpatch-diff/tools/examples/dumpprops.py
   M /branches/svnpatch-diff/tools/examples/get-location-segments.py
   M /branches/svnpatch-diff/tools/examples/getfile.py
   M /branches/svnpatch-diff/tools/examples/geturl.py
   M /branches/svnpatch-diff/tools/examples/putfile.py
   M /branches/svnpatch-diff/tools/examples/revplist.py
   M /branches/svnpatch-diff/tools/examples/svnlook.py
   M /branches/svnpatch-diff/tools/examples/svnshell.py
   M /branches/svnpatch-diff/tools/hook-scripts/mailer/mailer.py
   M /branches/svnpatch-diff/tools/hook-scripts/mailer/tests/mailer-tweak.py
   M /branches/svnpatch-diff/tools/hook-scripts/svn2feed.py
   M /branches/svnpatch-diff/tools/hook-scripts/svnperms.py
   M /branches/svnpatch-diff/tools/po/l10n-report.py
   M /branches/svnpatch-diff/tools/server-side/fsfs-reshard.py
   M /branches/svnpatch-diff/tools/server-side/svn-backup-dumps.py
   M /branches/svnpatch-diff/win-tests.py
   M /branches/svnpatch-diff/www/getting.html
   M /branches/svnpatch-diff/www/index.html
   M /branches/svnpatch-diff/www/release-history.html
   M /branches/svnpatch-diff/www/roadmap.html

On the 'svnpatch-diff' branch:
Merge r34781:34929 from trunk.

------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r34932 | kameshj | 2008-12-26 11:48:48 +0100 (Fri, 26 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Propose r34919, r34924.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34940 | rhuijben | 2008-12-26 17:33:11 +0100 (Fri, 26 Dec 2008) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast (first?) vote on r34919, r34924.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34942 | hwright | 2008-12-26 18:31:42 +0100 (Fri, 26 Dec 2008) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c

Revert r34938, which r34941 has now made obsolete.

------------------------------------------------------------------------
r34943 | hwright | 2008-12-26 18:39:43 +0100 (Fri, 26 Dec 2008) | 7 lines
Changed paths:
   M /trunk/tools/dev/graph-dav-servers.py
   M /trunk/www/images/svn-dav-securityspace-survey.png
   M /trunk/www/svn-dav-securityspace-survey.html

Update the dav server survey for Jan. 2009.

* www/svn-dav-securityspace-survey.html,
  www/images/svn-dav-securityspace-survey.png,
  tools/dev/graph-dav-servers.py:
  Update image and table.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34945 | hwright | 2008-12-26 20:10:07 +0100 (Fri, 26 Dec 2008) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove SQLite item in favor of issue #3352.

------------------------------------------------------------------------
r34946 | lgo | 2008-12-26 20:40:24 +0100 (Fri, 26 Dec 2008) | 1 line
Changed paths:
   M /trunk/subversion/libsvn_ra_serf/README

* subversion/libsvn_ra_serf/README: Marked an outstanding TODO as done.
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34952 | hwright | 2008-12-27 00:17:28 +0100 (Sat, 27 Dec 2008) | 4 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6:
  Remove item regarding tc failures over ra_serf.  This was fixed in serf's
  r1206, and the buildbot now passes all tests.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34956 | kameshj | 2008-12-27 10:07:24 +0100 (Sat, 27 Dec 2008) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r34919, r34924 group.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34961 | gstein | 2008-12-28 18:46:55 +0100 (Sun, 28 Dec 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

add a blocker
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34968 | arfrever | 2008-12-29 21:28:01 +0100 (Mon, 29 Dec 2008) | 5 lines
Changed paths:
   M /trunk/subversion/svn/main.c

Follow-up to r34967:

* subversion/svn/main.c
  (main): Delete unneeded lines.

------------------------------------------------------------------------
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

------------------------------------------------------------------------
r34973 | stsp | 2008-12-30 02:56:52 +0100 (Tue, 30 Dec 2008) | 6 lines
Changed paths:
   M /trunk/www/links.html

* www/links.html
  (hosting): Add link to Origo.

Patch by: Patraick Ruckstuhl <patrick@tario.org>
(tweaked by me)

------------------------------------------------------------------------
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 <alexander@collab.net>
(Tweaked by me)

------------------------------------------------------------------------
r34978 | rhuijben | 2008-12-30 14:00:20 +0100 (Tue, 30 Dec 2008) | 1 line
Changed paths:
   M /trunk/www/links.html

* www/links.html: Fix alphabetical order of Stand-alone clients
------------------------------------------------------------------------
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'.

------------------------------------------------------------------------
r34987 | rhuijben | 2008-12-31 02:45:49 +0100 (Wed, 31 Dec 2008) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add cmdline prompt in gnome_keyring handler as 1.6 blocker
------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r34992 | hwright | 2008-12-31 18:34:04 +0100 (Wed, 31 Dec 2008) | 5 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6:
  Add a parenthetical to each of the blocker items state who is currently
  working on it.  Also, remove issue #3343 from the optional list, if it
  becomes a blocking item for release, we can revisit it.

------------------------------------------------------------------------
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().

------------------------------------------------------------------------
r34999 | arfrever | 2009-01-01 00:58:46 +0100 (Thu, 01 Jan 2009) | 13 lines
Changed paths:
   M /trunk/COPYING
   M /trunk/build/win32/svn.rc
   M /trunk/packages/windows-innosetup/Pre.rtf
   M /trunk/packages/windows-innosetup/svn.iss
   M /trunk/subversion/LICENSE
   M /trunk/subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS
   M /trunk/subversion/libsvn_subr/opt.c
   M /trunk/tools/dev/check-license.py
   M /trunk/www/license-1.html
   M /trunk/www/license-for-python-bindings.html

Update copyright years.

* build/win32/svn.rc:
* COPYING:
* packages/windows-innosetup/Pre.rtf:
* packages/windows-innosetup/svn.iss:
* subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS:
* subversion/libsvn_subr/opt.c:
* subversion/LICENSE:
* tools/dev/check-license.py:
* www/license-1.html:
* www/license-for-python-bindings.html: Update copyright years.

------------------------------------------------------------------------
r35000 | arfrever | 2009-01-01 00:59:32 +0100 (Thu, 01 Jan 2009) | 2 lines
Changed paths:
   A /branches/python-3-compatibility (from /trunk:34999)

Create the 'python-3-compatibility' branch.

------------------------------------------------------------------------
r35001 | arfrever | 2009-01-01 01:38:30 +0100 (Thu, 01 Jan 2009) | 24 lines
Changed paths:
   M /branches/python-3-compatibility/build/getversion.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/actions.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/main.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/wc.py
   M /branches/python-3-compatibility/tools/client-side/change-svn-wc-format.py
   M /branches/python-3-compatibility/tools/dev/contribulyze.py
   M /branches/python-3-compatibility/tools/dev/gen-javahl-errors.py
   M /branches/python-3-compatibility/tools/dev/graph-dav-servers.py
   M /branches/python-3-compatibility/tools/dev/iz/ff2csv.py
   M /branches/python-3-compatibility/tools/dev/iz/find-fix.py
   M /branches/python-3-compatibility/tools/dev/which-error.py
   M /branches/python-3-compatibility/tools/examples/get-location-segments.py
   M /branches/python-3-compatibility/tools/hook-scripts/svn2feed.py
   M /branches/python-3-compatibility/tools/hook-scripts/svnperms.py
   M /branches/python-3-compatibility/tools/po/l10n-report.py
   M /branches/python-3-compatibility/tools/server-side/fsfs-reshard.py
   M /branches/python-3-compatibility/tools/server-side/svn-backup-dumps.py
   M /branches/python-3-compatibility/tools/server-side/test_svn_server_log_parse.py

On the 'python-3-compatibility' branch:
Python 3 compatibility:
Update except statements.

* build/getversion.py:
* subversion/tests/cmdline/svntest/actions.py:
* subversion/tests/cmdline/svntest/main.py:
* subversion/tests/cmdline/svntest/wc.py:
* tools/client-side/change-svn-wc-format.py:
* tools/dev/contribulyze.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/which-error.py:
* tools/examples/get-location-segments.py:
* tools/hook-scripts/svn2feed.py:
* tools/hook-scripts/svnperms.py:
* tools/po/l10n-report.py:
* tools/server-side/fsfs-reshard.py:
* tools/server-side/svn-backup-dumps.py:
* tools/server-side/test_svn_server_log_parse.py: Use 'except exception as e'
   instead of 'except exception, e'.

------------------------------------------------------------------------
r35002 | arfrever | 2009-01-01 02:38:47 +0100 (Thu, 01 Jan 2009) | 3 lines
Changed paths:
   M /branches/svnpatch-diff
   M /branches/svnpatch-diff/COPYING
   M /branches/svnpatch-diff/Makefile.in
   M /branches/svnpatch-diff/TODO-1.6
   M /branches/svnpatch-diff/build/ac-macros/neon.m4
   M /branches/svnpatch-diff/build/generator/gen_base.py
   M /branches/svnpatch-diff/build/generator/gen_win.py
   M /branches/svnpatch-diff/build/win32/svn.rc
   M /branches/svnpatch-diff/configure.ac
   M /branches/svnpatch-diff/notes/webdav-proxy
   M /branches/svnpatch-diff/packages/windows-innosetup/Pre.rtf
   M /branches/svnpatch-diff/packages/windows-innosetup/svn.iss
   M /branches/svnpatch-diff/subversion/LICENSE
   M /branches/svnpatch-diff/subversion/bindings/ctypes-python/test/wc.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS
   M /branches/svnpatch-diff/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /branches/svnpatch-diff/subversion/bindings/swig/python/svn/fs.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/delta.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/ra.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/repository.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/wc.py
   M /branches/svnpatch-diff/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/reps-strings.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/structure
   M /branches/svnpatch-diff/subversion/libsvn_ra/ra_loader.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/README
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/util.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/checksum.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/dirent_uri.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/opt.c
   M /branches/svnpatch-diff/subversion/po/fr.po
   M /branches/svnpatch-diff/subversion/po/ko.po
   M /branches/svnpatch-diff/subversion/svn/cl.h
   M /branches/svnpatch-diff/subversion/svn/main.c
   M /branches/svnpatch-diff/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/main.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/tree.py
   M /branches/svnpatch-diff/subversion/tests/libsvn_fs_fs/fs-pack-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/auth-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/hashdump-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/string-test.c
   M /branches/svnpatch-diff/tools/backup/hot-backup.py.in
   M /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64
   A /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh:35001)
   M /branches/svnpatch-diff/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
   M /branches/svnpatch-diff/tools/client-side/bash_completion
   M /branches/svnpatch-diff/tools/dev/check-license.py
   M /branches/svnpatch-diff/tools/dev/graph-dav-servers.py
   M /branches/svnpatch-diff/tools/dev/mlpatch.py
   M /branches/svnpatch-diff/tools/hook-scripts/mailer/mailer.py
   M /branches/svnpatch-diff/tools/hook-scripts/svn2feed.py
   M /branches/svnpatch-diff/tools/hook-scripts/verify-po.py
   M /branches/svnpatch-diff/www/images/svn-dav-securityspace-survey.png
   M /branches/svnpatch-diff/www/license-1.html
   M /branches/svnpatch-diff/www/license-for-python-bindings.html
   M /branches/svnpatch-diff/www/links.html
   M /branches/svnpatch-diff/www/svn-dav-securityspace-survey.html

On the 'svnpatch-diff' branch:
Merge r34929:35001 from trunk.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r35008 | hwright | 2009-01-01 18:53:43 +0100 (Thu, 01 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/fs_fs.c
  (get_and_increment_txn_key_body): Simplify error handling just a bit.

------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r35010 | arfrever | 2009-01-01 21:04:08 +0100 (Thu, 01 Jan 2009) | 14 lines
Changed paths:
   M /branches/python-3-compatibility/build/generator/gen_make.py
   M /branches/python-3-compatibility/build/generator/gen_msvc_dsp.py
   M /branches/python-3-compatibility/build/generator/gen_vcnet_vcproj.py
   M /branches/python-3-compatibility/subversion/bindings/swig/python/svn/repos.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/__init__.py
   M /branches/python-3-compatibility/tools/client-side/change-svn-wc-format.py
   M /branches/python-3-compatibility/tools/dev/contribulyze.py
   M /branches/python-3-compatibility/tools/hook-scripts/log-police.py
   M /branches/python-3-compatibility/tools/hook-scripts/mailer/mailer.py

On the 'python-3-compatibility' branch:
Python 3 compatibility:
Don't assing values to True/False keywords.

* build/generator/gen_make.py:
* build/generator/gen_msvc_dsp.py:
* build/generator/gen_vcnet_vcproj.py:
* subversion/bindings/swig/python/svn/repos.py:
* subversion/tests/cmdline/svntest/__init__.py:
* tools/client-side/change-svn-wc-format.py:
* tools/dev/contribulyze.py:
* tools/hook-scripts/log-police.py:
* tools/hook-scripts/mailer/mailer.py: Don't assing values to True/False keywords.

------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r35012 | kfogel | 2009-01-02 01:41:08 +0100 (Fri, 02 Jan 2009) | 6 lines
Changed paths:
   M /trunk/www/security.html

* www/security.html: Update the security reports address.

The new tigris.org discussion forums (which are also the mailing
lists) do not support the particular combination of write-friendliness
and read-guardedness needed to receive security reports.

------------------------------------------------------------------------
r35013 | kameshj | 2009-01-02 15:19:04 +0100 (Fri, 02 Jan 2009) | 6 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/CHANGES
   M /branches/issue-2897-take2/COMMITTERS
   M /branches/issue-2897-take2/COPYING
   M /branches/issue-2897-take2/INSTALL
   M /branches/issue-2897-take2/Makefile.in
   M /branches/issue-2897-take2/TODO-1.6
   M /branches/issue-2897-take2/build/ac-macros/neon.m4
   M /branches/issue-2897-take2/build/ac-macros/swig.m4
   M /branches/issue-2897-take2/build/generator/ezt.py
   M /branches/issue-2897-take2/build/generator/gen_base.py
   M /branches/issue-2897-take2/build/generator/gen_make.py
   M /branches/issue-2897-take2/build/generator/gen_vcnet_vcproj.py
   M /branches/issue-2897-take2/build/generator/gen_win.py
   M /branches/issue-2897-take2/build/run_tests.py
   M /branches/issue-2897-take2/build/win32/make_dist.py
   M /branches/issue-2897-take2/build/win32/svn.rc
   M /branches/issue-2897-take2/build.conf
   M /branches/issue-2897-take2/configure.ac
   M /branches/issue-2897-take2/contrib/client-side/emacs/dsvn.el
   M /branches/issue-2897-take2/contrib/client-side/emacs/psvn.el
   M /branches/issue-2897-take2/contrib/client-side/svn2cl/NEWS
   M /branches/issue-2897-take2/contrib/client-side/svn2cl/svn2cl.1
   M /branches/issue-2897-take2/contrib/client-side/svn2cl/svn2cl.sh
   M /branches/issue-2897-take2/contrib/client-side/svn2cl/svn2cl.xsl
   M /branches/issue-2897-take2/contrib/client-side/svn2cl/svn2html.xsl
   M /branches/issue-2897-take2/contrib/client-side/svnmucc/svnmucc-test.py
   M /branches/issue-2897-take2/contrib/client-side/svnmucc/svnmucc.c
   M /branches/issue-2897-take2/contrib/hook-scripts/commit-email.pl.in
   M /branches/issue-2897-take2/contrib/hook-scripts/enforcer/enforcer
   M /branches/issue-2897-take2/contrib/server-side/svnmirror-test.sh
   M /branches/issue-2897-take2/gen-make.py
   M /branches/issue-2897-take2/notes/dump-load-format.txt
   M /branches/issue-2897-take2/notes/http-protocol-v2.txt
   M /branches/issue-2897-take2/notes/tree-conflicts/design-overview.txt
   A /branches/issue-2897-take2/notes/tree-conflicts/use-cases-resolution.txt (from /trunk/notes/tree-conflicts/use-cases-resolution.txt:35012)
   M /branches/issue-2897-take2/notes/wc-ng-design
   M /branches/issue-2897-take2/notes/webdav-proxy
   M /branches/issue-2897-take2/packages/rpm/redhat-8+/subversion.spec
   M /branches/issue-2897-take2/packages/rpm/rhel-3/subversion.spec
   M /branches/issue-2897-take2/packages/rpm/rhel-4/subversion.spec
   M /branches/issue-2897-take2/packages/rpm/rhel-5/subversion.spec
   M /branches/issue-2897-take2/packages/windows-innosetup/Pre.rtf
   M /branches/issue-2897-take2/packages/windows-innosetup/svn.iss
   M /branches/issue-2897-take2/subversion/LICENSE
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/csvn/types.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/log.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/setup.py
   M /branches/issue-2897-take2/subversion/bindings/ctypes-python/test/wc.py
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/issue-2897-take2/subversion/bindings/swig/core.i
   M /branches/issue-2897-take2/subversion/bindings/swig/include/svn_global.swg
   M /branches/issue-2897-take2/subversion/bindings/swig/python
   M /branches/issue-2897-take2/subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS
   M /branches/issue-2897-take2/subversion/bindings/swig/python/libsvn_swig_py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /branches/issue-2897-take2/subversion/bindings/swig/python/svn/fs.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/auth.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/client.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/delta.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/ra.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/repository.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/trac/test.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
   M /branches/issue-2897-take2/subversion/bindings/swig/python/tests/wc.py
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/svn/client.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/svn/info.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/svn/ra.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_fs.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_info.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_ra.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_repos.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_wc.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/util.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/windows_util.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/svn_client.i
   M /branches/issue-2897-take2/subversion/include/private/svn_auth_private.h
   M /branches/issue-2897-take2/subversion/include/private/svn_fs_util.h
   M /branches/issue-2897-take2/subversion/include/private/svn_mergeinfo_private.h
   A /branches/issue-2897-take2/subversion/include/private/svn_skel.h (from /trunk/subversion/include/private/svn_skel.h:35012)
   M /branches/issue-2897-take2/subversion/include/private/svn_sqlite.h
   M /branches/issue-2897-take2/subversion/include/private/svn_wc_private.h
   M /branches/issue-2897-take2/subversion/include/svn_auth.h
   M /branches/issue-2897-take2/subversion/include/svn_checksum.h
   M /branches/issue-2897-take2/subversion/include/svn_client.h
   M /branches/issue-2897-take2/subversion/include/svn_config.h
   M /branches/issue-2897-take2/subversion/include/svn_delta.h
   M /branches/issue-2897-take2/subversion/include/svn_dirent_uri.h
   M /branches/issue-2897-take2/subversion/include/svn_error.h
   M /branches/issue-2897-take2/subversion/include/svn_fs.h
   M /branches/issue-2897-take2/subversion/include/svn_io.h
   M /branches/issue-2897-take2/subversion/include/svn_mergeinfo.h
   M /branches/issue-2897-take2/subversion/include/svn_opt.h
   M /branches/issue-2897-take2/subversion/include/svn_path.h
   M /branches/issue-2897-take2/subversion/include/svn_ra.h
   M /branches/issue-2897-take2/subversion/include/svn_repos.h
   M /branches/issue-2897-take2/subversion/include/svn_string.h
   M /branches/issue-2897-take2/subversion/include/svn_subst.h
   M /branches/issue-2897-take2/subversion/include/svn_wc.h
   M /branches/issue-2897-take2/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/issue-2897-take2/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-2897-take2/subversion/libsvn_client/blame.c
   M /branches/issue-2897-take2/subversion/libsvn_client/client.h
   M /branches/issue-2897-take2/subversion/libsvn_client/commit.c
   M /branches/issue-2897-take2/subversion/libsvn_client/commit_util.c
   M /branches/issue-2897-take2/subversion/libsvn_client/copy.c
   M /branches/issue-2897-take2/subversion/libsvn_client/deprecated.c
   M /branches/issue-2897-take2/subversion/libsvn_client/diff.c
   M /branches/issue-2897-take2/subversion/libsvn_client/export.c
   M /branches/issue-2897-take2/subversion/libsvn_client/externals.c
   M /branches/issue-2897-take2/subversion/libsvn_client/info.c
   M /branches/issue-2897-take2/subversion/libsvn_client/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.h
   M /branches/issue-2897-take2/subversion/libsvn_client/ra.c
   M /branches/issue-2897-take2/subversion/libsvn_client/repos_diff.c
   M /branches/issue-2897-take2/subversion/libsvn_client/resolved.c
   M /branches/issue-2897-take2/subversion/libsvn_client/status.c
   M /branches/issue-2897-take2/subversion/libsvn_client/switch.c
   M /branches/issue-2897-take2/subversion/libsvn_client/update.c
   M /branches/issue-2897-take2/subversion/libsvn_client/url.c
   M /branches/issue-2897-take2/subversion/libsvn_delta/compose_delta.c
   M /branches/issue-2897-take2/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/issue-2897-take2/subversion/libsvn_diff/diff_file.c
   M /branches/issue-2897-take2/subversion/libsvn_fs/fs-loader.c
   M /branches/issue-2897-take2/subversion/libsvn_fs/fs-loader.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/copies-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/env.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/locks-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/nodes-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/rev-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/key-gen.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/key-gen.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/reps-strings.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/tree.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/util/fs_skels.h
   D /branches/issue-2897-take2/subversion/libsvn_fs_base/util/skel.c
   D /branches/issue-2897-take2/subversion/libsvn_fs_base/util/skel.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/caching.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/dag.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/lock.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/rep-cache.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/structure
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/tree.c
   M /branches/issue-2897-take2/subversion/libsvn_ra/ra_loader.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/commit.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/fetch.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/mergeinfo.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/session.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_neon/util.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/README
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/commit.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/locks.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/serf.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/update.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/util.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_serf/xml.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/client.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/dump.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/fs-wrap.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/hooks.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/reporter.c
   M /branches/issue-2897-take2/subversion/libsvn_repos/repos.h
   M /branches/issue-2897-take2/subversion/libsvn_subr/auth.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/checksum.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/cmdline.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/config_file.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/deprecated.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/dirent_uri.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/error.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/genctype.py
   M /branches/issue-2897-take2/subversion/libsvn_subr/io.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/mergeinfo.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/opt.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/path.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/pool.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/simple_providers.c
   A /branches/issue-2897-take2/subversion/libsvn_subr/skel.c (from /trunk/subversion/libsvn_subr/skel.c:35012)
   M /branches/issue-2897-take2/subversion/libsvn_subr/sqlite.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/ssl_client_cert_providers.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/stream.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/subst.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/svn_string.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/time.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/username_providers.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/utf.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/win32_crypto.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/README
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_crawler.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_files.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_files.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/ambient_depth_filter_editor.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/copy.c
   A /branches/issue-2897-take2/subversion/libsvn_wc/crop.c (from /trunk/subversion/libsvn_wc/crop.c:35012)
   M /branches/issue-2897-take2/subversion/libsvn_wc/deprecated.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/diff.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/entries.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/entries.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/lock.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/lock.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/log.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/log.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/props.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/props.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/questions.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/relocate.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/status.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/translate.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/tree_conflicts.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/update_editor.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/util.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc_db.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/wc_db.h
   M /branches/issue-2897-take2/subversion/mod_dav_svn/activity.c
   M /branches/issue-2897-take2/subversion/mod_dav_svn/mirror.c
   M /branches/issue-2897-take2/subversion/mod_dav_svn/repos.c
   M /branches/issue-2897-take2/subversion/mod_dav_svn/util.c
   M /branches/issue-2897-take2/subversion/po/fr.po
   M /branches/issue-2897-take2/subversion/po/ko.po
   M /branches/issue-2897-take2/subversion/po/pl.po
   M /branches/issue-2897-take2/subversion/po/zh_CN.po
   M /branches/issue-2897-take2/subversion/svn/changelist-cmd.c
   M /branches/issue-2897-take2/subversion/svn/cl.h
   M /branches/issue-2897-take2/subversion/svn/diff-cmd.c
   M /branches/issue-2897-take2/subversion/svn/info-cmd.c
   M /branches/issue-2897-take2/subversion/svn/list-cmd.c
   M /branches/issue-2897-take2/subversion/svn/log-cmd.c
   M /branches/issue-2897-take2/subversion/svn/main.c
   M /branches/issue-2897-take2/subversion/svn/notify.c
   M /branches/issue-2897-take2/subversion/svn/schema/info.rnc
   M /branches/issue-2897-take2/subversion/svn/status.c
   M /branches/issue-2897-take2/subversion/svn/tree-conflicts.c
   M /branches/issue-2897-take2/subversion/svn/tree-conflicts.h
   M /branches/issue-2897-take2/subversion/svn/util.c
   M /branches/issue-2897-take2/subversion/svn_private_config.hw
   M /branches/issue-2897-take2/subversion/svnadmin/main.c
   M /branches/issue-2897-take2/subversion/svndumpfilter/main.c
   M /branches/issue-2897-take2/subversion/svnlook/main.c
   M /branches/issue-2897-take2/subversion/svnsync/main.c
   M /branches/issue-2897-take2/subversion/tests/cmdline/basic_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/blame_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/changelist_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/commit_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/copy_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/depth_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/externals_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/issue-2897-take2/subversion/tests/cmdline/info_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/log_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_authz_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/prop_tests.py
   A /branches/issue-2897-take2/subversion/tests/cmdline/resolved_tests.py (from /trunk/subversion/tests/cmdline/resolved_tests.py:35012)
   M /branches/issue-2897-take2/subversion/tests/cmdline/revert_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/stat_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnlook_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/actions.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/tree.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/verify.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/wc.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/switch_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/update_tests.py
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs/fs-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs_base
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs_base/changes-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs_base/fs-base-test.c
   D /branches/issue-2897-take2/subversion/tests/libsvn_fs_base/skel-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs_base/strings-reps-test.c
   A /branches/issue-2897-take2/subversion/tests/libsvn_fs_fs (from /trunk/subversion/tests/libsvn_fs_fs:35012)
   R /branches/issue-2897-take2/subversion/tests/libsvn_fs_fs/fs-pack-test.c (from /trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c:35012)
   M /branches/issue-2897-take2/subversion/tests/libsvn_repos/repos-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr
   A /branches/issue-2897-take2/subversion/tests/libsvn_subr/auth-test.c (from /trunk/subversion/tests/libsvn_subr/auth-test.c:35012)
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/hashdump-test.c
   A /branches/issue-2897-take2/subversion/tests/libsvn_subr/skel-test.c (from /trunk/subversion/tests/libsvn_subr/skel-test.c:35012)
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/string-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/translate-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/issue-2897-take2/subversion/tests/svn_test.h
   M /branches/issue-2897-take2/subversion/tests/svn_test_fs.c
   M /branches/issue-2897-take2/subversion/tests/svn_test_fs.h
   M /branches/issue-2897-take2/subversion/tests/svn_test_main.c
   M /branches/issue-2897-take2/tools/backup/hot-backup.py.in
   M /branches/issue-2897-take2/tools/bdb/erase-all-text-data.py
   M /branches/issue-2897-take2/tools/bdb/svn-bdb-view.py
   M /branches/issue-2897-take2/tools/bdb/whatis-rep.py
   M /branches/issue-2897-take2/tools/buildbot/slaves/README
   A /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64 (from /trunk/tools/buildbot/slaves/ubuntu-x64:35012)
   R /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c (from /trunk/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c:35012)
   R /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh:35012)
   R /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh:35012)
   R /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64/svncheck.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh:35012)
   R /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64/svnclean.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh:35012)
   R /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64/svnlog.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh:35012)
   R /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c (from /trunk/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c:35012)
   M /branches/issue-2897-take2/tools/client-side/bash_completion
   M /branches/issue-2897-take2/tools/client-side/change-svn-wc-format.py
   M /branches/issue-2897-take2/tools/client-side/server-version.py
   M /branches/issue-2897-take2/tools/dev/check-license.py
   M /branches/issue-2897-take2/tools/dev/contribulyze.py
   M /branches/issue-2897-take2/tools/dev/datecheck.py
   M /branches/issue-2897-take2/tools/dev/gen-javahl-errors.py
   M /branches/issue-2897-take2/tools/dev/graph-dav-servers.py
   M /branches/issue-2897-take2/tools/dev/iz/ff2csv.py
   M /branches/issue-2897-take2/tools/dev/iz/find-fix.py
   M /branches/issue-2897-take2/tools/dev/mlpatch.py
   M /branches/issue-2897-take2/tools/dev/normalize-dump.py
   M /branches/issue-2897-take2/tools/dev/po-merge.py
   M /branches/issue-2897-take2/tools/dev/random-commits.py
   M /branches/issue-2897-take2/tools/dev/scramble-tree.py
   M /branches/issue-2897-take2/tools/dev/svn-merge-revs.py
   M /branches/issue-2897-take2/tools/dev/trails.py
   M /branches/issue-2897-take2/tools/dev/verify-history.py
   M /branches/issue-2897-take2/tools/dev/which-error.py
   M /branches/issue-2897-take2/tools/dist/construct-rolling-environment.sh
   M /branches/issue-2897-take2/tools/dist/gen_nightly_ann.py
   M /branches/issue-2897-take2/tools/dist/getsigs.py
   M /branches/issue-2897-take2/tools/dist/post-to-tigris.py
   M /branches/issue-2897-take2/tools/dist/write-announcement.py
   M /branches/issue-2897-take2/tools/examples/blame.py
   M /branches/issue-2897-take2/tools/examples/check-modified.py
   M /branches/issue-2897-take2/tools/examples/dumpprops.py
   M /branches/issue-2897-take2/tools/examples/get-location-segments.py
   M /branches/issue-2897-take2/tools/examples/getfile.py
   M /branches/issue-2897-take2/tools/examples/geturl.py
   M /branches/issue-2897-take2/tools/examples/putfile.py
   M /branches/issue-2897-take2/tools/examples/revplist.py
   M /branches/issue-2897-take2/tools/examples/svnlook.py
   M /branches/issue-2897-take2/tools/examples/svnshell.py
   M /branches/issue-2897-take2/tools/hook-scripts/mailer/mailer.py
   M /branches/issue-2897-take2/tools/hook-scripts/mailer/tests/mailer-tweak.py
   M /branches/issue-2897-take2/tools/hook-scripts/svn2feed.py
   M /branches/issue-2897-take2/tools/hook-scripts/svnperms.py
   M /branches/issue-2897-take2/tools/hook-scripts/verify-po.py
   M /branches/issue-2897-take2/tools/po/l10n-report.py
   M /branches/issue-2897-take2/tools/po/po-update.sh
   M /branches/issue-2897-take2/tools/server-side/fsfs-reshard.py
   M /branches/issue-2897-take2/tools/server-side/svn-backup-dumps.py
   M /branches/issue-2897-take2/win-tests.py
   M /branches/issue-2897-take2/www/faq.html
   A /branches/issue-2897-take2/www/faq.zh.html (from /trunk/www/faq.zh.html:35012)
   M /branches/issue-2897-take2/www/getting.html
   M /branches/issue-2897-take2/www/hacking.html
   M /branches/issue-2897-take2/www/images/svn-dav-securityspace-survey.png
   M /branches/issue-2897-take2/www/index.html
   M /branches/issue-2897-take2/www/license-1.html
   M /branches/issue-2897-take2/www/license-for-python-bindings.html
   M /branches/issue-2897-take2/www/links.html
   A /branches/issue-2897-take2/www/links.zh.html (from /trunk/www/links.zh.html:35012)
   M /branches/issue-2897-take2/www/mailing-lists.html
   M /branches/issue-2897-take2/www/poole-response.html
   M /branches/issue-2897-take2/www/release-history.html
   M /branches/issue-2897-take2/www/roadmap.html
   M /branches/issue-2897-take2/www/security.html
   M /branches/issue-2897-take2/www/svn-dav-securityspace-survey.html
   M /branches/issue-2897-take2/www/svn_1.6_releasenotes.html
   M /branches/issue-2897-take2/www/toctool.py
   M /branches/issue-2897-take2/www/tools_contrib.html
   A /branches/issue-2897-take2/www/tools_contrib.zh.html (from /trunk/www/tools_contrib.zh.html:35012)

On issue-2897-take2:

Merge from ^/trunk revisions r34074 through r35012.

Resolving 'textual and logical conflict' on 'subversion/libsvn_fs_base/util/fs_skels.c'

------------------------------------------------------------------------
r35014 | kameshj | 2009-01-02 15:29:44 +0100 (Fri, 02 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Extract r28202 from ^/branches/issue-2897 and apply here.

------------------------------------------------------------------------
r35015 | kameshj | 2009-01-02 15:38:54 +0100 (Fri, 02 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Extract r28233 from ^/branches/issue-2897 and apply here.

------------------------------------------------------------------------
r35016 | kameshj | 2009-01-02 15:45:27 +0100 (Fri, 02 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Extract r28479 from ^/branches/issue-2897 and apply here.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r35019 | kameshj | 2009-01-03 08:34:04 +0100 (Sat, 03 Jan 2009) | 6 lines
Changed paths:
   M /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh

* tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh
  Delete the empty svn:mergeinfo property as per
  http://svn.haxx.se/dev/archive-2008-11/0532.shtml

Review by: arfrever

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r35021 | arfrever | 2009-01-03 17:18:47 +0100 (Sat, 03 Jan 2009) | 6 lines
Changed paths:
   M /trunk/build/ac-macros/berkeley-db.m4

Follow-up to r35017:

* build/ac-macros/berkeley-db.m4
  (SVN_LIB_BERKELEY_DB): Fix a typo.
  (SVN_LIB_BERKELEY_DB_TRY): Improve check for SVN_DB_LIBS.

------------------------------------------------------------------------
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().
------------------------------------------------------------------------
r35024 | danielsh | 2009-01-04 07:36:08 +0100 (Sun, 04 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Follow-up to r35023:

* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__path_rev_absolute):
    Mark a string for translation.
------------------------------------------------------------------------
r35025 | danielsh | 2009-01-04 07:41:01 +0100 (Sun, 04 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Tweak generated config file.

* subversion/libsvn_fs_fs/fs_fs.c
  (write_config):
    For consistency with other config files, use only one '#' in front of
    an 'option=value' line that is meant to be uncommented (as opposed to
    the documentation comments, that use '###').
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
r35027 | joeswatosh | 2009-01-05 08:08:06 +0100 (Mon, 05 Jan 2009) | 13 lines
Changed paths:
   M /trunk/subversion/bindings/swig/ruby/svn/client.rb
   M /trunk/subversion/bindings/swig/ruby/test/test_client.rb

Update Svn::Client::Context to include resolve method.

* subversion/bindings/swig/ruby/test/test_client.rb
  (SvnClientTest::assert_resolve, SvnClientTest::test_resolve_base,
   SvnClientTest::test_resolve_theirs_full,
   SvnClientTest::test_resolve_mine_full,
   SvnClientTest::test_resolve_theirs_conflict,
   SvnClientTest::test_resolve_mine_conflict,
   SvnClientTest::test_resolve_merged): New methods.

* subversion/bindings/swig/ruby/svn/client.rb
  (Svn::Client::Context.resolve): New method.

------------------------------------------------------------------------
r35028 | joeswatosh | 2009-01-05 08:09:09 +0100 (Mon, 05 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/bindings/swig/ruby/test/test_client.rb

Before the fifth commit in SvnClientTest::assert_merge, use revert and resolve
to put the wc in the state it was in before tree conflict handling was merged
in.  Not sure if this is really the "right" solution, but it allows the
subsequent assertions to pass, too.

* subversion/bindings/swig/ruby/test/test_client.rb
  (SvnClientTest::assert_merge): Before the fifth merge, revert the prop
   changes on trunk, and resolve the trunk file to use the local mods.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r35034 | hwright | 2009-01-05 23:11:22 +0100 (Mon, 05 Jan 2009) | 3 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove Ruby bindings test failures item.  The tests are passing, as
    of r35028.

------------------------------------------------------------------------
r35035 | kameshj | 2009-01-06 11:39:11 +0100 (Tue, 06 Jan 2009) | 7 lines
Changed paths:
   M /trunk/tools/buildbot/slaves/ubuntu-x64

* tools/buildbot/slaves/ubuntu-x64
  Delete the spurious svn:mergeinfo property as per
  http://svn.haxx.se/dev/archive-2008-11/0532.shtml

Review by: pburba
           hwright

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r35037 | gstein | 2009-01-06 12:07:20 +0100 (Tue, 06 Jan 2009) | 1 line
Changed paths:
   M /trunk/TODO-1.6

axed!
------------------------------------------------------------------------
r35038 | kameshj | 2009-01-06 15:39:04 +0100 (Tue, 06 Jan 2009) | 9 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/Makefile.in
   M /branches/issue-2897-take2/TODO-1.6
   M /branches/issue-2897-take2/build/ac-macros/berkeley-db.m4
   M /branches/issue-2897-take2/configure.ac
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/svn/client.rb
   M /branches/issue-2897-take2/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/issue-2897-take2/subversion/include/svn_fs.h
   M /branches/issue-2897-take2/subversion/include/svn_repos.h
   M /branches/issue-2897-take2/subversion/libsvn_diff/diff.h
   M /branches/issue-2897-take2/subversion/libsvn_diff/diff_file.c
   M /branches/issue-2897-take2/subversion/libsvn_diff/diff_memory.c
   M /branches/issue-2897-take2/subversion/libsvn_diff/util.c
   M /branches/issue-2897-take2/subversion/libsvn_fs/fs-loader.c
   M /branches/issue-2897-take2/subversion/libsvn_fs/fs-loader.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/lock.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/structure
   M /branches/issue-2897-take2/subversion/libsvn_repos/fs-wrap.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/log.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/tree_conflicts.h
   M /branches/issue-2897-take2/subversion/po/pl.po
   M /branches/issue-2897-take2/subversion/svnadmin/main.c
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs_fs/fs-pack-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64
   M /branches/issue-2897-take2/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh

On issue-2897-take2:

Merge from ^/trunk revisions r34013 through r35037.

Resolving 'prop svn:mergeinfo conflict on tools/buildbot/slaves/ubuntu-x64' by 
deleting the property itself as that was the intension on
the merge source(^/trunk) and the local conflicting change served *no* useful
purpose and caused by the last synch up commit(r35013).

------------------------------------------------------------------------
r35039 | cmpilato | 2009-01-06 16:19:55 +0100 (Tue, 06 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_fs_base/fs-base-test.c

* tests/libsvn_fs_base/fs-base-test.c
  (orphaned_textmod_change): Add a comment explaining why we have this
    test at all, given that it violates the API rules.

Suggested by: glasser
------------------------------------------------------------------------
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 <damien.deville@netasq.com>

* 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.
------------------------------------------------------------------------
r35041 | pburba | 2009-01-06 16:53:24 +0100 (Tue, 06 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

*STATUS: Nominate r35040.
------------------------------------------------------------------------
r35042 | rhuijben | 2009-01-06 16:59:35 +0100 (Tue, 06 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast vote on r35040.
------------------------------------------------------------------------
r35043 | cmpilato | 2009-01-06 17:09:37 +0100 (Tue, 06 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Vote for, approving, r35040.
------------------------------------------------------------------------
r35044 | cmpilato | 2009-01-06 17:11:05 +0100 (Tue, 06 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/mergeinfo.c

Minor optimization to mergeinfo parsing.

* subversion/libsvn_subr/mergeinfo.c
  (parse_pathname): Avoid unnecessary reallocation by simply creating
    a stringbuf fully in a single step.

------------------------------------------------------------------------
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 <fabien{_AT_}coelho.net>
------------------------------------------------------------------------
r35046 | stsp | 2009-01-06 17:29:31 +0100 (Tue, 06 Jan 2009) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add #3354 as blocker.

------------------------------------------------------------------------
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 <cafoote{_AT_}yahoo.com>
          (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.

------------------------------------------------------------------------
r35056 | stylesen | 2009-01-07 11:48:57 +0100 (Wed, 07 Jan 2009) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove cmdline prompt in gnome_keyring handler from 1.6 blocker.

------------------------------------------------------------------------
r35057 | kameshj | 2009-01-07 13:30:20 +0100 (Wed, 07 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28507 from ^/branches/issue-2897

------------------------------------------------------------------------
r35058 | stylesen | 2009-01-07 13:46:55 +0100 (Wed, 07 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider): Set application
   name in all GNOME Keyring providers since these are public APIs.

------------------------------------------------------------------------
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.

------------------------------------------------------------------------
r35061 | kameshj | 2009-01-07 14:18:12 +0100 (Wed, 07 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28508 from ^/branches/issue-2897

------------------------------------------------------------------------
r35062 | kameshj | 2009-01-07 15:19:23 +0100 (Wed, 07 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28509 from ^/branches/issue-2897

------------------------------------------------------------------------
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'

------------------------------------------------------------------------
r35065 | julianfoad | 2009-01-07 18:45:49 +0100 (Wed, 07 Jan 2009) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add an item.
------------------------------------------------------------------------
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.

[[[[ clynbech ]]]]
------------------------------------------------------------------------
r35067 | hwright | 2009-01-08 00:36:45 +0100 (Thu, 08 Jan 2009) | 5 lines
Changed paths:
   A /trunk/subversion/libsvn_wc/wc-metadata.sql (from /trunk/subversion/libsvn_wc/wc-metadata.sql3:35065)
   D /trunk/subversion/libsvn_wc/wc-metadata.sql3

* subversion/libsvn_wc/wc-metadata.sql3: Rename from this...
* subversion/libsvn_wc/wc-metadata.sql: ...to this to help various
    syntax-highlighting tools.  Also add a note that this is intended for
    SQLite 3.

------------------------------------------------------------------------
r35068 | hwright | 2009-01-08 01:30:32 +0100 (Thu, 08 Jan 2009) | 12 lines
Changed paths:
   M /branches/1.4.x
   M /branches/1.4.x/STATUS
   M /branches/1.4.x/subversion/libsvn_fs_base/fs.c

Not that I think we're ever going to release another 1.4.x, but for
completeness' sake:

Merge r34653, r34656 from trunk:

 * r34653, r34656
   Don't autoupgrade ancient BDB filesystems to 1.5 or 1.4 format.
   Justification:
     Small fix, but avoids confusing/surprising users.
   Votes:
     +1: hwright, cmpilato, pburba

------------------------------------------------------------------------
r35069 | neels | 2009-01-08 03:14:05 +0100 (Thu, 08 Jan 2009) | 4 lines
Changed paths:
   M /branches/svnraisetc/subversion/svnraisetreeconflict/main.c

On branch svnraisetc:
* subversion/svnraisetreeconflict/main.c: Comments.


------------------------------------------------------------------------
r35070 | neels | 2009-01-08 04:07:38 +0100 (Thu, 08 Jan 2009) | 9 lines
Changed paths:
   M /branches/svnraisetc/build.conf
   A /branches/svnraisetc/contrib/client-side/svnraisetreeconflict (from /branches/svnraisetc/subversion/svnraisetreeconflict:35068)
   R /branches/svnraisetc/contrib/client-side/svnraisetreeconflict/main.c (from /branches/svnraisetc/subversion/svnraisetreeconflict/main.c:35069)
   D /branches/svnraisetc/subversion/svnraisetreeconflict

On branch svnraisetc: Move svnraisetreeconflict to contrib.

* subversion/svnraisetreeconflict/main.c: Move this file...
* contrib/client-side/svnraisetreeconflict/main.c: ...here.

* build.conf:
    Apply path change of svnraisetreeconflict, change "install" to
    "contrib" and move the build description to the bottom of the file.

------------------------------------------------------------------------
r35071 | neels | 2009-01-08 04:19:27 +0100 (Thu, 08 Jan 2009) | 6 lines
Changed paths:
   M /branches/svnraisetc/contrib/client-side/svnraisetreeconflict/main.c

On branch svnraisetc:

* contrib/client-side/svnraisetreeconflict/main.c:
    Add comments about how to build and install.


------------------------------------------------------------------------
r35072 | cauchy | 2009-01-08 08:58:31 +0100 (Thu, 08 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/po/zh_CN.po

Simplified chinese translation update.

* subversion/po/zh_CN.po: Update to r35067, translate new strings.

------------------------------------------------------------------------
r35073 | kameshj | 2009-01-08 13:01:17 +0100 (Thu, 08 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28523 from ^/branches/issue-2897

------------------------------------------------------------------------
r35074 | julianfoad | 2009-01-08 13:51:02 +0100 (Thu, 08 Jan 2009) | 2 lines
Changed paths:
   M /branches/svnraisetc/contrib/client-side/svnraisetreeconflict

* contrib/client-side/svnraisetreeconflict:
  Delete an unwanted svn:mergeinfo property.
------------------------------------------------------------------------
r35075 | kameshj | 2009-01-08 14:36:36 +0100 (Thu, 08 Jan 2009) | 7 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28524 from ^/branches/issue-2897

Resolved spurious conflict(due to huge displacement and the kind of diff
segment) on 'subversion/tests/cmdline/merge_tests.py'

------------------------------------------------------------------------
r35076 | kameshj | 2009-01-08 15:10:20 +0100 (Thu, 08 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28526 and r28527 from ^/branches/issue-2897

------------------------------------------------------------------------
r35077 | julianfoad | 2009-01-08 15:30:01 +0100 (Thu, 08 Jan 2009) | 2 lines
Changed paths:
   M /trunk/subversion/include/svn_auth.h

* subversion/include/svn_auth.h
  In doc strings, say 'Set ... to' rather than 'Return ...'.
------------------------------------------------------------------------
r35078 | julianfoad | 2009-01-08 16:01:50 +0100 (Thu, 08 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/include/svn_auth.h

Improve doc strings in the svn_auth API.

* subversion/include/svn_auth.h
  Move the descriptions of how callbacks are called to the functions that
  call them. Be clearer about what happens if a callback is not provided.
  Add '###' marks where info is missing.

------------------------------------------------------------------------
r35079 | julianfoad | 2009-01-08 16:19:14 +0100 (Thu, 08 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/include/svn_cmdline.h

* subversion/include/svn_cmdline.h
  (svn_cmdline_auth_plaintext_prompt,
   svn_cmdline_auth_plaintext_passphrase_prompt,
   svn_cmdline_auth_unlock_prompt): State the type of the 'baton' parameter.
------------------------------------------------------------------------
r35080 | julianfoad | 2009-01-08 16:45:19 +0100 (Thu, 08 Jan 2009) | 10 lines
Changed paths:
   A /trunk/contrib/hook-scripts/require-mergeinfo.pl
   M /trunk/www/tools_contrib.html

Add a contributed hook script.

Patch by: John Gardiner Myers <jgmyers{_AT_}proofpoint.com>

* contrib/hook-scripts/require-mergeinfo.pl
  New hook script.

* www/tools_contrib.html
  (hook_scripts): Document it.

------------------------------------------------------------------------
r35081 | julianfoad | 2009-01-08 16:53:42 +0100 (Thu, 08 Jan 2009) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Change the description of the dirent_uri issue.
------------------------------------------------------------------------
r35082 | julianfoad | 2009-01-08 16:58:45 +0100 (Thu, 08 Jan 2009) | 2 lines
Changed paths:
   A /branches/issue-3334-dirs (from /trunk:35081)

* branches/issue-3334-dirs
  New branch for directories part of issue #3334, tree conflicts on update.
------------------------------------------------------------------------
r35083 | pburba | 2009-01-08 17:21:08 +0100 (Thu, 08 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/main.py

Follow-up to r34863, fix test suite when using Python < 2.4 on Windows.

* subversion/tests/cmdline/svntest/main.py
  (open_pipe): r34863 started quoting *both* the command and the arguments
  passed to Popen3() or os.popen3, but on Windows at least, these methods
  won't work if the command is quoted.  Returning to the pre-r34863 behavior
  of quoting only the arguments.
------------------------------------------------------------------------
r35084 | blair | 2009-01-08 19:49:12 +0100 (Thu, 08 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/include/svn_io.h

* subversion/include/svn_io.h:
  Documentation indentation tweak.

------------------------------------------------------------------------
r35085 | gstein | 2009-01-08 22:16:49 +0100 (Thu, 08 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Revamp the tables based on some discussion with hwright.

* subversion/libsvn_wc/wc-metadata.sql:
  (REPOSITORY, WORKING_COPY, DIRECTORY, PROPERTIES): deleted
  (WCROOT): new table to record multiple wcroots when the metadata is in a
    shared location.
  (NODE): identify by path relative to the wcroot (local_relpath) rather
    than as a directory/filename pair. each node can also specify its
    location in a repository, and that repository's uuid. the working_size
    field can be NULL for directories. add a properties blob.

------------------------------------------------------------------------
r35086 | hwright | 2009-01-08 22:25:09 +0100 (Thu, 08 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Followup to r35085: Remove another properties-related table in favor of BLOB
column in yet another table.

* subversion/libsvn_wc/wc-metadata.sql
  (NODE_CHANGES): Add new_properties column.
  (PROPERTIES_CHANGES): Remove.

------------------------------------------------------------------------
r35087 | gstein | 2009-01-08 22:29:16 +0100 (Thu, 08 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

More tweaks to the schema.

* subversion/libsvn_wc/wc-metadata.sql:
  (WCROOT): local_abspath is NOT NULL. we simply will not insert a row if
    the metadata is stored within the root.
  (NODE): allow NULL for the wc_id, implying the metadata is at the
    wcroot. add a parent_id so that we can easily fetch all child nodes of
    a given node.
  (I_PATH): update columns for the path-based lookup index
  (I_NODELIST): renamed to ...
  (I_PARENT): ... this, and the column fixed.

------------------------------------------------------------------------
r35088 | jerenkrantz | 2009-01-08 23:00:00 +0100 (Thu, 08 Jan 2009) | 25 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/log.c
   M /trunk/subversion/svn/cl.h
   M /trunk/subversion/svn/log-cmd.c
   M /trunk/subversion/svn/main.c

Have 'svn log' take multiple revs options to optimize session usage.

Incorporates suggestions from Hyrum and C-Mike.

* subversion/include/svn_client.h
  (svn_client_log5): New log variant that takes a set of ranges.
  (svn_client_log4): Deprecate.
* subversion/libsvn_client/deprecated.c
  (svn_client_log4): Wrap log5.
* subversion/libsvn_client/log.c
  (limit_receiver_baton_t): Struct for limit receiver.
  (limit_receiver): Simple receiver to intercept limits when using multiple rev
  args.
  (svn_client_log4): Rename to...
  (svn_client_log5): this; take array of revisions and loop logs; moves some
  of the checking that the client did into here; optimize session-opening.
* subversion/svn/log-cmd.c
  (svn_cl__log): Prevent -c combined with -r; use svn_client_log5;
  move manipulation of unspecified ranges into svn_client_log5.
* subversion/svn/cl.h
  (svn_cl__opt_state_t): Add used_revision_arg.
* subversion/svn/main.c
  (main): Permit log to have multiple revs; set used_revision_arg if 'r' passed.
  (svn_cl__cmd_table): Update help description for log.

------------------------------------------------------------------------
r35089 | jerenkrantz | 2009-01-08 23:25:30 +0100 (Thu, 08 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/log_tests.py

Follow-up to r35088, mark an XFAIL as something that should now pass.

* subversion/tests/cmdline/log_tests.py: log_changes_list should now work.

------------------------------------------------------------------------
r35090 | gstein | 2009-01-08 23:39:45 +0100 (Thu, 08 Jan 2009) | 19 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Continued changes to the schema.

* subversion/libsvn_wc/wc-metadata.sql:
  (NODE): renamed to ...
  (BASE_NODE): ... this to indicate this table contains *only* nodes in
    the BASE tree. remove the working_size field (now in ACTUAL_NODE).
  (I_PATH, I_PARENT, I_LOCKS): update table name
  (NODE_CHANGES): renamed to ...
  (WORKING_NODE): ... this to indicate nodes in the WORKING tree. add a
    wc_id/local_relpath pair to locate nodes. remove the status field, as
    we can always derive the status (add doc for that). rename original_*
    to copyfrom_*. add moved_from/to to indicate the node is the target of
    a move operation. remove working_size, and rename new_properties to
    properties. move conflict_* and prop_reject to ACTUAL.
  (I_PATH_CHANGES): renamed to ...
  (I_PATH_WORKING): ... this, and columns updated.
  (I_NODELIST_CHANGES): removed
  (ACTUAL_NODE): new table to represent nodes in the ACTUAL tree.

------------------------------------------------------------------------
r35091 | gstein | 2009-01-09 00:04:16 +0100 (Fri, 09 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Final tweaks (for now).

* subversion/libsvn_wc/wc-metadata.sql:
  (LOCKS): new table to hold info about locks in the repository
  (I_LOCKS): removed
  (CHANGELIST): allow wc_id to be NULL
  (LOCKS): new table to cache repository locks

------------------------------------------------------------------------
r35092 | hwright | 2009-01-09 00:17:35 +0100 (Fri, 09 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
  Followup to r35088: Update the expected help text for log.

------------------------------------------------------------------------
r35093 | pburba | 2009-01-09 00:30:22 +0100 (Fri, 09 Jan 2009) | 14 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/main.py

Follow-up to r34863, stop deadlocks when running test suite in parallel.

* subversion/tests/cmdline/svntest/main.py
  (open_pipe): Return to pre-r34863 duties of pipe creationg with Popen3()
  or os.popen3 for Python < 2.4.  Move the subprocess code to...
  (open_pipe2): ...here.  Accept pipe args so we can more easily redirect
  output from one subprocess to another.
  (wait_on_pipe): Return to pre-r34863 duties working with a pipe created
  with Popen3() or os.popen3 for Python < 2.4.  Move the subprocess pipe
  code to...
  (wait_on_pipe2) ...here.  Use subprocess.communicate() rather than
  subprocess.wait() to avoid deadlocks.
  (spawn_process, copy_repos): Use open_pipe2() and wait_on_pipe2() if we
  can, otherwise fall back to open_pipe() and wait_on_pipe().
------------------------------------------------------------------------
r35094 | neels | 2009-01-09 00:45:40 +0100 (Fri, 09 Jan 2009) | 8 lines
Changed paths:
   M /trunk/build.conf

Fix some tools' install group from "contrib" to "tools".

* build.conf
  (diff, diff3, diff4, svnauthz-validate):
    Change to "install = tools", since these are located in the
    tools folder.


------------------------------------------------------------------------
r35095 | gstein | 2009-01-09 01:03:51 +0100 (Fri, 09 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Fix some comments, shift the expected ACTUAL size into the BASE and
WORKING nodes (as before).

* subversion/libsvn_wc/wc-metadata.sql:
  (BASE_NODE): add translated_size field. mark properties as NOT NULL.
  (WORKING_NODE): add parent_relpath for aggregating children. add
    translated_size. mark properties as NOT NULL.
  (I_PATH_WORKING): renamed to ...
  (I_WORKING_PATH): ... this.
  (I_WORKING_PARENT): new index on parent_relpath
  (ACTUAL_NODE): remove size field.

------------------------------------------------------------------------
r35096 | neels | 2009-01-09 01:11:58 +0100 (Fri, 09 Jan 2009) | 12 lines
Changed paths:
   M /trunk/build.conf
   D /trunk/contrib/client-side/svnmucc
   A /trunk/tools/client-side/svnmucc (from /trunk/contrib/client-side/svnmucc:35094)

Move svnmucc from contrib to tools.
See also this thread:
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1011833
Subject: Re: build.conf: tools vs. contrib mix up
Date: 2009-01-08 07:22:21 PST

* contrib/client-side/svnmucc: Move this directory...
* tools/client-side/svnmucc: ...here

* build.conf (svnmucc): Change path accordingly.


------------------------------------------------------------------------
r35097 | gstein | 2009-01-09 01:22:34 +0100 (Fri, 09 Jan 2009) | 2 lines
Changed paths:
   M /trunk/notes/wc-ng-design

* notes/wc-ng-design: add some notes on our near-term coding plan

------------------------------------------------------------------------
r35098 | gstein | 2009-01-09 02:42:00 +0100 (Fri, 09 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Bring back the REPOSITORY table, and make additional changes.

* subversion/libsvn_wc/wc-metadata.sql:
  (REPOSITORY): new table to create repository 
  (BASE_NODE): replace url/uuid with repos_id/repos_relpath. add
    incomplete_children flag.
  (WORKING_NODE): add depth and last_mod_time fields.

------------------------------------------------------------------------
r35099 | gstein | 2009-01-09 03:14:04 +0100 (Fri, 09 Jan 2009) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

* subversion/libsvn_wc/wc-metadata.sql: add comments

------------------------------------------------------------------------
r35100 | kameshj | 2009-01-09 09:18:35 +0100 (Fri, 09 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28528 from ^/branches/issue-2897

------------------------------------------------------------------------
r35101 | julianfoad | 2009-01-09 09:21:33 +0100 (Fri, 09 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.py

Extend some tree-conflict "update" tests to test "switch" as well.

* subversion/tests/cmdline/tree_conflict_tests.py
  (ensure_tree_conflict): Add support for "switch".
  (test_tc_up_sw): Test "switch" after testing "update".

------------------------------------------------------------------------
r35102 | julianfoad | 2009-01-09 09:22:40 +0100 (Fri, 09 Jan 2009) | 14 lines
Changed paths:
   M /trunk/subversion/include/svn_base64.h
   M /trunk/subversion/libsvn_subr/svn_base64.c

Remove a (new, unused) function from public view.

* subversion/include/svn_base64.h
  (svn_base64_from_checksum): Remove from here. This function was new in 1.6
    but unused. It was a high-level function that knew about base64 and
    about svn_checksum_t. It had peculiarities: using svn_stringbuf_t when
    the other base64 functions use svn_string_t (or svn_stream_t); having no
    svn_checksum_from_base64() counterpart.

* subversion/libsvn_subr/svn_base64.c
  (svn_base64_from_checksum): Make it "static".  This is now only used as the
    new implementation of svn_base64_from_md5(), and it would probably be
    safer to revert that to its old implementation.

------------------------------------------------------------------------
r35103 | julianfoad | 2009-01-09 11:04:35 +0100 (Fri, 09 Jan 2009) | 56 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_delta/text_delta.c
   M /trunk/subversion/libsvn_fs/fs-loader.c
   M /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
   M /trunk/subversion/libsvn_fs_base/bdb/dbt.c
   M /trunk/subversion/libsvn_fs_base/dag.c
   M /trunk/subversion/libsvn_fs_base/reps-strings.c
   M /trunk/subversion/libsvn_fs_base/tree.c
   M /trunk/subversion/libsvn_fs_base/util/fs_skels.c
   M /trunk/subversion/libsvn_fs_fs/dag.c
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c
   M /trunk/subversion/libsvn_fs_fs/tree.c
   M /trunk/subversion/libsvn_subr/checksum.c
   M /trunk/subversion/libsvn_subr/io.c
   M /trunk/subversion/libsvn_subr/stream.c
   M /trunk/subversion/libsvn_subr/svn_base64.c
   M /trunk/subversion/libsvn_wc/adm_crawler.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/libsvn_delta/window-test.c

In the "checksums" API, make the svn_checksum_t type opaque to help make
future extensions easier, and introduce accessor functions:
  svn_checksum_get_kind()
  svn_checksum_get_size() (replacing svn_checksum_size())
  svn_checksum_get_digest()
to replace direct access.

Make the constructor "svn_checksum__from_digest()" public as well by
renaming it to "svn_checksum_from_digest()", because it is the logical
complement of the "get" accessors.

* subversion/include/svn_checksum.h,
  subversion/libsvn_subr/checksum.c
  (svn_checksum_t): Move the definition from the header to the source file,
    leaving just a declaration in the header. Make the "digest" field
    non-const and remove all the type casts that were used to write to it
    throughout the rest of this source file.
  (svn_checksum_size): Rename to ...
  (svn_checksum_get_size): ... this and add "const" on the input parameter.
  (svn _checksum_get_kind, svn_checksum_get_digest): New functions.
  (svn_checksum__from_digest): Rename to ...
  (svn_checksum_from_digest): ... this.

* subversion/libsvn_client/commit.c,
  subversion/libsvn_client/commit_util.c,
  subversion/libsvn_client/export.c,
  subversion/libsvn_delta/text_delta.c,
  subversion/libsvn_fs_base/bdb/checksum-reps-table.c,
  subversion/libsvn_fs_base/bdb/dbt.c,
  subversion/libsvn_fs_base/dag.c,
  subversion/libsvn_fs_base/reps-strings.c,
  subversion/libsvn_fs_base/tree.c,
  subversion/libsvn_fs_base/util/fs_skels.c,
  subversion/libsvn_fs_fs/dag.c,
  subversion/libsvn_fs_fs/fs_fs.c,
  subversion/libsvn_fs/fs-loader.c,
  subversion/libsvn_fs_fs/rep-cache.c,
  subversion/libsvn_fs_fs/tree.c,
  subversion/libsvn_subr/io.c,
  subversion/libsvn_subr/stream.c,
  subversion/libsvn_wc/adm_crawler.c,
  subversion/libsvn_wc/adm_ops.c,
  subversion/libsvn_wc/update_editor.c
    Adjust for the renaming of svn_checksum__from_digest().
    Use the accessor functions instead of direct access.

* subversion/libsvn_subr/svn_base64.c
  (svn_base64_from_checksum):
    Use the accessor functions instead of direct access.
  (svn_base64_from_md5): Use svn_checksum__from_digest to simplify and avoid
    direct write access to a checksum.

* subversion/tests/libsvn_delta/window-test.c
  (stream_window_test): Use svn_checksum_from_digest() to simplify and avoid
    direct write access to a checksum.

------------------------------------------------------------------------
r35104 | julianfoad | 2009-01-09 11:12:16 +0100 (Fri, 09 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/dag.c
   M /trunk/subversion/libsvn_fs_base/dag.h
   M /trunk/subversion/libsvn_fs_fs/dag.c
   M /trunk/subversion/libsvn_fs_fs/dag.h

Add "const" to some private API input pointers.

* subversion/libsvn_fs_base/dag.h,
  subversion/libsvn_fs_base/dag.c
  (svn_fs_base__dag_finalize_edits): 
    Make the checksum argument "const".

* subversion/libsvn_fs_fs/dag.h,
  subversion/libsvn_fs_fs/dag.c
  (svn_fs_fs__dag_finalize_edits):
    Make the checksum argument "const".

------------------------------------------------------------------------
r35105 | kameshj | 2009-01-09 11:12:43 +0100 (Fri, 09 Jan 2009) | 7 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28555 from ^/branches/issue-2897

Resolved logical conflict on 'subversion/tests/cmdline/merge_tests.py'
and locally injected change to reflect the current state of trunk.

------------------------------------------------------------------------
r35106 | julianfoad | 2009-01-09 12:50:48 +0100 (Fri, 09 Jan 2009) | 9 lines
Changed paths:
   M /trunk/www/faq.html
   M /trunk/www/tools_contrib.html

Update a FAQ entry and a Tools-and-Contrib entry.

* www/faq.html
  (sorry-no-globbing): Update, now that v1.5 supports multiple sources in
    move and copy commands.

* www/tools_contrib.html
  (svnmucc_c): Update, following the move of this tool in r35096.

------------------------------------------------------------------------
r35107 | kameshj | 2009-01-09 12:58:57 +0100 (Fri, 09 Jan 2009) | 7 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28557 from ^/branches/issue-2897

Resolved physical/logical conflict on
'subversion/tests/cmdline/merge_tests.py'.

------------------------------------------------------------------------
r35108 | kameshj | 2009-01-09 13:16:19 +0100 (Fri, 09 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28581 from ^/branches/issue-2897

------------------------------------------------------------------------
r35109 | kameshj | 2009-01-09 13:34:50 +0100 (Fri, 09 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28582 from ^/branches/issue-2897

------------------------------------------------------------------------
r35110 | kameshj | 2009-01-09 13:54:53 +0100 (Fri, 09 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 r28583 from ^/branches/issue-2897

Resolved conflicts on subversion/tests/cmdline/merge_tests.py

------------------------------------------------------------------------
r35111 | kameshj | 2009-01-09 14:19:51 +0100 (Fri, 09 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 r28621 from ^/branches/issue-2897

Resolved conflicts on subversion/tests/cmdline/merge_tests.py

------------------------------------------------------------------------
r35112 | stylesen | 2009-01-09 15:09:58 +0100 (Fri, 09 Jan 2009) | 21 lines
Changed paths:
   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 r35055.

* subversion/libsvn_subr/cmdline.c
  (svn_cmdline_create_auth_baton): For platform specific providers pass prompt
   function.
* subversion/libsvn_subr/auth.c
  (svn_auth_get_platform_specific_provider): Change signature and include logic
   to accept prompt function and a boolean to indicate whether we are called
   from command line.
  (svn_auth_get_platform_specific_client_providers): Same as above.
* subversion/include/svn_auth.h
  (svn_auth_get_platform_specific_provider): Reflect above changes.
  (svn_auth_get_platform_specific_client_providers): Reflect above changes.
* subversion/tests/libsvn_subr/auth-test.c
  (test_platform_specific_auth_providers): Modify to accomodate above changes.

Suggested by: rhuijben
              arfrever
              julianfoad
              hwright

------------------------------------------------------------------------
r35113 | stylesen | 2009-01-09 15:49:53 +0100 (Fri, 09 Jan 2009) | 10 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_subr/auth-test.c

Follow up r35112.

* subversion/tests/libsvn_subr/auth-test.c
  (test_platform_specific_auth_providers): Pass required parameters for prompt
   baton, prompt function and command line option for keychain services and
   windows, since they are added in r35112 which broke the build in these
   platforms.

Found by: markphip

------------------------------------------------------------------------
r35114 | stylesen | 2009-01-09 16:05:31 +0100 (Fri, 09 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

Follow up r35112.

* subversion/bindings/javahl/native/SVNClient.cpp
  (getContext): Pass required parameters for prompt baton, prompt function
   and command line option for JavaHL, since they are added in r35112 which
   broke the JavaHL builds.

------------------------------------------------------------------------
r35115 | julianfoad | 2009-01-09 16:21:26 +0100 (Fri, 09 Jan 2009) | 9 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_delta/text_delta.c
   M /trunk/subversion/libsvn_fs/fs-loader.c
   M /trunk/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
   M /trunk/subversion/libsvn_fs_base/bdb/dbt.c
   M /trunk/subversion/libsvn_fs_base/dag.c
   M /trunk/subversion/libsvn_fs_base/reps-strings.c
   M /trunk/subversion/libsvn_fs_base/tree.c
   M /trunk/subversion/libsvn_fs_base/util/fs_skels.c
   M /trunk/subversion/libsvn_fs_fs/dag.c
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c
   M /trunk/subversion/libsvn_fs_fs/tree.c
   M /trunk/subversion/libsvn_subr/checksum.c
   M /trunk/subversion/libsvn_subr/io.c
   M /trunk/subversion/libsvn_subr/stream.c
   M /trunk/subversion/libsvn_subr/svn_base64.c
   M /trunk/subversion/libsvn_wc/adm_crawler.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/libsvn_delta/window-test.c

Revert r35103 because making the svn_checksum_t type opaque was unnecessary
obstruction, as suggested by gstein in the email thread
<http://svn.haxx.se/dev/archive-2009-01/0226.shtml>.

The log message of r35103 was:
  In the "checksums" API, make the svn_checksum_t type opaque to help make
  future extensions easier, and introduce accessor functions [...]
  Make the constructor "svn_checksum__from_digest()" public [...]

------------------------------------------------------------------------
r35116 | stylesen | 2009-01-09 16:40:54 +0100 (Fri, 09 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/auth.c

Follow up r35112.

* subversion/libsvn_subr/auth.c
  (svn_auth_get_platform_specific_provider): Remove a redundant else block.

------------------------------------------------------------------------
r35117 | julianfoad | 2009-01-09 16:59:28 +0100 (Fri, 09 Jan 2009) | 10 lines
Changed paths:
   M /trunk/contrib/hook-scripts/require-mergeinfo.pl

* contrib/hook-scripts/require-mergeinfo.pl
  Add a licensing comment, as agreed by John Gardiner Myers in an email to
  me on 2009-01-08:
    [[[
    Julian Foad wrote:
    > Would you be happy for it to have the same licence as Subversion, as
    > most of the other contributed hook scripts do?
    I don't think the script is particularly copyrightable, but sure.
    ]]]

------------------------------------------------------------------------
r35118 | cmpilato | 2009-01-09 17:08:15 +0100 (Fri, 09 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/error.c

* subversion/libsvn_subr/error.c
  (err_abort): Move a line aimed at preventing one kind of compiler warning
    so that its location doesn't create yet another type of warning.

------------------------------------------------------------------------
r35119 | cmpilato | 2009-01-09 17:10:49 +0100 (Fri, 09 Jan 2009) | 1 line
Changed paths:
   A /branches/issue-3148-dev (from /trunk:35118)

Create a branch for addressing issue #3148.
------------------------------------------------------------------------
r35120 | hwright | 2009-01-09 17:11:33 +0100 (Fri, 09 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

JavaHL: Use the new client log API.  This will bubble up to the Java API
shortly.

* subversion/bindings/javahl/native/SVNClient.cpp
  (logMessages): Convert the incoming start and end revisions to the
    appropriate datatype expected by svn_client_log5().

------------------------------------------------------------------------
r35121 | cmpilato | 2009-01-09 17:15:03 +0100 (Fri, 09 Jan 2009) | 23 lines
Changed paths:
   M /branches/issue-3148-dev/subversion/include/svn_error_codes.h
   M /branches/issue-3148-dev/subversion/include/svn_wc.h
   M /branches/issue-3148-dev/subversion/libsvn_client/externals.c
   M /branches/issue-3148-dev/subversion/svn/notify.c

On the 'issue-3148-dev' branch:  Begin the work of gracefully handling
errors which occur while processing externals definitions.

NOTE:  Does not pass the test suite.

NOTE:  Also does not queue up errors for summarization at the end of
       the operation.

* subversion/include/svn_wc.h
  (svn_wc_notify_failed_external): New notification type.
  (svn_wc_notify_t.err): Update comment.

* subversion/include/svn_error_codes.h
  (SVN_ERR_CL_FAILED_EXTERNALS_CHANGE): New error code.

* subversion/svn/notify.c
  (notify): Handle new notification type.

* subversion/libsvn_client/externals.c
  (handle_external_item_change_wrapper): New helper function.
  (handle_externals_desc_change): Call handle_external_item_change_wrapper()
    instead of handle_external_item_change() directly.

------------------------------------------------------------------------
r35122 | hwright | 2009-01-09 17:33:57 +0100 (Fri, 09 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_client/deprecated.c

* subversion/libsvn_client/deprecated.c
  (svn_client_log4): Followup to r35088: Initialize the revision ranges
    array with size 1, since we know we're going to throw one range in it.

------------------------------------------------------------------------
r35123 | julianfoad | 2009-01-09 17:55:22 +0100 (Fri, 09 Jan 2009) | 2 lines
Changed paths:
   M /branches/issue-3334-dirs
   M /branches/issue-3334-dirs/build.conf
   D /branches/issue-3334-dirs/contrib/client-side/svnmucc
   M /branches/issue-3334-dirs/notes/wc-ng-design
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-3334-dirs/subversion/include/svn_auth.h
   M /branches/issue-3334-dirs/subversion/include/svn_base64.h
   M /branches/issue-3334-dirs/subversion/include/svn_client.h
   M /branches/issue-3334-dirs/subversion/include/svn_io.h
   M /branches/issue-3334-dirs/subversion/libsvn_client/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/dag.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/dag.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/dag.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/dag.h
   M /branches/issue-3334-dirs/subversion/libsvn_subr/auth.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/cmdline.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/svn_base64.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/wc-metadata.sql
   M /branches/issue-3334-dirs/subversion/svn/cl.h
   M /branches/issue-3334-dirs/subversion/svn/log-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/main.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/issue-3334-dirs/subversion/tests/cmdline/log_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/issue-3334-dirs/subversion/tests/libsvn_subr/auth-test.c
   A /branches/issue-3334-dirs/tools/client-side/svnmucc (from /trunk/tools/client-side/svnmucc:35115)
   R /branches/issue-3334-dirs/tools/client-side/svnmucc/svnmucc-test.py (from /trunk/tools/client-side/svnmucc/svnmucc-test.py:35115)
   R /branches/issue-3334-dirs/tools/client-side/svnmucc/svnmucc.c (from /trunk/tools/client-side/svnmucc/svnmucc.c:35115)
   M /branches/issue-3334-dirs/www/faq.html
   M /branches/issue-3334-dirs/www/tools_contrib.html

On the issue-3334-dirs branch: merge changes from trunk up to r35115.

------------------------------------------------------------------------
r35124 | cmpilato | 2009-01-09 18:05:29 +0100 (Fri, 09 Jan 2009) | 1 line
Changed paths:
   A /branches/issue-3148-dev/BRANCH-README

On the issue-3148-dev branch:  Add a BRANCH-README file.
------------------------------------------------------------------------
r35125 | pburba | 2009-01-09 19:06:03 +0100 (Fri, 09 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/update_tests.py

Add a test for issue #3354

* subversion/tests/cmdline/update_tests.py
  (update_moves_and_modifies_an_edited_file): New test.
  (test_list): Add update_moves_and_modifies_an_edited_file and set
  as XFail.

------------------------------------------------------------------------
r35126 | cmpilato | 2009-01-09 20:32:00 +0100 (Fri, 09 Jan 2009) | 17 lines
Changed paths:
   M /branches/issue-3148-dev/subversion/libsvn_client/externals.c
   M /branches/issue-3148-dev/subversion/svn/notify.c

On the 'issue-3148-dev' branch: Rework the way failed-externals
notification is done so that errors that happen before we official
start messing with the external working copy look a little different
than those that happen *while* processing the external working copy,
and to maximize the amount of useful error information we can print.

No, this still doesn't pass the test suite.

* subversion/svn/notify.c
  (notify): In the 'svn_wc_notify_failed_external' case, manage the
    nb->in_external flag appropriately, and print the detailed error
    (possible with another line that describes which external working
     copy had the problem).

* subversion/libsvn_client/externals.c
  (handle_external_item_change_wrapper): Clear the external error here.

------------------------------------------------------------------------
r35127 | cmpilato | 2009-01-09 20:57:25 +0100 (Fri, 09 Jan 2009) | 14 lines
Changed paths:
   M /branches/issue-3148-dev/subversion/include/svn_error_codes.h
   M /branches/issue-3148-dev/subversion/svn/notify.c

On the 'issue-3148-dev' branch: Remove the addition of a custom error
type that only ever gets passed off to a warning printer that couldn't
care less about the error type.

And, uh, no, this still doesn't pass the test suite.

* subversion/svn/notify.c
  (notify): In the 'svn_wc_notify_failed_external' case, generate the
    generic warning line with a generic error code.  Also, fix the
    warning prefix to include a trailing space.

* subversion/include/svn_error_codes.h
  (SVN_ERR_CL_FAILED_EXTERNALS_CHANGE): Remove as unused.

------------------------------------------------------------------------
r35128 | steveking | 2009-01-09 20:58:26 +0100 (Fri, 09 Jan 2009) | 2 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h

* subversion/include/svn_client.h
  (svn_client_log4): Mark as deprecated, reflecting its doc string.
------------------------------------------------------------------------
r35129 | hwright | 2009-01-09 21:41:26 +0100 (Fri, 09 Jan 2009) | 17 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp
   M /trunk/subversion/bindings/javahl/native/SVNClient.h
   M /trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java

JavaHL: Followup to r35120 by bubbling up the multiple range log interface
to Java.  This introduces a test failure, which I'm still debugging.

[ in subversion/bindings/javahl/ ]
* native/org_tigris_subversion_javahl_SVNClient.cpp
  (Java_org_tigris_subversion_javahl_SVNClient_logMessages): Update
    parameters, pass down to the C++ API.

* native/SVNClient.h
* native/SVNClient.cpp
  (logMessages): Update parameters and conversions to C types.

* src/org/tigris/subversion/javahl/SVNClient.java
* src/org/tigris/subversion/javahl/SVNClientSynchronized.java
* src/org/tigris/subversion/javahl/SVNClientInterface.java
  (logMessages): Rev API, create appropriate wrappers.

------------------------------------------------------------------------
r35130 | cmpilato | 2009-01-09 21:44:13 +0100 (Fri, 09 Jan 2009) | 6 lines
Changed paths:
   M /branches/issue-3148-dev/subversion/tests/cmdline/externals_tests.py

On the 'issue-3148-dev' branch: Make the test suite pass.

* subversion/tests/cmdline/externals_tests.py
  (old_style_externals_ignore_peg_reg, 
   can_place_file_external_into_dir_external): Expect new externals warnings.

------------------------------------------------------------------------
r35131 | cmpilato | 2009-01-09 21:47:45 +0100 (Fri, 09 Jan 2009) | 4 lines
Changed paths:
   M /trunk
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/externals.c
   M /trunk/subversion/svn/notify.c
   M /trunk/subversion/tests/cmdline/externals_tests.py

Merge all changes from the issue-3148-dev branch
(/branches/issue-3148-dev:r35119-35130), fixing issue #3148: Too early
svn up/co abort if one item of svn:externals resource list is not accessible.

------------------------------------------------------------------------
r35132 | cmpilato | 2009-01-09 21:48:50 +0100 (Fri, 09 Jan 2009) | 1 line
Changed paths:
   D /branches/issue-3148-dev

Remove obsolete (merged-to-trunk) issue-3148-dev branch.
------------------------------------------------------------------------
r35133 | gstein | 2009-01-09 22:02:51 +0100 (Fri, 09 Jan 2009) | 4 lines
Changed paths:
   M /trunk/notes/wc-ng-design

Add some recent thoughts/plans to the design document.

* notes/wc-ng-design: write more stuff

------------------------------------------------------------------------
r35134 | hwright | 2009-01-09 22:09:04 +0100 (Fri, 09 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java

JavaHL: Add a wrapper helper function.

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
  (logMessages, merge): Use helper.
  (toRevisionRange): New.

------------------------------------------------------------------------
r35135 | hwright | 2009-01-09 22:18:56 +0100 (Fri, 09 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

JavaHL: Properly interpret an unspecified revision when constructing a
revision range for log.  This was boneheadedly removed by yours truely
prior to committing this section in r35129.

* subversion/bindings/javahl/native/SVNClient.cpp
  (logMessages): Default to r1 if the revision start kind is unspecified.

------------------------------------------------------------------------
r35136 | hwright | 2009-01-09 23:06:13 +0100 (Fri, 09 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_client/mergeinfo.c

Remove the use of a deprecated function.

* subversion/libsvn_client/mergeinfo.c
  (logs_for_mergeinfo_rangelist): Use the newest log API.

[ Reverted in r35187. ]

------------------------------------------------------------------------
r35137 | hwright | 2009-01-09 23:18:22 +0100 (Fri, 09 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/props.c

Remove a bunch of dead code in the current libsvn_wc.  "Someday never comes,"
especially for dead code in the middle of a library rewrite. :)

* subversion/libsvn_wc/props.c:
  Hack, slash and burn.

------------------------------------------------------------------------
r35138 | julianfoad | 2009-01-10 08:54:17 +0100 (Sat, 10 Jan 2009) | 17 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py

On the issue-3334-dirs branch:
Check-point my work. This is not tested.

* subversion/libsvn_wc/update_editor.c
  (schedule_existing_item_for_re_add): New function, largely extracted from
    do_entry_deletion().
  (do_entry_deletion): When a tree conflict is due to a local edit, call
    schedule_existing_item_for_re_add().
    When a tree conflict is due to a local delete, instead of tweaking the
    entry's state manually to the new revision and "deleted" (which I don't
    think was right), fall through to the normal code path which carries out a
    deletion, as this should be able to handle this situation correctly.

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_2_1): Enable testing of one of the directory
    cases in this test. (This is test number 48.)

------------------------------------------------------------------------
r35139 | hwright | 2009-01-10 19:00:59 +0100 (Sat, 10 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/props.c

* subversion/libsvn_wc/props.c
  (svn_wc__loggy_revert_props_create): Just use a generic wc temp file to
    create the temp revert props file.

------------------------------------------------------------------------
r35140 | hwright | 2009-01-10 20:15:12 +0100 (Sat, 10 Jan 2009) | 17 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 a parameter to an internal function.  As of r32139, we're always passing
the same value for this paramter, so just nuke it (and simplify the function).

* subversion/libsvn_wc/props.c
  (load_props, install_props_file, svn_wc__install_props,
   svn_wc__working_props_comitted, svn_wc__props_last_modified,
   svn_wc__loggy_props_delete, svn_wc__props_delete,
   svn_wc__loggy_revert_props_create, svn_wc__loggy_revert_props_restore,
   empty_props_p, svn_wc_props_modified_p): Update callers.

* subversion/libsvn_wc/adm_files.c
  (svn_wc__prop_path): Remove tmp parameter.
  (svn_wc__write_old_wc_props): Update caller.

* subversion/libsvn_wc/adm_files.h
  (svn_wc__prop_path): Remove parameter, update docs.

------------------------------------------------------------------------
r35141 | hwright | 2009-01-10 22:20:51 +0100 (Sat, 10 Jan 2009) | 7 lines
Changed paths:
   M /trunk/www/links.html

Unilaterally, and with only tangential discussion on dev@, remove all the links
to Subversion hosting services.  We shouldn't be in the business of being a
search engine.

* www/links.html
  (hosting): Remove.

------------------------------------------------------------------------
r35142 | arfrever | 2009-01-10 22:35:42 +0100 (Sat, 10 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/main.py
   M /trunk/tools/dev/contribulyze.py
   M /trunk/tools/dev/mlpatch.py
   M /trunk/tools/dist/post-to-tigris.py
   M /trunk/tools/hook-scripts/mailer/mailer.py
   M /trunk/tools/server-side/svn_server_log_parse.py
   M /trunk/tools/server-side/test_svn_server_log_parse.py

Python 3 compatibility:
Update calls to urllib.*.

* subversion/tests/cmdline/svntest/main.py:
* tools/dev/contribulyze.py:
* tools/dev/mlpatch.py:
* tools/dist/post-to-tigris.py:
* tools/hook-scripts/mailer/mailer.py:
* tools/server-side/svn_server_log_parse.py:
* tools/server-side/test_svn_server_log_parse.py: Update calls to urllib.*.

------------------------------------------------------------------------
r35143 | rhuijben | 2009-01-11 00:54:46 +0100 (Sun, 11 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/basic_tests.py

Add XFail test to verify that it is not possible to add the .svn directory
to a working copy by using 'svn add --parents .svn/format'

* cmdline/basic_tests.py
  (basic_add_svn_format_file): Add test verifying that svn add-parents 
    .svn/format doesn't change the workingcopy.
  (test_list): Add basic_add_svn_format_file as XFail

------------------------------------------------------------------------
r35144 | rhuijben | 2009-01-11 14:14:59 +0100 (Sun, 11 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/include/svn_error.h

* subversion/include/svn_error.h
  (SVN_ERR_MALFUNCTION_NO_RETURN): Make the loop containing abort() run
    infinately to help compilers that don't recognize abort() behavior
    see that this code never returns.

------------------------------------------------------------------------
r35145 | rhuijben | 2009-01-11 15:06:31 +0100 (Sun, 11 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_client/add.c
   M /trunk/subversion/tests/cmdline/basic_tests.py

Resolve basic_tests.py basic_add_svn_format_file by checking on
administrative directory names before creating a workingcopy in directories.

* subversion/libsvn_client/add.c
  (add_parent_dirs): Move error clearing outside inner checks and check on
    administrative directory names before calling svn_wc_add3.

* subversion/tests/cmdline/basic_tests.py
  (basic_add_svn_format_file): Fix error output expectation.
  (test_list): Remove XFail marking from basic_add_svn_format_file.

------------------------------------------------------------------------
r35146 | rhuijben | 2009-01-11 15:11:59 +0100 (Sun, 11 Jan 2009) | 13 lines
Changed paths:
   M /trunk/subversion/include/svn_error_codes.h
   M /trunk/subversion/libsvn_wc/adm_ops.c

Following up on r35145 and r35143, block adding .svn directories to working
copy in svn_wc_add3.

This is a low level fix that should prevent other instances of the same error.
(Checking on reserved names belongs in the working copy library, not the client
 library)

* subversion/include/svn_error_codes.h
  (SVN_ERR_ENTRY_FORBIDDEN): Add new error.
* subversion/libsvn_wc/adm_ops.c
  (svn_wc_add3): Check for administrative directory names before
    adding entries to the working copy.

------------------------------------------------------------------------
r35147 | rhuijben | 2009-01-11 15:14:58 +0100 (Sun, 11 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_delta/compose_delta.c

* subversion/libsvn_delta/compose_delta.c
  (build_range_list): Replace assert() with SVN_ERR_MALFUNCTION_NO_RETURN()
    to remove warning on no return value.

------------------------------------------------------------------------
r35148 | rhuijben | 2009-01-11 15:24:59 +0100 (Sun, 11 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r35143, r35145
------------------------------------------------------------------------
r35149 | rhuijben | 2009-01-11 15:46:54 +0100 (Sun, 11 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_client/add.c

* subversion/libsvn_client/add.c
  (add_parent_dirs): Add space before if paren.
  
Found by: gstein

------------------------------------------------------------------------
r35150 | rhuijben | 2009-01-11 17:38:24 +0100 (Sun, 11 Jan 2009) | 17 lines
Changed paths:
   M /trunk/subversion/include/svn_dirent_uri.h
   M /trunk/subversion/libsvn_subr/dirent_uri.c
   M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c

Issue #2028: Add the svn_uri_dirname, svn_uri_basename, svn_uri_split, 
directory name parsing methods that were still missing from the new api.

* subversion/include/svn_dirent_uri.h
  (svn_dirent_basename): Remove reference to ignoring any trailing slashes as
    the passed dirent must be canonical.
  (svn_uri_basename): New function retrieving the basename from a uri.
  (svn_uri_dirname): New function retrieving the directory name from a uri.
* subversion/libsvn_subr/dirent_uri.c
  (uri_previous_segment): New helper to find the length of the previous 
    segment in a uri.
  (svn_uri_dirname, svn_uri_basename, svn_uri_split): New functions.
* subversion/tests/libsvn_subr/dirent_uri-test.c
  (test_uri_basename, test_uri_dirname, test_uri_split): New functions
    to test current behavior of the new functions.
  (test_funcs): Add the new functions.

------------------------------------------------------------------------
r35151 | rhuijben | 2009-01-11 17:56:33 +0100 (Sun, 11 Jan 2009) | 14 lines
Changed paths:
   M /trunk/subversion/include/svn_dirent_uri.h
   M /trunk/subversion/libsvn_subr/dirent_uri.c
   M /trunk/subversion/libsvn_subr/path.c
   M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c

Issue #2028: Add pool paramater to svn_uri_is_canonical to allow future
extension.

* subversion/include/svn_dirent_uri.h
  (svn_uri_dirname): Fix whitespace
  (svn_uri_is_canonical): Add pool parameter
* subversion/libsvn_subr/dirent_uri.c
  (svn_uri_dirname): Update call to svn_uri_is_canonical.
    (Also fixes compilation issue in r35149 for non release mode)
* subversion/libsvn_subr/path.c
  (svn_path_is_canonical): Pass pool to svn_uri_is_canonical
* subversion/tests/libsvn_subr/dirent_uri-test.c
  (test_uri_is_canonical): Pass pool to svn_uri_is_canonical

------------------------------------------------------------------------
r35152 | rhuijben | 2009-01-11 18:05:46 +0100 (Sun, 11 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/include/svn_dirent_uri.h

* subversion/include/svn_dirent_uri.h
  (svn_uri_split): Following up on r35150 add missing prototype for this
    function.

------------------------------------------------------------------------
r35153 | rhuijben | 2009-01-11 18:07:15 +0100 (Sun, 11 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_subr/dirent_uri-test.c

* subversion/tests/libsvn_subr/dirent_uri-test.c
  (test_uri_split): Test svn_uri_split instead of svn_dirent_split.

------------------------------------------------------------------------
r35154 | rhuijben | 2009-01-11 18:09:56 +0100 (Sun, 11 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

Remove more warnings introduced in r35150,r35151

* subversion/libsvn_subr/dirent_uri.c
  (svn_uri_split): Fix assertion to check the output parameters instead
    of input-output.

------------------------------------------------------------------------
r35155 | arfrever | 2009-01-11 19:44:23 +0100 (Sun, 11 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/main.py

Follow-up to r35093:
Don't normalize stdout line endings in text mode on Windows twice.

* subversion/tests/cmdline/svntest/main.py
  (wait_on_pipe2): Normalize stderr line endings in text mode on Windows.
  (_convert_windows_line_ending): Delete.
  (spawn_process): Don't use _convert_windows_line_ending().

------------------------------------------------------------------------
r35156 | arfrever | 2009-01-11 19:49:52 +0100 (Sun, 11 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/svn_base64.c

Follow-up to r35102:

* subversion/libsvn_subr/svn_base64.c
  (svn_base64_from_checksum): Rename to ...
  (base64_from_checksum): ... this.
  (svn_base64_from_md5): Update.

------------------------------------------------------------------------
r35157 | sussman | 2009-01-11 21:02:37 +0100 (Sun, 11 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/COPYING
   M /branches/http-protocol-v2/Makefile.in
   M /branches/http-protocol-v2/TODO-1.6
   M /branches/http-protocol-v2/build/ac-macros/berkeley-db.m4
   M /branches/http-protocol-v2/build/ac-macros/neon.m4
   M /branches/http-protocol-v2/build/generator/gen_base.py
   M /branches/http-protocol-v2/build/generator/gen_win.py
   M /branches/http-protocol-v2/build/run_tests.py
   M /branches/http-protocol-v2/build/win32/svn.rc
   M /branches/http-protocol-v2/build.conf
   M /branches/http-protocol-v2/configure.ac
   D /branches/http-protocol-v2/contrib/client-side/svnmucc
   A /branches/http-protocol-v2/contrib/hook-scripts/require-mergeinfo.pl (from /trunk/contrib/hook-scripts/require-mergeinfo.pl:35156)
   M /branches/http-protocol-v2/notes/wc-ng-design
   M /branches/http-protocol-v2/notes/webdav-proxy
   M /branches/http-protocol-v2/packages/windows-innosetup/Pre.rtf
   M /branches/http-protocol-v2/packages/windows-innosetup/svn.iss
   M /branches/http-protocol-v2/subversion/LICENSE
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/test/wc.py
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNClient.h
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
   M /branches/http-protocol-v2/subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS
   M /branches/http-protocol-v2/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /branches/http-protocol-v2/subversion/bindings/swig/python/svn/fs.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/delta.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/ra.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/repository.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/wc.py
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/svn/client.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/http-protocol-v2/subversion/include/private/svn_skel.h
   M /branches/http-protocol-v2/subversion/include/svn_auth.h
   M /branches/http-protocol-v2/subversion/include/svn_base64.h
   M /branches/http-protocol-v2/subversion/include/svn_client.h
   M /branches/http-protocol-v2/subversion/include/svn_cmdline.h
   M /branches/http-protocol-v2/subversion/include/svn_dirent_uri.h
   M /branches/http-protocol-v2/subversion/include/svn_error.h
   M /branches/http-protocol-v2/subversion/include/svn_error_codes.h
   M /branches/http-protocol-v2/subversion/include/svn_fs.h
   M /branches/http-protocol-v2/subversion/include/svn_io.h
   M /branches/http-protocol-v2/subversion/include/svn_repos.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/http-protocol-v2/subversion/libsvn_client/add.c
   M /branches/http-protocol-v2/subversion/libsvn_client/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_client/externals.c
   M /branches/http-protocol-v2/subversion/libsvn_client/log.c
   M /branches/http-protocol-v2/subversion/libsvn_client/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_delta/compose_delta.c
   M /branches/http-protocol-v2/subversion/libsvn_diff/diff.h
   M /branches/http-protocol-v2/subversion/libsvn_diff/diff_file.c
   M /branches/http-protocol-v2/subversion/libsvn_diff/diff_memory.c
   M /branches/http-protocol-v2/subversion/libsvn_diff/util.c
   M /branches/http-protocol-v2/subversion/libsvn_fs/fs-loader.c
   M /branches/http-protocol-v2/subversion/libsvn_fs/fs-loader.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/copies-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/locks-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/nodes-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/rev-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/dag.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/dag.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/reps-strings.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/dag.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/dag.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/lock.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/structure
   M /branches/http-protocol-v2/subversion/libsvn_ra/ra_loader.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/util.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/README
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/util.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/fs-wrap.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/auth.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/checksum.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/cmdline.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/dirent_uri.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/error.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/io.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/opt.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/path.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/prompt.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/skel.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/stream.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/svn_base64.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_crawler.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_files.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_files.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_ops.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/props.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/questions.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/update_editor.c
   A /branches/http-protocol-v2/subversion/libsvn_wc/wc-metadata.sql (from /trunk/subversion/libsvn_wc/wc-metadata.sql:35156)
   D /branches/http-protocol-v2/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/http-protocol-v2/subversion/po/fr.po
   M /branches/http-protocol-v2/subversion/po/ko.po
   M /branches/http-protocol-v2/subversion/po/pl.po
   M /branches/http-protocol-v2/subversion/po/zh_CN.po
   M /branches/http-protocol-v2/subversion/svn/cl.h
   M /branches/http-protocol-v2/subversion/svn/log-cmd.c
   M /branches/http-protocol-v2/subversion/svn/main.c
   M /branches/http-protocol-v2/subversion/svn/notify.c
   M /branches/http-protocol-v2/subversion/svnadmin/main.c
   M /branches/http-protocol-v2/subversion/svnsync/main.c
   M /branches/http-protocol-v2/subversion/tests/cmdline/basic_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/externals_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/http-protocol-v2/subversion/tests/cmdline/log_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svnsync_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/main.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/tree.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/update_tests.py
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs/fs-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs_base/fs-base-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs_fs/fs-pack-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/auth-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/hashdump-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/skel-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/string-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/http-protocol-v2/tools/backup/hot-backup.py.in
   M /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64
   M /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
   A /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh:35156)
   M /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
   M /branches/http-protocol-v2/tools/client-side/bash_completion
   A /branches/http-protocol-v2/tools/client-side/svnmucc (from /trunk/tools/client-side/svnmucc:35156)
   R /branches/http-protocol-v2/tools/client-side/svnmucc/svnmucc-test.py (from /trunk/tools/client-side/svnmucc/svnmucc-test.py:35156)
   R /branches/http-protocol-v2/tools/client-side/svnmucc/svnmucc.c (from /trunk/tools/client-side/svnmucc/svnmucc.c:35156)
   M /branches/http-protocol-v2/tools/dev/check-license.py
   M /branches/http-protocol-v2/tools/dev/contribulyze.py
   M /branches/http-protocol-v2/tools/dev/graph-dav-servers.py
   M /branches/http-protocol-v2/tools/dev/mlpatch.py
   M /branches/http-protocol-v2/tools/dev/which-error.py
   M /branches/http-protocol-v2/tools/dist/post-to-tigris.py
   M /branches/http-protocol-v2/tools/hook-scripts/mailer/mailer.py
   M /branches/http-protocol-v2/tools/hook-scripts/svn2feed.py
   M /branches/http-protocol-v2/tools/hook-scripts/svnperms.py
   M /branches/http-protocol-v2/tools/hook-scripts/verify-po.py
   M /branches/http-protocol-v2/tools/server-side/svn_server_log_parse.py
   M /branches/http-protocol-v2/tools/server-side/test_svn_server_log_parse.py
   M /branches/http-protocol-v2/win-tests.py
   M /branches/http-protocol-v2/www/faq.html
   M /branches/http-protocol-v2/www/images/svn-dav-securityspace-survey.png
   M /branches/http-protocol-v2/www/license-1.html
   M /branches/http-protocol-v2/www/license-for-python-bindings.html
   M /branches/http-protocol-v2/www/links.html
   M /branches/http-protocol-v2/www/security.html
   M /branches/http-protocol-v2/www/svn-dav-securityspace-survey.html
   M /branches/http-protocol-v2/www/tools_contrib.html

Merge trunk to my branch.
------------------------------------------------------------------------
r35158 | stsp | 2009-01-11 21:59:47 +0100 (Sun, 11 Jan 2009) | 4 lines
Changed paths:
   M /trunk/www/svn_1.6_releasenotes.html

* www/svn_1.6_releasenotes.html
  (svnserve-logging): New section to document svnserve logging
   support added in r30825. It has no content yet.

------------------------------------------------------------------------
r35159 | stsp | 2009-01-11 22:05:26 +0100 (Sun, 11 Jan 2009) | 3 lines
Changed paths:
   M /trunk/www/svn_1.6_releasenotes.html

* www/svn_1.6_releasenotes.html:
  (news): Link to the cmdline section.

------------------------------------------------------------------------
r35160 | rhuijben | 2009-01-11 23:25:28 +0100 (Sun, 11 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_client/info.c
   M /trunk/subversion/libsvn_client/merge.c

Resolve 3 size truncation warnings.

* subversion/libsvn_client/info.c
  (build_info_from_dirent, build_info_from_entry):
    Truncate value to a maximum of 4GB to suppress warning.
* subversion/libsvn_client/merge.c
  (update_wc_mergeinfo): Use size_t instead of int for strlen variable.

------------------------------------------------------------------------
r35161 | arfrever | 2009-01-12 05:31:13 +0100 (Mon, 12 Jan 2009) | 55 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp
   M /trunk/subversion/include/svn_auth.h
   M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   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 r34977, r35055 and r35112:
Pass unlock prompt function for GNOME Keyring providers by authentication
baton parameters. Simplify some functions. Fix a segmentation fault which
was causing failure of auth-test.

* subversion/include/svn_auth.h
  (svn_auth_unlock_provider_func_t): Delete.
  (svn_auth_get_platform_specific_provider): Delete 'pb', 'prompt_func' and
   'command_line' arguments.
  (svn_auth_get_platform_specific_client_providers): Delete 'pb', 'prompt_func'
   and 'command_line' arguments.
  (SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC): Define.
  (SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON): Define.
  (svn_auth_get_gnome_keyring_simple_provider): Delete 'unlock_prompt_func'
   and 'prompt_baton' arguments.

* subversion/libsvn_subr/auth.c
  (svn_auth_get_platform_specific_provider): Fix segmentation fault which was
   happening when we were calling svn_auth_get_gnome_keyring_simple_provider()
   and 'command_line' was FALSE, because the symbol of that function was
   earlier cast to svn_auth_simple_provider_func_t, while that function was
   actually of type svn_auth_unlock_provider_func_t. Delete 'pb', 'prompt_func'
   and 'command_line' arguments.
  (svn_auth_get_platform_specific_client_providers): Delete 'pb', 'prompt_func'
   and 'command_line' arguments. Update calls to
   svn_auth_get_platform_specific_provider().

* subversion/libsvn_subr/cmdline.c
  (svn_cmdline_create_auth_baton): Update calls to
   svn_auth_get_platform_specific_client_providers() and
   svn_auth_get_platform_specific_provider().
   Set SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC with value of
   svn_cmdline_auth_unlock_prompt() in authentication baton parameters.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (unlock_prompt_provider_baton_t): Delete.
  (callback_done): Fix indentation.
  (get_default_keyring_name): Delete needless parenthesis around returned value.
  (gnome_keyring_simple_first_creds): Retrieve unlock prompt function and
   unlock prompt baton from authentication baton parameters.
  (gnome_keyring_simple_save_creds): Retrieve unlock prompt function and
   unlock prompt baton from authentication baton parameters.
  (svn_auth_get_gnome_keyring_simple_provider): Delete 'unlock_prompt_func' and
   'unlock_prompt_baton' arguments. Don't set '*provider->provider_baton'.

* subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::getContext): Update calls to
   svn_auth_get_platform_specific_client_providers() and
   svn_auth_get_platform_specific_provider().

* subversion/tests/libsvn_subr/auth-test.c
  (test_platform_specific_auth_providers): Update calls to
   svn_auth_get_platform_specific_provider() and
   svn_auth_get_platform_specific_client_providers().

------------------------------------------------------------------------
r35162 | stylesen | 2009-01-12 07:21:54 +0100 (Mon, 12 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

Follow up r35161.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (gnome_keyring_simple_first_creds): Formatting tweaks only, no functional
   change.

------------------------------------------------------------------------
r35163 | stylesen | 2009-01-12 07:54:26 +0100 (Mon, 12 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/cmdline.c

Follow up r35161.

* subversion/libsvn_subr/cmdline.c
  (svn_cmdline_create_auth_baton): Set unlock prompt function only if operating
   system is other than darwin and win32 which otherwise breaks the builds.

------------------------------------------------------------------------
r35164 | stylesen | 2009-01-12 08:08:48 +0100 (Mon, 12 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/svn_base64.c

[This was reverted in r35165.]

Follow up r35156.

* subversion/libsvn_subr/svn_base64.c
  (base64_from_checksum): Suppress warning of "argument 1 of 'svn_checksum_size'
   discards qualifiers from pointer target type".

------------------------------------------------------------------------
r35165 | stylesen | 2009-01-12 09:30:17 +0100 (Mon, 12 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/svn_base64.c

Revert r35164.

* subversion/libsvn_subr/svn_base64.c
  (base64_from_checksum): Revert r35164 based on the comment by gstein
   http://svn.haxx.se/dev/archive-2009-01/0298.shtml

------------------------------------------------------------------------
r35166 | stylesen | 2009-01-12 09:43:01 +0100 (Mon, 12 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/include/svn_checksum.h
   M /trunk/subversion/libsvn_subr/checksum.c

Follow up r35156. Add "const" to an input pointer parameter (Found by a
compiler warning).

* subversion/libsvn_subr/checksum.c
  (svn_checksum_size): Accept 'const svn_checksum_t'.

* subversion/include/svn_checksum.h
  (svn_checksum_size): Reflect above change.

Suggested by: gstein

------------------------------------------------------------------------
r35167 | kameshj | 2009-01-12 10:47:34 +0100 (Mon, 12 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Doc correction.

* subversion/tests/cmdline/merge_tests.py
  (textual_merges_galore): 'ten' -> 'few'.

------------------------------------------------------------------------
r35168 | stylesen | 2009-01-12 10:51:24 +0100 (Mon, 12 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/cmdline.c

Set unlock prompt function conditionally.

* subversion/libsvn_subr/cmdline.c
  (svn_cmdline_create_auth_baton): Set unlock prompt function only if we
   have GNOME Keyring enabled.

Suggested by: arfrever

------------------------------------------------------------------------
r35169 | stylesen | 2009-01-12 11:00:34 +0100 (Mon, 12 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

Implement GNOME Keyring unlock prompt for ssl client certificate password
provider.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (gnome_keyring_ssl_client_cert_pw_first_creds,
   gnome_keyring_ssl_client_cert_pw_save_creds): Provide a GNOME Keyring
   unlock prompt function.

------------------------------------------------------------------------
r35170 | kameshj | 2009-01-12 12:16:01 +0100 (Mon, 12 Jan 2009) | 7 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/actions.py

On issue-2897-take2:

Merge r28649 from ^/branches/issue-2897

Catch 'subversion/tests/cmdline/merge_tests.py' up with recent changes
on trunk.

------------------------------------------------------------------------
r35171 | julianfoad | 2009-01-12 12:19:04 +0100 (Mon, 12 Jan 2009) | 5 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c

On the issue-3334-dirs branch:

* subversion/libsvn_wc/update_editor.c
  (schedule_existing_item_for_re_add): Fix compilation errors.

------------------------------------------------------------------------
r35172 | julianfoad | 2009-01-12 12:41:52 +0100 (Mon, 12 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

Minor formatting tweak.

* subversion/include/svn_wc.h
  (svn_wc_walk_entries3, svn_wc_walk_entries2, svn_wc_walk_entries):
    Remove an unnecessary line break between an argument's type and name.

------------------------------------------------------------------------
r35173 | kameshj | 2009-01-12 13:07:21 +0100 (Mon, 12 Jan 2009) | 10 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28653(cherry pick subversion/tests/cmdline/merge_tests.py alone) 
from ^/branches/issue-2897.

I did this merge with '--ignore-ancestry' as I do not want to manage the
mess of 'subtree mergeinfo' and do not care of tracking this merge.

Resolved conflict on subversion/tests/cmdline/merge_tests.py

------------------------------------------------------------------------
r35174 | kameshj | 2009-01-12 13:59:26 +0100 (Mon, 12 Jan 2009) | 7 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28714 from ^/branches/issue-2897.

Catch 'subversion/tests/cmdline/merge_tests.py' up with recent changes
on trunk.

------------------------------------------------------------------------
r35175 | stylesen | 2009-01-12 14:29:31 +0100 (Mon, 12 Jan 2009) | 24 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

Rename local function names starting with prefix "gnome_keyring", which
confuses the reader, since all the GNOME Keyring library functions starts
with the same name.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (gnome_keyring_unlock_keyring): Rename to ...
  (unlock_gnome_keyring): ... this.
  (gnome_keyring_password_get): Rename to ...
  (password_get_gnome_keyring): ... this.
  (gnome_keyring_password_set): Rename to ...
  (password_set_gnome_keyring): ... this.
  (gnome_keyring_simple_first_creds): Rename to ...
  (simple_gnome_keyring_first_creds): ... this. Update.
  (gnome_keyring_simple_save_creds): Rename to ...
  (simple_gnome_keyring_save_creds): ... this. Update.
  (gnome_keyring_init): Rename to ...
  (init_gnome_keyring): ... this.
  (gnome_keyring_ssl_client_cert_pw_first_creds): Rename to ...
  (ssl_client_cert_pw_gnome_keyring_first_creds): ... this. Update.
  (gnome_keyring_ssl_client_cert_pw_save_creds): Rename to ...
  (ssl_client_cert_pw_gnome_keyring_save_creds): ... this. Update.
  (gnome_keyring_simple_provider, gnome_keyring_ssl_client_cert_pw_provider):
   Update with above changes.

------------------------------------------------------------------------
r35176 | kameshj | 2009-01-12 14:38:22 +0100 (Mon, 12 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 r28716 from ^/branches/issue-2897.

Resolving conflict on 'subversion/tests/cmdline/merge_tests.py'.

------------------------------------------------------------------------
r35177 | kameshj | 2009-01-12 14:54:48 +0100 (Mon, 12 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 r28725 from ^/branches/issue-2897.

Resolving conflict on 'subversion/tests/cmdline/merge_tests.py'.

------------------------------------------------------------------------
r35178 | kameshj | 2009-01-12 15:05:36 +0100 (Mon, 12 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28751 from ^/branches/issue-2897.

------------------------------------------------------------------------
r35179 | kameshj | 2009-01-12 15:31:36 +0100 (Mon, 12 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 r28796 from ^/branches/issue-2897.

Resolved conflicts on subversion/tests/cmdline/merge_tests.py.

------------------------------------------------------------------------
r35180 | kameshj | 2009-01-12 15:50:39 +0100 (Mon, 12 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28822 from ^/branches/issue-2897.

------------------------------------------------------------------------
r35181 | kameshj | 2009-01-12 16:11:34 +0100 (Mon, 12 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Merge r28823 from ^/branches/issue-2897.

------------------------------------------------------------------------
r35182 | kameshj | 2009-01-12 16:30:10 +0100 (Mon, 12 Jan 2009) | 10 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/tests/cmdline/log_tests.py

On issue-2897-take2:

Merge r28843(cherry pick subversion/tests/cmdline/log_tests.py alone)
from ^/branches/issue-2897.

I did this merge with '--ignore-ancestry' as I do not want to manage the
mess of 'subtree mergeinfo' and do not care of tracking this merge.

Resolved conflicts on subversion/tests/cmdline/log_tests.py

------------------------------------------------------------------------
r35183 | pburba | 2009-01-12 16:40:45 +0100 (Mon, 12 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/main.py

Fix test suite's use of subprocess on earlier versions of Python and thus
fix the djh-xp-vse2005 buildbot.

* subversion/tests/cmdline/svntest/main.py
  (open_pipe2): Quote arguments to subprocess.Popen().  Later versions of
  subprocess (2.5.2+ that I know of for sure) don't require this quoting, but
  versions < 2.4.3 do.
------------------------------------------------------------------------
r35184 | pburba | 2009-01-12 17:13:29 +0100 (Mon, 12 Jan 2009) | 15 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/main.py

Follow-up to r35183.  Fix an earlier fix so that platforms that were broken
by that fix are now fixed too, and the fixed things on the previously broken
platforms stay fixed.

* subversion/tests/cmdline/svntest/main.py
  (open_pipe2): Quote arguments to subprocess.Popen() only on Windows, which
  as far as I can tell is the only platform on which this needs to be done.
  It defintely *doesn't* need to be done on linux, since r35183 broke the
  'i686-debian-sarge1 shared gcc-3.3.5' and 'x64-ubuntu gcc'
  buildbots which were working (or failing for other reasons) prior to
  r35183.  	




------------------------------------------------------------------------
r35185 | julianfoad | 2009-01-12 17:16:32 +0100 (Mon, 12 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/svn/main.c
   M /trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Tweak the built-in help wording for consistency.

* subversion/svn/main.c
  (svn_cl__cmd_table): Always say "options", not "instances" or "flags", and
    use "or" instead of "and" between alternatives.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
  Update the expected text accordingly.

------------------------------------------------------------------------
r35186 | cmpilato | 2009-01-12 17:34:07 +0100 (Mon, 12 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/merge.c

Finish issue #3166: Tempfiles used by interactive conflict resolution
editor have unhelpful names.

* subversion/libsvn_wc/merge.c
  (create_name_preserving_tmp_file): New helper function.
  (svn_wc__merge_internal): Use create_name_preserving_tmp_file()
    instead of svn_wc_create_tmp_file2().

------------------------------------------------------------------------
r35187 | hwright | 2009-01-12 17:41:28 +0100 (Mon, 12 Jan 2009) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_client/mergeinfo.c

Revert r35136, which caused a failure in the ruby bindings.

------------------------------------------------------------------------
r35188 | hwright | 2009-01-12 18:09:20 +0100 (Mon, 12 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_client/mergeinfo.c

Redo r35136 the right way: use svn_client_log5() internally in place of
svn_client_log4().

* subversion/libsvn_client/mergeinfo.c
  (logs_for_mergeinfo_rangelist): Construct the appropriate datastructures
    for the new API.

------------------------------------------------------------------------
r35189 | julianfoad | 2009-01-12 19:18:32 +0100 (Mon, 12 Jan 2009) | 10 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c

Further work on issue #3334: recursively set the 'copied' flag on the
re-added directory tree.

* subversion/libsvn_wc/update_editor.c
  (set_copied_baton_t): New type.
  (set_copied_callback, set_copied_handle_error): New functions.
  (schedule_existing_item_for_re_add): Use the new stuff to walk the tree,
    setting the 'copied' flag.
  (do_entry_deletion): Update comments.

------------------------------------------------------------------------
r35190 | julianfoad | 2009-01-12 19:37:43 +0100 (Mon, 12 Jan 2009) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add a reference to email.
------------------------------------------------------------------------
r35191 | rhuijben | 2009-01-12 22:00:37 +0100 (Mon, 12 Jan 2009) | 21 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/info.c

Add 64-bit file size fields to the svn_info_t structure, deprecating the old
32-bit fields and ensuring that they are set to the _UNKNOWN value when they
would overflow.

* subversion/include/svn_client.h
  (SVN_INFO_SIZE_UNKNOWN): Update documentation to describe difference with
    SVN_FILE_SIZE_UNKNOWN.
  (SVN_FILE_SIZE_UNKNOWN): New unknown file size define for 64 bit values.
  (svn_info_t): Add size64 and working_size64 fields that can contain large
    file sizes. Deprecate size and working_size and describe their overflow
    behavior.
* subversion/libsvn_client/info.c
  (build_info_from_dirent): Fill size64 with the entry data and apply overflow
    check before filling size.
  (build_info_from_entry): Fill working_size64 with the entry data and apply
    overflow check before filling working_size.
  (build_info_for_unversioned): Fill size, size64, working_size and
    working_size64 with their unknown value.

Suggested by: julianfoad

------------------------------------------------------------------------
r35192 | rhuijben | 2009-01-12 22:09:37 +0100 (Mon, 12 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_svn/marshal.c

* subversion/libsvn_ra_svn/marshal.c
  (read_string): Resolve warning by casting a buffer length that was checked
    before to apr_size_t.
  (svn_ra_svn__handle_failure_status): Cast marshalled error code to 
    apr_status_t and line number to long to resolve warnings.

------------------------------------------------------------------------
r35193 | pburba | 2009-01-12 22:32:57 +0100 (Mon, 12 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/main.py

Follow-up to r35093, fix a deadlock situation with the test suite when using
Python < 2.4.

* subversion/tests/cmdline/svntest/main.py
  (spawn_process): Return Python < 2.4 code path to pre-r35093 state;
  specifically, close the stdin pipe obtained with Popen3() or os.popen3()
  as soon as we are done writing to it.

------------------------------------------------------------------------
r35194 | hwright | 2009-01-12 22:59:13 +0100 (Mon, 12 Jan 2009) | 18 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/StatusCallback.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java

JavaHL: Punch through the tree conflict description member of svn_wc_status2_t
to the appropriate Java class.

Requested by: markphip
Brought to you by: the letter 'K', the letter 'Z', and the number '8'

[ in subversion/bindings/javahl/ ]
* native/StatusCallback.cpp
  (createJavaStatus): Add the conflict descriptor member to the returned java
    Status object.

* src/org/tigris/subversion/javahl/Status.java
  (serialVersionUID): Rev.  I don't know if this change constitutes
    "incompatible" or not, but I'm taking the safe road here.
  (conflictDescriptor): New.
  (Status): Add new parameter.
  (getConflictDescriptor): New.

------------------------------------------------------------------------
r35195 | hwright | 2009-01-12 23:15:40 +0100 (Mon, 12 Jan 2009) | 2 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/StatusCallback.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java

Bogus commit.  Reverted in r35196.

------------------------------------------------------------------------
r35196 | hwright | 2009-01-12 23:17:50 +0100 (Mon, 12 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/StatusCallback.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java

"Curse my metal body, I wasn't fast enough!"

Revert a bogus change in r35195 caused by muscle memory and a fast internet
connection.

------------------------------------------------------------------------
r35197 | hwright | 2009-01-12 23:36:45 +0100 (Mon, 12 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/StatusCallback.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java

JavaHL: Punch through the file external boolean in Status from C to Java.

[ in subversion/bindings/javahl/ ]
* native/StatusCallback.cpp
  (createJavaStatus): Add the new file externals value.

* src/org/tigris/subversion/javahl/Status.java
  (fileExternal): New.
  (Status): Add new parameter and docs.
  (isFileExternal): New.

------------------------------------------------------------------------
r35198 | rhuijben | 2009-01-13 00:34:55 +0100 (Tue, 13 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_svn/client.c

* subversion/libsvn_ra_svn/client.c
  (ra_svn_get_location_segments): Update comment that talks about the history
    of get_location_segments to mention 1.5.

------------------------------------------------------------------------
r35199 | rhuijben | 2009-01-13 01:34:14 +0100 (Tue, 13 Jan 2009) | 17 lines
Changed paths:
   M /trunk/subversion/libsvn_client/log.c

Resolve issue #3356 by using the get_location_segments ra api to get the copy
source of a path. This makes the call much faster for 1.5+ repositories with
an node origin cache and the original implementation handles the log exactly
like the compatibility implementation of the ra api.
(So worst case this is duplicate code removal with an added check if
 get_location_segments is handled by the repository)

* subversion/libsvn_client/log.c
  (copyfrom_info_t): Add is_first boolean to find the second segment
    the easy way.
  (copyfrom_info_receiver): Implement svn_location_segment_receiver_t instead
    of svn_log_entry_receiver_t and replace all path calculation with a simple
    check to return the end of the second segment.
  (svn_client__get_copy_source): Call svn_ra_get_location_segments on
    copyfrom_info_receiver instead of svn_ra_get_log2 and remove unused
    calculations.

------------------------------------------------------------------------
r35200 | kameshj | 2009-01-13 09:44:33 +0100 (Tue, 13 Jan 2009) | 12 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Catch up with r32722(Remove the "Merge Kludge" from the test suite.).

* subversion/tests/cmdline/merge_tests.py
  (merge_non_reflective_changes_from_reflective_rev,
   merge_non_reflective_text_and_prop_change,
   merge_non_reflective_with_conflict,
   merge_non_reflective_with_complex_conflict,
   reflective_merge_on_reincarnated_target):
   Remove the "Merge Kludge" from the test suite.

------------------------------------------------------------------------
r35201 | kameshj | 2009-01-13 10:22:31 +0100 (Tue, 13 Jan 2009) | 12 lines
Changed paths:
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py

On issue-2897-take2:

Catch up with r29070(Nounify MERGE_INFO in the test suite.).

* subversion/tests/cmdline/merge_tests.py
  (merge_non_reflective_changes_from_reflective_rev,
   merge_non_reflective_text_and_prop_change,
   merge_non_reflective_with_conflict,
   merge_non_reflective_with_complex_conflict,
   reflective_merge_on_reincarnated_target):
   Nounify MERGE_INFO in the test suite.

------------------------------------------------------------------------
r35202 | kameshj | 2009-01-13 11:41:08 +0100 (Tue, 13 Jan 2009) | 4 lines
Changed paths:
   M /branches/issue-2897-take2
   M /branches/issue-2897-take2/TODO-1.6
   M /branches/issue-2897-take2/build/ac-macros/berkeley-db.m4
   M /branches/issue-2897-take2/build.conf
   D /branches/issue-2897-take2/contrib/client-side/svnmucc
   A /branches/issue-2897-take2/contrib/hook-scripts/require-mergeinfo.pl (from /trunk/contrib/hook-scripts/require-mergeinfo.pl:35201)
   M /branches/issue-2897-take2/notes/wc-ng-design
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/SVNClient.h
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
   M /branches/issue-2897-take2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
   M /branches/issue-2897-take2/subversion/include/svn_auth.h
   M /branches/issue-2897-take2/subversion/include/svn_base64.h
   M /branches/issue-2897-take2/subversion/include/svn_checksum.h
   M /branches/issue-2897-take2/subversion/include/svn_client.h
   M /branches/issue-2897-take2/subversion/include/svn_cmdline.h
   M /branches/issue-2897-take2/subversion/include/svn_dirent_uri.h
   M /branches/issue-2897-take2/subversion/include/svn_error.h
   M /branches/issue-2897-take2/subversion/include/svn_error_codes.h
   M /branches/issue-2897-take2/subversion/include/svn_io.h
   M /branches/issue-2897-take2/subversion/include/svn_wc.h
   M /branches/issue-2897-take2/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/issue-2897-take2/subversion/libsvn_client/add.c
   M /branches/issue-2897-take2/subversion/libsvn_client/deprecated.c
   M /branches/issue-2897-take2/subversion/libsvn_client/externals.c
   M /branches/issue-2897-take2/subversion/libsvn_client/info.c
   M /branches/issue-2897-take2/subversion/libsvn_client/log.c
   M /branches/issue-2897-take2/subversion/libsvn_client/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-2897-take2/subversion/libsvn_delta/compose_delta.c
   M /branches/issue-2897-take2/subversion/libsvn_fs/fs-loader.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_base/dag.h
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/dag.c
   M /branches/issue-2897-take2/subversion/libsvn_fs_fs/dag.h
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/client.c
   M /branches/issue-2897-take2/subversion/libsvn_ra_svn/marshal.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/auth.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/checksum.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/cmdline.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/dirent_uri.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/error.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/io.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/mergeinfo.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/path.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/prompt.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/stream.c
   M /branches/issue-2897-take2/subversion/libsvn_subr/svn_base64.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_crawler.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_files.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_files.h
   M /branches/issue-2897-take2/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/merge.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/props.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/questions.c
   M /branches/issue-2897-take2/subversion/libsvn_wc/update_editor.c
   A /branches/issue-2897-take2/subversion/libsvn_wc/wc-metadata.sql (from /trunk/subversion/libsvn_wc/wc-metadata.sql:35201)
   D /branches/issue-2897-take2/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/issue-2897-take2/subversion/po/fr.po
   M /branches/issue-2897-take2/subversion/po/zh_CN.po
   M /branches/issue-2897-take2/subversion/svn/cl.h
   M /branches/issue-2897-take2/subversion/svn/log-cmd.c
   M /branches/issue-2897-take2/subversion/svn/main.c
   M /branches/issue-2897-take2/subversion/svn/notify.c
   M /branches/issue-2897-take2/subversion/svnadmin/main.c
   M /branches/issue-2897-take2/subversion/svnsync/main.c
   M /branches/issue-2897-take2/subversion/tests/cmdline/basic_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/externals_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/issue-2897-take2/subversion/tests/cmdline/log_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svnsync_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/issue-2897-take2/subversion/tests/cmdline/update_tests.py
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs/fs-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_fs_base/fs-base-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/auth-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/issue-2897-take2/subversion/tests/libsvn_subr/mergeinfo-test.c
   A /branches/issue-2897-take2/tools/client-side/svnmucc (from /trunk/tools/client-side/svnmucc:35201)
   R /branches/issue-2897-take2/tools/client-side/svnmucc/svnmucc-test.py (from /trunk/tools/client-side/svnmucc/svnmucc-test.py:35201)
   R /branches/issue-2897-take2/tools/client-side/svnmucc/svnmucc.c (from /trunk/tools/client-side/svnmucc/svnmucc.c:35201)
   M /branches/issue-2897-take2/tools/dev/contribulyze.py
   M /branches/issue-2897-take2/tools/dev/mlpatch.py
   M /branches/issue-2897-take2/tools/dist/post-to-tigris.py
   M /branches/issue-2897-take2/tools/hook-scripts/mailer/mailer.py
   M /branches/issue-2897-take2/tools/server-side/svn_server_log_parse.py
   M /branches/issue-2897-take2/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-2897-take2/www/faq.html
   M /branches/issue-2897-take2/www/links.html
   M /branches/issue-2897-take2/www/svn_1.6_releasenotes.html
   M /branches/issue-2897-take2/www/tools_contrib.html

On issue-2897-take2:

Merge from ^/trunk revisions r35038 through r35201.

------------------------------------------------------------------------
r35203 | julianfoad | 2009-01-13 15:05:14 +0100 (Tue, 13 Jan 2009) | 2 lines
Changed paths:
   M /branches/svnraisetc
   M /branches/svnraisetc/CHANGES
   M /branches/svnraisetc/COPYING
   M /branches/svnraisetc/INSTALL
   M /branches/svnraisetc/Makefile.in
   M /branches/svnraisetc/TODO-1.6
   M /branches/svnraisetc/build/ac-macros/berkeley-db.m4
   M /branches/svnraisetc/build/ac-macros/neon.m4
   M /branches/svnraisetc/build/generator/gen_base.py
   M /branches/svnraisetc/build/generator/gen_win.py
   M /branches/svnraisetc/build/run_tests.py
   M /branches/svnraisetc/build/win32/svn.rc
   M /branches/svnraisetc/build.conf
   M /branches/svnraisetc/configure.ac
   M /branches/svnraisetc/contrib/client-side/emacs/psvn.el
   M /branches/svnraisetc/contrib/client-side/svn2cl/NEWS
   M /branches/svnraisetc/contrib/client-side/svn2cl/svn2cl.1
   M /branches/svnraisetc/contrib/client-side/svn2cl/svn2cl.sh
   M /branches/svnraisetc/contrib/client-side/svn2cl/svn2cl.xsl
   M /branches/svnraisetc/contrib/client-side/svn2cl/svn2html.xsl
   D /branches/svnraisetc/contrib/client-side/svnmucc
   A /branches/svnraisetc/contrib/hook-scripts/require-mergeinfo.pl (from /trunk/contrib/hook-scripts/require-mergeinfo.pl:35202)
   M /branches/svnraisetc/notes/wc-ng-design
   M /branches/svnraisetc/notes/webdav-proxy
   M /branches/svnraisetc/packages/rpm/redhat-8+/subversion.spec
   M /branches/svnraisetc/packages/rpm/rhel-3/subversion.spec
   M /branches/svnraisetc/packages/rpm/rhel-4/subversion.spec
   M /branches/svnraisetc/packages/rpm/rhel-5/subversion.spec
   M /branches/svnraisetc/packages/windows-innosetup/Pre.rtf
   M /branches/svnraisetc/packages/windows-innosetup/svn.iss
   M /branches/svnraisetc/subversion/LICENSE
   M /branches/svnraisetc/subversion/bindings/ctypes-python/test/wc.py
   M /branches/svnraisetc/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/svnraisetc/subversion/bindings/javahl/native/SVNClient.h
   M /branches/svnraisetc/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/svnraisetc/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /branches/svnraisetc/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java
   M /branches/svnraisetc/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /branches/svnraisetc/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /branches/svnraisetc/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
   M /branches/svnraisetc/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
   M /branches/svnraisetc/subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS
   M /branches/svnraisetc/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /branches/svnraisetc/subversion/bindings/swig/python/svn/fs.py
   M /branches/svnraisetc/subversion/bindings/swig/python/tests/delta.py
   M /branches/svnraisetc/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/svnraisetc/subversion/bindings/swig/python/tests/ra.py
   M /branches/svnraisetc/subversion/bindings/swig/python/tests/repository.py
   M /branches/svnraisetc/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
   M /branches/svnraisetc/subversion/bindings/swig/python/tests/wc.py
   M /branches/svnraisetc/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/svnraisetc/subversion/bindings/swig/ruby/svn/client.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/svn/info.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/svn/ra.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/test_delta.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/test_fs.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/test_info.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/test_ra.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/test_repos.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/test_wc.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/util.rb
   M /branches/svnraisetc/subversion/bindings/swig/ruby/test/windows_util.rb
   M /branches/svnraisetc/subversion/include/private/svn_mergeinfo_private.h
   A /branches/svnraisetc/subversion/include/private/svn_skel.h (from /trunk/subversion/include/private/svn_skel.h:35202)
   M /branches/svnraisetc/subversion/include/private/svn_wc_private.h
   M /branches/svnraisetc/subversion/include/svn_auth.h
   M /branches/svnraisetc/subversion/include/svn_base64.h
   M /branches/svnraisetc/subversion/include/svn_checksum.h
   M /branches/svnraisetc/subversion/include/svn_client.h
   M /branches/svnraisetc/subversion/include/svn_cmdline.h
   M /branches/svnraisetc/subversion/include/svn_delta.h
   M /branches/svnraisetc/subversion/include/svn_dirent_uri.h
   M /branches/svnraisetc/subversion/include/svn_error.h
   M /branches/svnraisetc/subversion/include/svn_error_codes.h
   M /branches/svnraisetc/subversion/include/svn_fs.h
   M /branches/svnraisetc/subversion/include/svn_io.h
   M /branches/svnraisetc/subversion/include/svn_path.h
   M /branches/svnraisetc/subversion/include/svn_repos.h
   M /branches/svnraisetc/subversion/include/svn_wc.h
   M /branches/svnraisetc/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/svnraisetc/subversion/libsvn_client/add.c
   M /branches/svnraisetc/subversion/libsvn_client/client.h
   M /branches/svnraisetc/subversion/libsvn_client/commit_util.c
   M /branches/svnraisetc/subversion/libsvn_client/copy.c
   M /branches/svnraisetc/subversion/libsvn_client/deprecated.c
   M /branches/svnraisetc/subversion/libsvn_client/externals.c
   M /branches/svnraisetc/subversion/libsvn_client/info.c
   M /branches/svnraisetc/subversion/libsvn_client/log.c
   M /branches/svnraisetc/subversion/libsvn_client/merge.c
   M /branches/svnraisetc/subversion/libsvn_client/mergeinfo.c
   M /branches/svnraisetc/subversion/libsvn_client/resolved.c
   M /branches/svnraisetc/subversion/libsvn_client/url.c
   M /branches/svnraisetc/subversion/libsvn_delta/compose_delta.c
   M /branches/svnraisetc/subversion/libsvn_delta/depth_filter_editor.c
   M /branches/svnraisetc/subversion/libsvn_diff/diff.h
   M /branches/svnraisetc/subversion/libsvn_diff/diff_file.c
   M /branches/svnraisetc/subversion/libsvn_diff/diff_memory.c
   M /branches/svnraisetc/subversion/libsvn_diff/util.c
   M /branches/svnraisetc/subversion/libsvn_fs/fs-loader.c
   M /branches/svnraisetc/subversion/libsvn_fs/fs-loader.h
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/copies-table.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/locks-table.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/nodes-table.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/reps-table.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/rev-table.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/dag.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/dag.h
   M /branches/svnraisetc/subversion/libsvn_fs_base/fs.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/key-gen.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/key-gen.h
   M /branches/svnraisetc/subversion/libsvn_fs_base/reps-strings.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/tree.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/svnraisetc/subversion/libsvn_fs_base/util/fs_skels.h
   D /branches/svnraisetc/subversion/libsvn_fs_base/util/skel.c
   D /branches/svnraisetc/subversion/libsvn_fs_base/util/skel.h
   M /branches/svnraisetc/subversion/libsvn_fs_fs/dag.c
   M /branches/svnraisetc/subversion/libsvn_fs_fs/dag.h
   M /branches/svnraisetc/subversion/libsvn_fs_fs/fs.c
   M /branches/svnraisetc/subversion/libsvn_fs_fs/fs.h
   M /branches/svnraisetc/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/svnraisetc/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/svnraisetc/subversion/libsvn_fs_fs/lock.c
   M /branches/svnraisetc/subversion/libsvn_fs_fs/structure
   M /branches/svnraisetc/subversion/libsvn_ra/ra_loader.c
   M /branches/svnraisetc/subversion/libsvn_ra_neon/mergeinfo.c
   M /branches/svnraisetc/subversion/libsvn_ra_neon/util.c
   M /branches/svnraisetc/subversion/libsvn_ra_serf/README
   M /branches/svnraisetc/subversion/libsvn_ra_serf/util.c
   M /branches/svnraisetc/subversion/libsvn_ra_svn/client.c
   M /branches/svnraisetc/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/svnraisetc/subversion/libsvn_ra_svn/marshal.c
   M /branches/svnraisetc/subversion/libsvn_repos/fs-wrap.c
   M /branches/svnraisetc/subversion/libsvn_subr/auth.c
   M /branches/svnraisetc/subversion/libsvn_subr/checksum.c
   M /branches/svnraisetc/subversion/libsvn_subr/cmdline.c
   M /branches/svnraisetc/subversion/libsvn_subr/dirent_uri.c
   M /branches/svnraisetc/subversion/libsvn_subr/error.c
   M /branches/svnraisetc/subversion/libsvn_subr/io.c
   M /branches/svnraisetc/subversion/libsvn_subr/mergeinfo.c
   M /branches/svnraisetc/subversion/libsvn_subr/opt.c
   M /branches/svnraisetc/subversion/libsvn_subr/path.c
   M /branches/svnraisetc/subversion/libsvn_subr/prompt.c
   M /branches/svnraisetc/subversion/libsvn_subr/simple_providers.c
   A /branches/svnraisetc/subversion/libsvn_subr/skel.c (from /trunk/subversion/libsvn_subr/skel.c:35202)
   M /branches/svnraisetc/subversion/libsvn_subr/ssl_client_cert_providers.c
   M /branches/svnraisetc/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/svnraisetc/subversion/libsvn_subr/stream.c
   M /branches/svnraisetc/subversion/libsvn_subr/svn_base64.c
   M /branches/svnraisetc/subversion/libsvn_subr/username_providers.c
   M /branches/svnraisetc/subversion/libsvn_wc/adm_crawler.c
   M /branches/svnraisetc/subversion/libsvn_wc/adm_files.c
   M /branches/svnraisetc/subversion/libsvn_wc/adm_files.h
   M /branches/svnraisetc/subversion/libsvn_wc/adm_ops.c
   M /branches/svnraisetc/subversion/libsvn_wc/entries.c
   M /branches/svnraisetc/subversion/libsvn_wc/entries.h
   M /branches/svnraisetc/subversion/libsvn_wc/log.c
   M /branches/svnraisetc/subversion/libsvn_wc/merge.c
   M /branches/svnraisetc/subversion/libsvn_wc/props.c
   M /branches/svnraisetc/subversion/libsvn_wc/props.h
   M /branches/svnraisetc/subversion/libsvn_wc/questions.c
   M /branches/svnraisetc/subversion/libsvn_wc/status.c
   M /branches/svnraisetc/subversion/libsvn_wc/tree_conflicts.c
   M /branches/svnraisetc/subversion/libsvn_wc/tree_conflicts.h
   M /branches/svnraisetc/subversion/libsvn_wc/update_editor.c
   A /branches/svnraisetc/subversion/libsvn_wc/wc-metadata.sql (from /trunk/subversion/libsvn_wc/wc-metadata.sql:35202)
   D /branches/svnraisetc/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/svnraisetc/subversion/libsvn_wc/wc_db.c
   M /branches/svnraisetc/subversion/libsvn_wc/wc_db.h
   M /branches/svnraisetc/subversion/po/fr.po
   M /branches/svnraisetc/subversion/po/ko.po
   M /branches/svnraisetc/subversion/po/pl.po
   M /branches/svnraisetc/subversion/po/zh_CN.po
   M /branches/svnraisetc/subversion/svn/changelist-cmd.c
   M /branches/svnraisetc/subversion/svn/cl.h
   M /branches/svnraisetc/subversion/svn/log-cmd.c
   M /branches/svnraisetc/subversion/svn/main.c
   M /branches/svnraisetc/subversion/svn/notify.c
   M /branches/svnraisetc/subversion/svnadmin/main.c
   M /branches/svnraisetc/subversion/svnlook/main.c
   M /branches/svnraisetc/subversion/svnsync/main.c
   M /branches/svnraisetc/subversion/tests/cmdline/basic_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/commit_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/depth_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/externals_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/svnraisetc/subversion/tests/cmdline/log_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/merge_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/prop_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/resolved_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/revert_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/stat_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/svnsync_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/svntest/actions.py
   M /branches/svnraisetc/subversion/tests/cmdline/svntest/main.py
   M /branches/svnraisetc/subversion/tests/cmdline/svntest/tree.py
   M /branches/svnraisetc/subversion/tests/cmdline/svntest/verify.py
   M /branches/svnraisetc/subversion/tests/cmdline/switch_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/svnraisetc/subversion/tests/cmdline/update_tests.py
   M /branches/svnraisetc/subversion/tests/libsvn_fs/fs-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_fs_base
   M /branches/svnraisetc/subversion/tests/libsvn_fs_base/changes-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_fs_base/fs-base-test.c
   D /branches/svnraisetc/subversion/tests/libsvn_fs_base/skel-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_fs_base/strings-reps-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_fs_fs/fs-pack-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_subr
   M /branches/svnraisetc/subversion/tests/libsvn_subr/auth-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_subr/hashdump-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_subr/mergeinfo-test.c
   A /branches/svnraisetc/subversion/tests/libsvn_subr/skel-test.c (from /trunk/subversion/tests/libsvn_subr/skel-test.c:35202)
   M /branches/svnraisetc/subversion/tests/libsvn_subr/string-test.c
   M /branches/svnraisetc/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/svnraisetc/tools/backup/hot-backup.py.in
   M /branches/svnraisetc/tools/bdb/erase-all-text-data.py
   M /branches/svnraisetc/tools/bdb/svn-bdb-view.py
   M /branches/svnraisetc/tools/bdb/whatis-rep.py
   M /branches/svnraisetc/tools/buildbot/slaves/README
   A /branches/svnraisetc/tools/buildbot/slaves/ubuntu-x64 (from /trunk/tools/buildbot/slaves/ubuntu-x64:35202)
   R /branches/svnraisetc/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c (from /trunk/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c:35202)
   R /branches/svnraisetc/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh:35202)
   R /branches/svnraisetc/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh:35202)
   R /branches/svnraisetc/tools/buildbot/slaves/ubuntu-x64/svncheck.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh:35202)
   R /branches/svnraisetc/tools/buildbot/slaves/ubuntu-x64/svnclean.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh:35202)
   R /branches/svnraisetc/tools/buildbot/slaves/ubuntu-x64/svnlog.sh (from /trunk/tools/buildbot/slaves/ubuntu-x64/svnlog.sh:35202)
   R /branches/svnraisetc/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c (from /trunk/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c:35202)
   M /branches/svnraisetc/tools/client-side/bash_completion
   M /branches/svnraisetc/tools/client-side/change-svn-wc-format.py
   M /branches/svnraisetc/tools/client-side/server-version.py
   A /branches/svnraisetc/tools/client-side/svnmucc (from /trunk/tools/client-side/svnmucc:35202)
   R /branches/svnraisetc/tools/client-side/svnmucc/svnmucc-test.py (from /trunk/tools/client-side/svnmucc/svnmucc-test.py:35202)
   R /branches/svnraisetc/tools/client-side/svnmucc/svnmucc.c (from /trunk/tools/client-side/svnmucc/svnmucc.c:35202)
   M /branches/svnraisetc/tools/dev/check-license.py
   M /branches/svnraisetc/tools/dev/contribulyze.py
   M /branches/svnraisetc/tools/dev/datecheck.py
   M /branches/svnraisetc/tools/dev/gen-javahl-errors.py
   M /branches/svnraisetc/tools/dev/graph-dav-servers.py
   M /branches/svnraisetc/tools/dev/iz/ff2csv.py
   M /branches/svnraisetc/tools/dev/iz/find-fix.py
   M /branches/svnraisetc/tools/dev/mlpatch.py
   M /branches/svnraisetc/tools/dev/normalize-dump.py
   M /branches/svnraisetc/tools/dev/po-merge.py
   M /branches/svnraisetc/tools/dev/random-commits.py
   M /branches/svnraisetc/tools/dev/scramble-tree.py
   M /branches/svnraisetc/tools/dev/svn-merge-revs.py
   M /branches/svnraisetc/tools/dev/verify-history.py
   M /branches/svnraisetc/tools/dev/which-error.py
   M /branches/svnraisetc/tools/dist/construct-rolling-environment.sh
   M /branches/svnraisetc/tools/dist/gen_nightly_ann.py
   M /branches/svnraisetc/tools/dist/getsigs.py
   M /branches/svnraisetc/tools/dist/post-to-tigris.py
   M /branches/svnraisetc/tools/dist/write-announcement.py
   M /branches/svnraisetc/tools/examples/blame.py
   M /branches/svnraisetc/tools/examples/check-modified.py
   M /branches/svnraisetc/tools/examples/dumpprops.py
   M /branches/svnraisetc/tools/examples/get-location-segments.py
   M /branches/svnraisetc/tools/examples/getfile.py
   M /branches/svnraisetc/tools/examples/geturl.py
   M /branches/svnraisetc/tools/examples/putfile.py
   M /branches/svnraisetc/tools/examples/revplist.py
   M /branches/svnraisetc/tools/examples/svnlook.py
   M /branches/svnraisetc/tools/examples/svnshell.py
   M /branches/svnraisetc/tools/hook-scripts/mailer/mailer.py
   M /branches/svnraisetc/tools/hook-scripts/mailer/tests/mailer-tweak.py
   M /branches/svnraisetc/tools/hook-scripts/svn2feed.py
   M /branches/svnraisetc/tools/hook-scripts/svnperms.py
   M /branches/svnraisetc/tools/hook-scripts/verify-po.py
   M /branches/svnraisetc/tools/po/l10n-report.py
   M /branches/svnraisetc/tools/server-side/fsfs-reshard.py
   M /branches/svnraisetc/tools/server-side/svn-backup-dumps.py
   M /branches/svnraisetc/tools/server-side/svn_server_log_parse.py
   M /branches/svnraisetc/tools/server-side/test_svn_server_log_parse.py
   M /branches/svnraisetc/win-tests.py
   M /branches/svnraisetc/www/faq.html
   M /branches/svnraisetc/www/getting.html
   M /branches/svnraisetc/www/images/svn-dav-securityspace-survey.png
   M /branches/svnraisetc/www/index.html
   M /branches/svnraisetc/www/license-1.html
   M /branches/svnraisetc/www/license-for-python-bindings.html
   M /branches/svnraisetc/www/links.html
   A /branches/svnraisetc/www/links.zh.html (from /trunk/www/links.zh.html:35202)
   M /branches/svnraisetc/www/release-history.html
   M /branches/svnraisetc/www/roadmap.html
   M /branches/svnraisetc/www/security.html
   M /branches/svnraisetc/www/svn-dav-securityspace-survey.html
   M /branches/svnraisetc/www/svn_1.6_releasenotes.html
   M /branches/svnraisetc/www/tools_contrib.html

On the svnraisetc branch: Merge changes from trunk up to r35202.

------------------------------------------------------------------------
r35204 | markphip | 2009-01-13 15:48:58 +0100 (Tue, 13 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java

JavaHL: Change getTreeConflict() to getConflictDescriptor() to be consistent
with method names in Status class.  Also added @since to JavaDoc

[ subversion/bindings/javahl/ ]
* src/org/tigris/subversion/javahl/Info2.java
  (getTreeConflict): rename this method
  (getConflictDescriptor): to this.
  (getDepth): added @since 1.5
  
------------------------------------------------------------------------
r35205 | markphip | 2009-01-13 15:52:12 +0100 (Tue, 13 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java

JavaHL: Change getTreeConflicted() to hasTreeConflict() to reflect
naming of similar methods that return a boolean

[ subversion/bindings/javahl/ ]
* src/org/tigris/subversion/javahl/Status.java
  (getTreeConflicted): rename this method
  (hasTreeConflict): to this.
  
------------------------------------------------------------------------
r35206 | cmpilato | 2009-01-13 15:59:46 +0100 (Tue, 13 Jan 2009) | 5 lines
Changed paths:
   M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py

Fix some module namespace oopses.

* tools/client-side/svnmerge/svnmerge-migrate-history-remotely.py
  (SvnmergeHistoryMigrator.migrate_path): s/svn.core./core./

------------------------------------------------------------------------
r35207 | julianfoad | 2009-01-13 16:23:28 +0100 (Tue, 13 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/info.c

Follow up r35191: rename the constants related to svn_info_t's new 64-bit
file size fields to reflect that relationship, and tweak the comments.

* subversion/include/svn_client.h
  (SVN_FILE_SIZE_UNKNOWN): Rename to ...
  (SVN_INFO_SIZE64_UNKNOWN): ... new name.
  (svn_info_t): Tweak comments.

* subversion/libsvn_client/info.c
  (build_info_from_dirent, build_info_from_entry, build_info_for_unversioned): 
    Adjust accordingly and tweak comments.

------------------------------------------------------------------------
r35208 | pburba | 2009-01-13 16:58:41 +0100 (Tue, 13 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/checkout_tests.py

Some comment tweaks for checkout_tests.py 13.

* subversion/tests/cmdline/checkout_tests.py
  (co_with_obstructing_local_adds): This test performs a checkout on an
  existing WC, not an update.

------------------------------------------------------------------------
r35209 | julianfoad | 2009-01-13 17:16:02 +0100 (Tue, 13 Jan 2009) | 2 lines
Changed paths:
   M /branches/issue-3334-dirs
   M /branches/issue-3334-dirs/TODO-1.6
   M /branches/issue-3334-dirs/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/issue-3334-dirs/contrib/hook-scripts/require-mergeinfo.pl
   M /branches/issue-3334-dirs/notes/wc-ng-design
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/SVNClient.h
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
   M /branches/issue-3334-dirs/subversion/include/svn_auth.h
   M /branches/issue-3334-dirs/subversion/include/svn_checksum.h
   M /branches/issue-3334-dirs/subversion/include/svn_client.h
   M /branches/issue-3334-dirs/subversion/include/svn_dirent_uri.h
   M /branches/issue-3334-dirs/subversion/include/svn_error.h
   M /branches/issue-3334-dirs/subversion/include/svn_error_codes.h
   M /branches/issue-3334-dirs/subversion/include/svn_wc.h
   M /branches/issue-3334-dirs/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/add.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/externals.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/info.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/merge.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-3334-dirs/subversion/libsvn_delta/compose_delta.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_svn/client.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_svn/marshal.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/auth.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/checksum.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/cmdline.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/dirent_uri.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/error.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/path.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/svn_base64.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/adm_files.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/adm_files.h
   M /branches/issue-3334-dirs/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/merge.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/props.c
   M /branches/issue-3334-dirs/subversion/svn/main.c
   M /branches/issue-3334-dirs/subversion/svn/notify.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/basic_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/externals_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/issue-3334-dirs/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py
   M /branches/issue-3334-dirs/subversion/tests/libsvn_subr/auth-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/issue-3334-dirs/tools/dev/contribulyze.py
   M /branches/issue-3334-dirs/tools/dev/mlpatch.py
   M /branches/issue-3334-dirs/tools/dist/post-to-tigris.py
   M /branches/issue-3334-dirs/tools/hook-scripts/mailer/mailer.py
   M /branches/issue-3334-dirs/tools/server-side/svn_server_log_parse.py
   M /branches/issue-3334-dirs/tools/server-side/test_svn_server_log_parse.py
   M /branches/issue-3334-dirs/www/links.html
   M /branches/issue-3334-dirs/www/svn_1.6_releasenotes.html

On the issue-3334-dirs branch: Merge changes from trunk up to r35207.

------------------------------------------------------------------------
r35210 | sussman | 2009-01-13 17:41:56 +0100 (Tue, 13 Jan 2009) | 1 line
Changed paths:
   M /trunk/subversion/mod_dav_svn/reports/get-locations.c

* subversion/mod_dav_svn/reports/get-locations.c:  fix source description.
------------------------------------------------------------------------
r35211 | cmpilato | 2009-01-13 17:46:27 +0100 (Tue, 13 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_client/log.c

Minor followup to r35199.

* subversion/libsvn_client/log.c
  (copyfrom_info_receiver): Tweak to handle (by ignoring) gap segments.
------------------------------------------------------------------------
r35212 | hwright | 2009-01-13 17:48:18 +0100 (Tue, 13 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c

Fix issue #1720: Pass mime-type information to notification callback.

* subversion/libsvn_wc/update_editor.c
  (close_file): Following the suggestion in the issue, fetch the svn:mime-type
    property and put the value in the notification object.

------------------------------------------------------------------------
r35213 | rhuijben | 2009-01-13 18:35:23 +0100 (Tue, 13 Jan 2009) | 13 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/info.c

Following up on r35191 and r35207, use svn_filesize_t for the 64 bit filesizes
in svn_info_t.

* subversion/include/svn_client.h
  (SVN_INFO_SIZE64_UNKNOWN): Remove unused macro.
  (svn_info_t): Use svn_filesize_t for filesizes and document the unavailable
    value as SVN_INVALID_FILESIZE.
* subversion/libsvn_client/info.c
  (build_info_from_dirent, build_info_from_entry, build_info_for_unversioned):
    Use SVN_INVALID_FILESIZE for unavailable svn_filesize_t values.

Suggested by: gstein

------------------------------------------------------------------------
r35214 | hwright | 2009-01-13 18:37:05 +0100 (Tue, 13 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/deprecated.c
   M /trunk/subversion/libsvn_wc/props.c

Shuffle a deprecated function to the right file.

* subversion/libsvn_wc/props.c
  (svn_wc_prop_set): Move from here...

* subversion/libsvn_wc/deprecated.c
  (svn_wc_prop_set): ...to here.

------------------------------------------------------------------------
r35215 | julianfoad | 2009-01-13 18:50:23 +0100 (Tue, 13 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c

[Note from the future: This commit was reverted in r35305]

Add comments about debugging issue #3354, a failure of copy during update.

* subversion/libsvn_wc/update_editor.c
  (merge_file): Add comments.

------------------------------------------------------------------------
r35216 | hwright | 2009-01-13 20:24:29 +0100 (Tue, 13 Jan 2009) | 21 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/prop_commands.c
   M /trunk/subversion/libsvn_wc/deprecated.c
   M /trunk/subversion/libsvn_wc/props.c

First bit of work on issue #783: Construct a notification system for properties.
Add a notification function/baton to svn_wc_prop_set3(), rev'ing the API along
the way.

* subversion/include/svn_wc.h
  (svn_wc_notify_action_t): Add several new members for property actions.
  (svn_wc_prop_set3): New.
  (svn_wc_prop_set2): Deprecate.

* subversion/libsvn_wc/deprecated.c
  (svn_wc_prop_set2): Add.

* subversion/libsvn_wc/props.c
  (svn_wc_prop_set2): Rename as...
  (svn_wc_prop_set3): and add notification function/baton parameters.  Invoke
    them as required.

* subversion/libsvn_client/prop_commands.c
  (propset_walk_cb): Use svn_wc_notify_property_modified, renamed from
    svn_wc_notify_property_updated.

------------------------------------------------------------------------
r35217 | hwright | 2009-01-13 20:50:25 +0100 (Tue, 13 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_client/prop_commands.c

More work on issue #783: Construct a notification system for properties.
Call the new wc prop_set API from libsvn_client.

* subversion/libsvn_client/prop_commands.c
  (propset_walk_cb): Don't notify manually, but pass the notification function
    down to the working copy library.
  (svn_client_propset3): Update caller.

------------------------------------------------------------------------
r35218 | cmpilato | 2009-01-13 21:30:58 +0100 (Tue, 13 Jan 2009) | 1 line
Changed paths:
   M /trunk/subversion/include/svn_repos.h

Itty bitty teeny tiny docstring wording tweak.
------------------------------------------------------------------------
r35219 | hwright | 2009-01-13 21:45:22 +0100 (Tue, 13 Jan 2009) | 15 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_wc/props.c
   M /trunk/subversion/svn/notify.c
   M /trunk/subversion/svn/propset-cmd.c

More work on issue #783: Construct a notification system for properties.
Use the client notification function for 'svn propset'.

* subversion/svn/propset-cmd.c
  (svn_cl__propset): Get and use a notifier.

* subversion/svn/notify.c
  (notify): For the various property setting actions, notify!

* subversion/include/svn_wc.h
  (svn_wc_notify_t): Add the property name to the notification struct.

* subversion/libsvn_wc/props.c
  (svn_wc_prop_set3): Populate the struct property name member.

------------------------------------------------------------------------
r35220 | sussman | 2009-01-13 22:09:41 +0100 (Tue, 13 Jan 2009) | 14 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/property.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/serf.c

Make serf's public get_youngest_rev() *not* use cached HEAD.
Create an internal helper func to used cached HEAD instead.

* subversion/libsvn_ra_serf/serf.c
  (svn_ra_serf__get_latest_revnum): don't use the cached HEAD.

* subversion/libsvn_ra_serf/ra_serf.h
  (svn_ra_serf__get_youngest_rev):  declare new helper func.

* subversion/libsvn_ra_serf/property.c 
  (svn_ra_serf__get_youngest_rev):  new internal helper func.  tries
                                    to use cached HEAD value first.
  (svn_ra_serf__get_baseline_info): cache HEAD when we discover it.

------------------------------------------------------------------------
r35221 | hwright | 2009-01-13 22:27:56 +0100 (Tue, 13 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/svn/notify.c
   M /trunk/subversion/svn/propdel-cmd.c

More work on issue #783: Construct a notification system for properties.
Use the client notification function for 'svn propdel'.

* subversion/svn/propdel-cmd.c
  (svn_cl__propdel): Get and use notifier.

* subversion/svn/notify.c
  (notify): Properly notify for deleted properties.

------------------------------------------------------------------------
r35222 | cmpilato | 2009-01-13 22:31:02 +0100 (Tue, 13 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/svn/main.c
   M /trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Report in 'svn' usage messages that 'exclude' is a valid value for the
--set-depth option.

* subversion/svn/main.c
  (svn_cl__options): Add 'exclude' --set-depth's list of valid depth values.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
  Update expected test output.

------------------------------------------------------------------------
r35223 | hwright | 2009-01-13 22:41:55 +0100 (Tue, 13 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_client/add.c
   M /trunk/subversion/libsvn_client/mergeinfo.c
   M /trunk/subversion/libsvn_client/ra.c
   M /trunk/subversion/libsvn_wc/copy.c

Don't use the deprecated svn_wc_prop_set2() function.

* subversion/libsvn_wc/copy.c
  (copy_props),
* subversion/libsvn_client/ra.c
  (set_wc_prop, invalidate_wcprop_for_entry),
* subversion/libsvn_client/mergeinfo.c
  (svn_client__record_wc_mergeinfo, elide_mergeinfo),
* subversion/libsvn_client/add.c
  (add_file):
    Replace svn_wc_prop_set2() with svn_wc_prop_set3().

------------------------------------------------------------------------
r35224 | hwright | 2009-01-13 23:40:34 +0100 (Tue, 13 Jan 2009) | 22 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/prop_commands.c
   M /trunk/subversion/svn/notify.c
   M /trunk/subversion/svn/propdel-cmd.c
   M /trunk/subversion/svn/propset-cmd.c

Finish issue #783: Construct a notification system for properties.
Extend the notification system for revprops.

* subversion/svn/propdel-cmd.c
  (svn_cl__propdel): Don't spit out output (the notifier will do it).

* subversion/svn/propset-cmd.c
  (svn_cl__propset): Same.

* subversion/svn/notify.c
  (notify): Add notifications for svn_wc_notify_revprop_set and 
    svn_wc_notify_revprop_deleted.

* subversion/include/svn_wc.h
  (svn_wc_notify_action_t): Add new actions for revprops.
 
* subversion/libsvn_client/prop_commands.c
  (svn_client_revprop_set2): Do the notification.

* subversion/include/svn_client.h
  (svn_client_revprop_set2): Update docs.

------------------------------------------------------------------------
r35225 | gstein | 2009-01-14 00:51:01 +0100 (Wed, 14 Jan 2009) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h

Remove a bunch of symbols from tree_conflicts.h, as clients have no need
to access those symbols. Also remove all the descriptive material for the
now-obsolete tree conflict storage format.

Bonus nit: add C++ "extern C" wrapper around the remaining declarations.

* subversion/libsvn_wc/tree_conflicts.h:
  (SVN_WC__NODE_*, SVN_WC__OPERATION_*, SVN_WC__CONFLICT_*): removed

* subversion/libsvn_wc/tree_conflicts.c:
  (node_kind_map, operation_map, action_map, reason_map): replace symbols
    with their string equivalents. the symbols/names are not used anywhere
    else (nor intended to be!), so there is no need to be wary of typos
    around these mappings.

------------------------------------------------------------------------
r35226 | gstein | 2009-01-14 01:57:11 +0100 (Wed, 14 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_crawler.c

Nit: tighten the declaration/use of a local variable.

* subversion/libsvn_wc/adm_crawler.c:
  (svn_wc_transmit_text_deltas2): move ENT into a tighter scope

------------------------------------------------------------------------
r35227 | gstein | 2009-01-14 02:58:15 +0100 (Wed, 14 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/translate.c

Rework some logic in svn_wc_translated_file2() to show that it is always
just some extra glue around svn_subst_copy_and_translate3(). This makes it
easier to reason about these crazy subst/translate functions.

* subversion/libsvn_wc/translate.c:
  (svn_wc_translated_file2): set up flags appropriately and then always
    call svn_subst_copy_and_translate3()

------------------------------------------------------------------------
r35228 | rhuijben | 2009-01-14 09:55:20 +0100 (Wed, 14 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/copy.c

* subversion/libsvn_wc/copy.c
  (svn_wc_copy2): Fix typo in comment.

------------------------------------------------------------------------
r35229 | gstein | 2009-01-14 12:07:30 +0100 (Wed, 14 Jan 2009) | 42 lines
Changed paths:
   M /trunk/subversion/include/svn_subst.h
   M /trunk/subversion/libsvn_client/cat.c
   M /trunk/subversion/libsvn_subr/deprecated.c
   M /trunk/subversion/libsvn_subr/subst.c

Begin some cleaning up of the translation APIs. Long term goal is to focus
on stream translation and to deprecate all file-based APIs. Callers can
easily map files to/from streams.

- svn_subst_translate_stream4 has been added to ensure that the streams
  passed to it will always be closed (simplifies and fixes some error
  cleanup logic)
- internal function create_special_file_from_stringbuf has been changed to
  take a stream instead

Note: there appears to be a lot of churn in svn_subst.h, but I simply
      moved the svn_subst_translate_stream* functions together

* subversion/include/svn_subst.h:
  (svn_subst_translate_stream4): new function to obsolete ...
  (svn_subst_translate_stream3): ... this one

* subversion/libsvn_subr/subst.c:
  (svn_subst_translate_stream3): moved to deprecated.c
  (svn_subst_translate_stream4): rebuilt on the ashes of stream3,
    including some argument renames. be very careful of all error returns,
    in order to make sure that the streams are closed before returning.
  (svn_subst_translate_cstring2): simplify in terms of stream4.
  (create_special_file_from_stringbuf): renamed into ...
  (create_special_file_from_source): ... this. take a source stream and
    read its first line, and create a special file (e.g. symlink) based on
    that information.
  (create_special_file): rewrite in terms of create_special_file_from_source
  (svn_subst_copy_and_translate3): rebuild and simplify using stream4.
  (svn_subst_create_translated): simplify special file creation using
    _from_stream. simplify and correct code and error return logic using
    the new stream4 variant.
  (close_handler_special): use new _from_stream function

* subversion/libsvn_subr/deprecated.c:
  (svn_subst_translate_stream3): moved here from subst.c and implemented
    in terms of the new stream4 function.

* subversion/libsvn_client/cat.c:
  (cat_local_file): switch to svn_subst_translate_stream4() and ensure
    that input is disowned for both branches. clarified err return logic.

------------------------------------------------------------------------
r35230 | gstein | 2009-01-14 14:41:43 +0100 (Wed, 14 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/include/svn_io.h
   M /trunk/subversion/libsvn_subr/stream.c

Constify the string passd to svn_stream_from_string().

* subversion/include/svn_io.h:
  (svn_stream_from_string): constify the STR parameter

* subveresion/libsvn_subr/stream.c:
  (struct string_stream.baton): constify the STR member
  (svn_stream_from_string): constify the STR parameter

------------------------------------------------------------------------
r35231 | julianfoad | 2009-01-14 15:06:22 +0100 (Wed, 14 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/actions.py

Add to the test suite a "run_and_verify_resolve" function.

* subversion/tests/cmdline/svntest/actions.py
  (_run_and_verify_resolve): New function, factored out of
    run_and_verify_resolved().
  (run_and_verify_resolve): New function, using _run_and_verify_resolve().
  (run_and_verify_resolved): Re-implement as a wrapper around
    _run_and_verify_resolve().

------------------------------------------------------------------------
r35232 | julianfoad | 2009-01-14 15:28:45 +0100 (Wed, 14 Jan 2009) | 2 lines
Changed paths:
   M /branches/issue-3334-dirs
   M /branches/issue-3334-dirs/subversion/include/svn_client.h
   M /branches/issue-3334-dirs/subversion/include/svn_io.h
   M /branches/issue-3334-dirs/subversion/include/svn_repos.h
   M /branches/issue-3334-dirs/subversion/include/svn_subst.h
   M /branches/issue-3334-dirs/subversion/include/svn_wc.h
   M /branches/issue-3334-dirs/subversion/libsvn_client/add.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/cat.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/info.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/prop_commands.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/ra.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/stream.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/subst.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/adm_crawler.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/copy.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/props.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/translate.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/tree_conflicts.h
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/get-locations.c
   M /branches/issue-3334-dirs/subversion/svn/main.c
   M /branches/issue-3334-dirs/subversion/svn/notify.c
   M /branches/issue-3334-dirs/subversion/svn/propdel-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/propset-cmd.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/checkout_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/actions.py

On the issue-3334-dirs branch: Merge changes from trunk up to r35231.

------------------------------------------------------------------------
r35233 | julianfoad | 2009-01-14 15:31:48 +0100 (Wed, 14 Jan 2009) | 8 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py

On the issue-3334-dirs branch:
Add a test that sets up two scenarios that should come out the same. This
"test" doesn't actually test that they do come out the same, yet.

* subversion/tests/cmdline/update_tests.py
  (tree_conflict_uc2_schedule_re_add): New test.
  (test_list): Add it.

------------------------------------------------------------------------
r35234 | julianfoad | 2009-01-14 15:32:06 +0100 (Wed, 14 Jan 2009) | 12 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c

On the issue-3334-dirs branch:
Set the 'copied' flag on all entries in the re-added tree. Previously I was
skipping one of the two entries for each directory (the one where it's a
child in its parent's entries file). Both of them need to be set.

Just one problem that I know of now remains with the re-added tree's state:
its root's 'revision' should not be bumped, at least in its "this dir" entry.

* subversion/libsvn_wc/update_editor.c
  (set_copied_callback): Don't skip dirs when they are not "this dir".
    Remove a bogus construction of "full_path".

------------------------------------------------------------------------
r35235 | gstein | 2009-01-14 15:39:08 +0100 (Wed, 14 Jan 2009) | 23 lines
Changed paths:
   M /trunk/subversion/include/svn_subst.h
   M /trunk/subversion/libsvn_client/blame.c
   M /trunk/subversion/libsvn_subr/subst.c

Continued cleaning of the various translation functions.

* subversion/include/svn_subst.h:
  (svn_subst_stream_translated): add note about closing the returned
    stream, and that it will (in turn) close the provided stream
  (svn_subst_stream_translated_to_normal_form): note that the source
    stream will be closed when the returned stream is closed.

* subversion/libsvn_client/blame.c:
  (svn_client_blame4): simplify call to svn_subst_stream_translated by
    directly opening a stream onto the "last file". clear out the closing
    of the file handle (no longer needed)

* subversion/libsvn_subr/subst.c:
  (svn_subst_stream_detranslated): clear out some code duplication by
    rewriting in terms of svn_subst_stream_translated_to_normal_form.
  (svn_subst_translate_cstring2): simplify and remove some string
    duplication.
  (create_special_file): remove, by folding contents into ...
  (svn_subst_copy_and_translate3): ... here. remove the resulting extra
    io_check. simplify this function by rebuilding in terms of
    svn_subst_create_translated.

------------------------------------------------------------------------
r35236 | hwright | 2009-01-14 16:28:15 +0100 (Wed, 14 Jan 2009) | 21 lines
Changed paths:
   M /trunk/subversion/svn/notify.c
   M /trunk/subversion/svn/propdel-cmd.c
   M /trunk/subversion/tests/cmdline/prop_tests.py

Fix issue 2220: Deleting a non-existent property should produce an error.

The solution is a bit tricky, since our notification functions (where we
actually detect the error) don't allow us to return an error.  So, in the case
where a 'svn propdel' happens recursively, all the operations go through, and
we then send the error.  It isn't perfect, but it's the best we've got under
the circumstances.

* subversion/tests/cmdline/prop_tests.py
  (perms_on_symlink, invalid_propnames): Update to expect errors.
  (delete_nonexistent_property): New.
  (test_list): Add new test.

* subversion/svn/propdel-cmd.c
  (notify_wrapper_baton, notify_wrapper): New.
  (svn_cl__propdel): Use the new wrapper to detect a 'deleted nonexistent'
    condition, and ultimately report it if one exists.

* subversion/svn/notify.c
  (notify): Don't notify on a deleted nonexistent event.

------------------------------------------------------------------------
r35237 | cmpilato | 2009-01-14 17:00:09 +0100 (Wed, 14 Jan 2009) | 1 line
Changed paths:
   M /trunk/notes/http-protocol-v2.txt

Minor typo/formatting fixes only.
------------------------------------------------------------------------
r35238 | hwright | 2009-01-14 17:04:55 +0100 (Wed, 14 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/svn/propdel-cmd.c

Random cleanups, include: fix copyright year, update whitespace, and return a
more appropriate error.

* subversion/svn/propdel-cmd.c
  (svn_cl__propdel): Fix no-space-before-paren function calls, and return
    the right error for nonexistent property deletion.

------------------------------------------------------------------------
r35239 | cmpilato | 2009-01-14 17:22:33 +0100 (Wed, 14 Jan 2009) | 1 line
Changed paths:
   A /branches/http-protocol-v2/BRANCH-README

Begin work on a BRANCH-README file, partly to see that I understand this work.
------------------------------------------------------------------------
r35240 | cmpilato | 2009-01-14 17:25:14 +0100 (Wed, 14 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Add another TODO item.
------------------------------------------------------------------------
r35241 | glasser | 2009-01-14 17:43:29 +0100 (Wed, 14 Jan 2009) | 51 lines
Changed paths:
   M /trunk/INSTALL
   M /trunk/Makefile.in
   D /trunk/build/ac-macros/sqlite.m4
   M /trunk/build.conf
   M /trunk/configure.ac
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_subr/sqlite.c
   A /trunk/subversion/libsvn_subr/sqlite3_c.h


Use an "amalgamated" in-line version of sqlite3 instead of linking
against an external library.  This change makes it much easier to
build Subversion on systems which have a pre-3.4.x sqlite3 installed
globally.

(It has the downside that there is no longer an option to use an
external sqlite3 at all, which may be desired by some packagers.
Personally, I prefer "everyone can build Subversion, but some
packagers might be a little sad about theoretical aspects" over "some
core Subversion developers (OK, at least just me) haven't been able
to build trunk Subversion for months, but packagers have their warm
fuzzy feelings".  I do hope that somebody who loves autoconf more than
I goes in and gives the option of using an external sqlite3.  Though
maybe this time the sqlite.m4 could check that the discovered sqlite3
is new enough, maybe?)

We may need to update some license file somewhere to mention
sqlite3_c.h (which is public domain).

* INSTALL
  (SQLite): No longer required to be installed separately.

* Makefile.in
  (SVN_SQLITE_LIBS): Remove.
  (INCLUDES): Remove @SVN_SQLITE_INCLUDES@.

* build.conf
  (libsvn_subr): Remove dep on sqlite.
  (sqlite): Remove.

* build/ac-macros/sqlite.m4
  Delete.

* configure.ac
  Remove sqlite stuff.

* subversion/include/private/svn_sqlite.h
  Don't include sqlite3.h.
  (svn_sqlite__bind_int64): Change type of argument from a sqlite type
   to an APR type.

* subversion/libsvn_subr/sqlite.c
  Don't include sqlite3.h.
  Include sqlite3_c.h, making all API functions static.
  (svn_sqlite__bind_int64): Change type of argument from a sqlite type
   to an APR type.

* subversion/libsvn_subr/sqlite3_c.h
  Copied from sqlite3.c from the SQLite 3.6.8 amalgamation.

------------------------------------------------------------------------
r35242 | hwright | 2009-01-14 17:48:15 +0100 (Wed, 14 Jan 2009) | 22 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/log.c
   M /trunk/subversion/libsvn_client/mergeinfo.c
   M /trunk/subversion/svn/log-cmd.c

Introduce a structure to hold arguments to svn_client_log5(), in the hopes that
in the future we can just add members to the structure instead of rev'ing the
entire API.

* subversion/svn/log-cmd.c
  (svn_cl__log),
* subversion/libsvn_client/deprecated.c
  (svn_client_log4),
* subversion/libsvn_client/mergeinfo.c
  (logs_for_mergeinfo_rangelist):
    Update callers.

* subversion/include/svn_client.h
  (svn_client_log_args_t, svn_client_log_args_create): New.
  (svn_client_log5): Remove arguments in favor or arg structure, update docs.

* subversion/libsvn_client/log.c
  (svn_client_log5): Use the members of the argument struct in place of params.
  (svn_client_log_args_create): New.

[Reverted in r35560]

------------------------------------------------------------------------
r35243 | cmpilato | 2009-01-14 17:54:58 +0100 (Wed, 14 Jan 2009) | 3 lines
Changed paths:
   M /trunk/www/hacking.html

* www/hacking.html
  (branch-based-development): New section describing some
    best-practices of doing branch-based development in our project.
------------------------------------------------------------------------
r35244 | hwright | 2009-01-14 18:06:27 +0100 (Wed, 14 Jan 2009) | 13 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/EnumMapper.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java

JavaHL: Make it build again by including the appropriate constants and
mappings for the property notification actions.

[ in subversion/bindings/javahl/ ]
* native/EnumMapper.cpp
  (mapNotifyAction): Map the new action enums to the appropriate Java values.

* src/org/tigris/subversion/javahl/NotifyAction.java
  (property_updated): Remove.
  (property_added, property_modified, property_deleted,
   property_deleted_nonexistent, revprop_set, revprop_deleted): New.
  (actionNames): Update.

------------------------------------------------------------------------
r35245 | hwright | 2009-01-14 18:15:28 +0100 (Wed, 14 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

JavaHL: Followup to r35242 by using the new struct and APIs.

* subversion/bindings/javahl/native/SVNClient.cpp
  (logMessages): Use the new log args struct and translate existing arguments
    into it.

[Reverted in r35560]

------------------------------------------------------------------------
r35246 | hwright | 2009-01-14 18:47:10 +0100 (Wed, 14 Jan 2009) | 5 lines
Changed paths:
   M /trunk/www/faq.zh.html
   M /trunk/www/links.zh.html
   M /trunk/www/tools_contrib.zh.html

* www/tools_contrib.zh.html,
  www/faq.zh.html,
  www/links.zh.html:
Set the svn:eol-style property to native.

------------------------------------------------------------------------
r35247 | hwright | 2009-01-14 18:52:23 +0100 (Wed, 14 Jan 2009) | 7 lines
Changed paths:
   M /trunk/www/faq.html
   M /trunk/www/faq.zh.html
   M /trunk/www/links.html
   M /trunk/www/links.zh.html
   M /trunk/www/mailing-lists.html

* www/links.html,
  www/faq.zh.html,
  www/links.zh.html,
  www/mailing-lists.html,
  www/faq.html:
  Fix various validation errors.

------------------------------------------------------------------------
r35248 | hwright | 2009-01-14 19:06:00 +0100 (Wed, 14 Jan 2009) | 36 lines
Changed paths:
   M /trunk/subversion/bindings/ctypes-python/csvn/__init__.py
   M /trunk/subversion/bindings/ctypes-python/csvn/auth.py
   M /trunk/subversion/bindings/ctypes-python/csvn/core/__init__.py
   M /trunk/subversion/bindings/ctypes-python/csvn/ext/__init__.py
   M /trunk/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
   M /trunk/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /trunk/subversion/bindings/ctypes-python/csvn/repos.py
   M /trunk/subversion/bindings/ctypes-python/csvn/txn.py
   M /trunk/subversion/bindings/ctypes-python/examples/example.py
   M /trunk/subversion/bindings/ctypes-python/examples/log.py
   M /trunk/subversion/bindings/ctypes-python/examples/mucc.py
   M /trunk/subversion/bindings/ctypes-python/examples/trunkify.py
   M /trunk/subversion/bindings/ctypes-python/setup.py
   M /trunk/subversion/bindings/swig/ruby/svn/commit-mailer.rb
   M /trunk/subversion/bindings/swig/ruby/svn/synchronizer.rb
   M /trunk/subversion/bindings/swig/svn_diff.i
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_auth_gnome_keyring/version.c
   M /trunk/subversion/libsvn_auth_kwallet/version.c
   M /trunk/subversion/libsvn_subr/sqlite.c
   M /trunk/subversion/libsvn_subr/sqlite3_c.h
   M /trunk/subversion/libsvn_wc/crop.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/libsvn_wc/tree_conflicts.h
   M /trunk/subversion/libsvn_wc/wc_db.c
   M /trunk/subversion/svn/tree-conflicts.c
   M /trunk/subversion/svn/tree-conflicts.h
   M /trunk/subversion/tests/cmdline/resolved_tests.py
   M /trunk/subversion/tests/libsvn_delta/window-test.c
   M /trunk/subversion/tests/libsvn_subr/auth-test.c
   M /trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c

More svn:eol-style fun.
 
* subversion/libsvn_subr/sqlite.c,
  subversion/libsvn_subr/sqlite3_c.h,
  subversion/libsvn_auth_gnome_keyring/version.c,
  subversion/bindings/ctypes-python/setup.py,
  subversion/bindings/ctypes-python/csvn/repos.py,
  subversion/bindings/ctypes-python/csvn/ext/__init__.py,
  subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py,
  subversion/bindings/ctypes-python/csvn/ext/listmixin.py,
  subversion/bindings/ctypes-python/csvn/txn.py,
  subversion/bindings/ctypes-python/csvn/__init__.py,
  subversion/bindings/ctypes-python/csvn/core/__init__.py,
  subversion/bindings/ctypes-python/csvn/auth.py,
  subversion/bindings/ctypes-python/examples/example.py,
  subversion/bindings/ctypes-python/examples/trunkify.py,
  subversion/bindings/ctypes-python/examples/log.py,
  subversion/bindings/ctypes-python/examples/mucc.py,
  subversion/bindings/swig/ruby/svn/synchronizer.rb,
  subversion/bindings/swig/ruby/svn/commit-mailer.rb,
  subversion/bindings/swig/svn_diff.i,
  subversion/tests/libsvn_wc/tree-conflict-data-test.c,
  subversion/tests/libsvn_subr/auth-test.c,
  subversion/tests/libsvn_delta/window-test.c,
  subversion/tests/cmdline/resolved_tests.py,
  subversion/svn/tree-conflicts.c,
  subversion/svn/tree-conflicts.h,
  subversion/include/private/svn_sqlite.h,
  subversion/libsvn_wc/crop.c,
  subversion/libsvn_wc/tree_conflicts.c,
  subversion/libsvn_wc/tree_conflicts.h,
  subversion/libsvn_wc/wc_db.c,
  subversion/libsvn_auth_kwallet/version.c:
    All of these textual types should have the svn:eol-style properties set to
    'native', so do it.

------------------------------------------------------------------------
r35249 | hwright | 2009-01-14 21:11:49 +0100 (Wed, 14 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite3_c.h

Update our new handy SQLite amalgamation to 3.6.9, as recommended by the
release notes.

* subversion/libsvn_subr/sqlite3_c.h:
  Update.

------------------------------------------------------------------------
r35250 | cmpilato | 2009-01-14 21:18:24 +0100 (Wed, 14 Jan 2009) | 22 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/reports/get-location-segments.c

Fix the error handling of the mod_dav_svn get-location-segments
REPORT response logic.

Before this change, if svn_repos_node_location_segments() failed,
three problems occurred:  the REPORT would return a 200 status code,
the response body was not well-formed XML, and we never attempted to
embed into the response the special error tags that let the client
know what went wrong.  This change remedies all of those problems by
mimicking the way other callback-driven REPORT response logic works
(namely, that of 'svn log').

* subversion/mod_dav_svn/reports/get-location-segments.c
  (struct location_segment_baton): Add 'sent_opener' boolean.
  (maybe_send_opener): New helper function.
  (location_segment_receiver): Use maybe_send_opener().
  (send_get_location_segments_report): Now return dav_error * instead
    of svn_error_t *.  Properly trap Subversion errors and construct
    DAV errors, modeling the brigade flushing and error management
    employed by the log REPORT handling code in log.c.
  (dav_svn__get_location_segments_report): Move brigade flushing stuff
    and some error handling to send_get_location_segments_report().

------------------------------------------------------------------------
r35251 | cmpilato | 2009-01-14 21:20:34 +0100 (Wed, 14 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Propose r35250 for backport to 1.5.x.
------------------------------------------------------------------------
r35252 | pburba | 2009-01-14 21:59:58 +0100 (Wed, 14 Jan 2009) | 16 lines
Changed paths:
   M /trunk/build/generator/gen_win.py
   M /trunk/gen-make.py

Follow-up to r35241, use the sqlite amalgamation included in libsvn_subr
when building on Windows.

[Reverted in r35294]

* build/generator/gen_win.py
  (GeneratorBase.parse_options): Remove self.sqlite_path initialization
  and parsing of '--with-sqlite' option.
  (WinGeneratorBase.__init__): Don't try to find sqlite.
  (WinGeneratorBase.get_win_includes,
   WinGeneratorBase.get_win_lib_dirs,
   WinGeneratorBase.get_win_libs): Remove sqlite related stuff.
  (WinGeneratorBase._find_sqlite): Remove.

* gen-make.py
  (_usage_exit, Options): Remove --with-sqlite option.  
------------------------------------------------------------------------
r35253 | glasser | 2009-01-14 22:09:17 +0100 (Wed, 14 Jan 2009) | 83 lines
Changed paths:
   M /trunk/subversion/include/svn_fs.h
   M /trunk/subversion/libsvn_fs/fs-loader.c
   M /trunk/subversion/libsvn_fs_base/bdb/changes-table.c
   M /trunk/subversion/libsvn_fs_base/bdb/changes-table.h
   M /trunk/subversion/libsvn_fs_base/tree.c
   M /trunk/subversion/libsvn_fs_fs/fs.h
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c
   M /trunk/subversion/libsvn_fs_fs/fs_fs.h
   M /trunk/subversion/libsvn_fs_fs/structure
   M /trunk/subversion/libsvn_fs_fs/tree.c
   M /trunk/subversion/libsvn_repos/replay.c

Rev svn_fs_paths_changed to include the node kind and copyfrom
information for the changed paths, with a flag controlling whether or
not the user *really* wants the information (that is, whether to fetch
it even if it isn't "free" with the changed path list).

In FSFS, start recording node kinds in the changed paths list for
format 4 revisions and for all transactions.  (FSFS already stored
copyfrom information in all changed paths list.)  In BDB, don't (yet)
return any of this data unless the I-really-want-it-even-if-it's-slow
flag is set.

Update svn_repos_replay to use the new API; this means that for the
send_delta=False case, replay doesn't need to do any FS touching other
than the initial svn_fs_paths_changed2.  (Well, and some MD5 lookups,
which could probably be removed later.)  This can speedup some uses of
replay, such as the ChangeCollector in the Python bindings which is
used by mailer.py.

This is also a first step towards fixing Issue #1967, though I don't
personally plan to continue down that road.

* subversion/include/svn_fs.h
  (svn_fs_path_change2_t): Rev with new node_kind and copyfrom_* fields.
  (svn_fs_path_change_t): Deprecate.
  (svn_fs_paths_changed2): Rev, returning the new type and taking a
   new flag.
  (svn_fs_paths_changed): Deprecate.

* subversion/libsvn_fs/fs-loader.c
  (svn_fs_paths_changed2): New; implements the
   get_all_kinds_and_copyfroms flag.
  (svn_fs_paths_changed): Implement in terms of new version.

* subversion/libsvn_fs_base/bdb/changes-table.c
  (fold_change): Use new type; initialize new fields.

* subversion/libsvn_fs_base/bdb/changes-table.h
  (svn_fs_bdb__changes_fetch): Update docstring.

* subversion/libsvn_fs_base/tree.c
  (verify_locks): Use new type.

* subversion/libsvn_fs_fs/fs.h
  (SVN_FS_FS__MIN_KIND_IN_CHANGED_FORMAT): New.
  (change_t): Add node_kind field.

* subversion/libsvn_fs_fs/fs_fs.c
  (fold_change): Use new type.  Use copyfrom_cache purely for its
   caching-on-rev-root purpose rather than as the only place that
   copyfrom data is stored (it is now stored inside the changed_ts
   themselves).
  (read_change): Read kind from action if it is there.
  (fetch_all_changes): Don't use a copyfrom_cache unless one is
   passed in.
  (svn_fs_fs__txn_changes_fetch): Don't use a copyfrom_cache.
  (write_change_entry): Use new type.  Write the node kind too if
   requested.
  (svn_fs_fs__add_change): Use new type.  Take node_kind argument.
  (write_final_changed_path_info): Use new type.  Don't use a
   copyfrom_cache.  Check format to see if we should write kinds.
  (verify_locks): Use new type.  Adjust.

* subversion/libsvn_fs_fs/fs_fs.h
  (svn_fs_fs__add_change): Take node_kind argument.
  (svn_fs_fs__txn_changes_fetch): Don't use a copyfrom_cache.

* subversion/libsvn_fs_fs/structure
  Document storage of node kind in changed paths lists.

* subversion/libsvn_fs_fs/tree.c
  (add_change): Take node_kind argument.
  (fs_change_node_prop, fs_make_dir, fs_delete_node, copy_helper,
   fs_make_file, apply_textdelta, apply_text): Pass node kind to
   add_change.
  (fs_paths_changed): Update docstring; remove copyfrom_cache from
   svn_fs_fs__txn_changes_fetch call.

* subversion/libsvn_repos/replay.c
  (add_subdir): Use new type.
  (path_driver_cb_func): Use new type; replace calls to
   svn_fs_check_path and svn_fs_copied_from with field references.
  (svn_repos_replay2): Use new API and type.

------------------------------------------------------------------------
r35254 | hwright | 2009-01-14 22:21:03 +0100 (Wed, 14 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/tree.c

Followup to r35253: Change variable name to avoid shadowing a new function name.

* subversion/libsvn_fs_fs/tree.c
  (fs_delete_node): Rename node_kind to kind.

------------------------------------------------------------------------
r35255 | glasser | 2009-01-14 23:11:47 +0100 (Wed, 14 Jan 2009) | 20 lines
Changed paths:
   M /trunk/subversion/include/svn_fs.h
   M /trunk/subversion/libsvn_fs/fs-loader.c
   M /trunk/subversion/libsvn_repos/replay.c

Followup to r32523: remove the get_all_kinds_and_copyfroms flag from
svn_fs_paths_changed2, because it didn't really work; for example, it
would get the wrong answer on deletes, and fixing it in the general
case would be non-trivial (it would essentially need all the replay
logic).  Leave filling in this data to the consumer.  This should make
the BDB tests pass again.

* subversion/include/svn_fs.h
  (svn_fs_paths_changed2): Remove get_all_kinds_and_copyfroms argument;
   update docstring.

* subversion/libsvn_fs/fs-loader.c
  (svn_fs_paths_changed2): Remove get_all_kinds_and_copyfroms argument
   and its logic.
  (svn_fs_paths_changed): Adjust.

* subversion/libsvn_repos/replay.c
  (path_driver_cb_func): Look up kind and copyfrom if it's not there.
  (svn_repos_replay2): Adjust.

------------------------------------------------------------------------
r35256 | stsp | 2009-01-14 23:31:50 +0100 (Wed, 14 Jan 2009) | 17 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite3_c.h

Unbreak trunk build for platforms which do not have ENOTSUP defined,
e.g. OpenBSD.

This is actually a bug in sqlite [1]. They #ifdef'd ENOTSUP in some
places, but not all. I have no idea if this fix is correct.
I'm not an sqlite developer. And we actually don't want to have
to apply custom patches to this file in the first place.

This commit should be backed out once external sqlite libraries
can be used again. It's a temporary band-aid only to unbreak the
build for me, and possibly others.

* subversion/libsvn_subr/sqlite3_c.h
  (full_fsync): Don't blindly assume ENOTSUP exists.

[1] http://www.sqlite.org/cvstrac/tktview?tn=3512

------------------------------------------------------------------------
r35257 | stsp | 2009-01-15 02:28:55 +0100 (Thu, 15 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/merge.c

* subversion/libsvn_wc/merge.c
  (svn_wc__merge_internal): Add a huge brain-dump comment to
    document possible insight gained into issue #3354 before
    I fall asleep on this oh-my-so-comfortable couch (look,
    the cat has already fallen asleep, awwww...)

------------------------------------------------------------------------
r35258 | gstein | 2009-01-15 11:40:01 +0100 (Thu, 15 Jan 2009) | 41 lines
Changed paths:
   M /trunk/subversion/include/svn_io.h
   M /trunk/subversion/include/svn_subst.h
   M /trunk/subversion/libsvn_client/export.c
   M /trunk/subversion/libsvn_subr/deprecated.c
   M /trunk/subversion/libsvn_subr/subst.c
   M /trunk/subversion/libsvn_wc/copy.c
   M /trunk/subversion/libsvn_wc/questions.c

Trim down the set of supported APIs in svn_subst.h. Simplify the
translate_stream4 implementation by using the more generalized
streamy code of svn_subst_stream_translated()

* subversion/include/svn_subst.h:
  (svn_subst_stream_detranslated): removed in favor of having clients use
    one of two other APIs.
  (svn_subst_get_detranslated_stream): removed. it was added for 1.6 but
    had problems. killed with extreme prejudice.

* subversion/include/svn_io.h:
  (svn_stream_copy3): fix typo. add TODO

* subversion/libsvn_client/export.c:
  (copy_one_versioned_file): use svn_subst_stream_from_specialfile instead
    of the (bad) svn_subst_get_detranslated_stream.

* subversion/libsvn_wc/questions.c:
  (compare_and_verify): use svn_subst_stream_from_specialfile or
    svn_subst_stream_translated_to_normal_form as appropriate, instead of
    the deprecated svn_subst_stream_detranslated. tweak some of the logic
    flow for selecting streams to compare.

* subversion/libsvn_wc/copy.c:
  (copy_file_administratively): use svn_subst_stream_from_specialfile
    instead of svn_subst_get_detranslated_stream. replace use of
    svn_subst_stream_detranslated.

* subversion/libsvn_subr/deprecated.c:
  (svn_subst_stream_detranslated): moved here from subst.c

* subversion/libsvn_subr/subst.c:
  (svn_subst_get_detranslated_stream): renamed to ...
  (open_specialfile): ... this, and made static.
  (svn_subst_stream_detranslated): moved to deprecated.c
  (svn_subst_translate_stream4): full revamp in terms of
    svn_subst_stream_translated, instead of "manual" translation.
  (detranslate_special_file, svn_subst_copy_and_translate,
      svn_subst_stream_from_specialfile): follow rename of
    svn_subst_get_detranslated_stream to open_specialfile.

------------------------------------------------------------------------
r35259 | julianfoad | 2009-01-15 15:27:32 +0100 (Thu, 15 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/error.c

Make the default "malfunction" handler actually abort as intended (and as its
name implies) after displaying the error, rather than doing a nice "exit".
This helps debugging because "abort" triggers a break in GDB.

Suggested by: glasser

* subversion/libsvn_subr/error.c
  (svn_error_abort_on_malfunction): Abort after displaying the error.

------------------------------------------------------------------------
r35260 | julianfoad | 2009-01-15 16:17:56 +0100 (Thu, 15 Jan 2009) | 3 lines
Changed paths:
   M /branches/issue-3334-dirs/notes/tree-conflicts/resolution.txt

* notes/tree-conflicts/resolution.txt
  Add notes on how scheduled renames and replacements are treated.

------------------------------------------------------------------------
r35261 | gstein | 2009-01-15 17:38:38 +0100 (Thu, 15 Jan 2009) | 54 lines
Changed paths:
   M /trunk/subversion/include/svn_subst.h
   M /trunk/subversion/libsvn_client/cat.c
   M /trunk/subversion/libsvn_client/export.c
   M /trunk/subversion/libsvn_subr/deprecated.c
   M /trunk/subversion/libsvn_subr/subst.c
   M /trunk/subversion/libsvn_wc/copy.c
   M /trunk/subversion/libsvn_wc/questions.c
   M /trunk/subversion/libsvn_wc/translate.c

Continued evolution of the translation APIs.

- svn_subst_translate_stream4 has been rolled back, leaving the
  still-deprecated svn_subst_translate_stream3.
- svn_subst_stream_from_specialfile has been deprecated in favor of the
  clearer svn_subst_*_specialfile APIs. the dual-purpose stream was very
  hard to use and made reading code using it hard to understand

* subversion/libsvn_subr/subst.c:
  (open_specialfile): this poor function has been renamed once again to ...
  (svn_subst_read_specialfile): ... this. we also create a readonly stream
    around an svn_string_t rather than a stringbuf-based stream.
  (svn_subst_translate_stream4): removed. a couple of the key lines move
    to deprecated.c and svn_subst_translate_stream3.
  (svn_subst_translate_cstring2): big optimization. don't create two
    streams and use stream4 to copy between them. instead, create the
    stringbuf string to hold the output, wrap a translator stream around
    it, and directly write the bytes into it. easy peasy.
  (detranslate_special_file): follow rename to svn_subst_read_specialfile
  (svn_subst_copy_and_translate3): follow rename to svn_subst_read_specialfile
  (svn_subst_create_translated): toss use of stream4 in favor of wrapping
    the destination stream (if needed) and always copying
  (svn_subst_create_specialfile): new function, with basically a copy of
    the deprecated svn_subst_stream_from_specialfile function.
  (svn_subst_stream_from_specialfile): follow rename

* subversion/libsvn_subr/deprecated.c:
  (svn_subst_translate_stream3): implement stream copying rather than
    attempting to call the now-missing stream4 variant.
  (svn_subst_stream_detranslated): use new svn_subst_read_specialfile

* subversion/libsvn_client/export.c:
  (copy_one_versionedfile): use new svn_subst_read_specialfile

* subversion/libsvn_client/cat.c:
  (cat_local_file): optionally wrap destination stream instead of using
    the stream4 API.

* subversion/libsvn_wc/questions.c:
  (compare_and_verify): use new svn_subst_read_specialfile

* subversion/libsvn_wc/translate.c:
  (svn_wc_translated_stream): large control flow tweak in order to remove
    svn_subst_stream_from_specialfile

* subversion/libsvn_wc/copy.c:
  (copy_file_administratively): use new svn_subst_read_specialfile

* subversion/include/svn_subst.h:
  (svn_subst_translate_stream4): removed
  (svn_subst_translate_stream3): restore the docstring
  (svn_subst_read_specialfile, svn_subst_create_specialfile): add new
    targeted functions to take over from svn_subst_open_specialfile

------------------------------------------------------------------------
r35262 | jwhitlock | 2009-01-15 17:48:56 +0100 (Thu, 15 Jan 2009) | 6 lines
Changed paths:
   M /trunk/build/ac-macros/neon.m4
   M /trunk/build/ac-macros/serf.m4

Make it possible to build Subversion against binary installations of its deps.

* build/ac-macros/neon.m4,
  build/ac-macros/serf.m4: Remove the requirement for the libtool archive files
   when configured to build against binary installations.

------------------------------------------------------------------------
r35263 | hwright | 2009-01-15 18:12:23 +0100 (Thu, 15 Jan 2009) | 43 lines
Changed paths:
   M /trunk/Makefile.in
   A /trunk/build/ac-macros/sqlite.m4 (from /trunk/build/ac-macros/sqlite.m4:35240)
   M /trunk/build/getversion.py
   M /trunk/build.conf
   M /trunk/configure.ac
   M /trunk/subversion/libsvn_subr
   M /trunk/subversion/libsvn_subr/sqlite.c
   D /trunk/subversion/libsvn_subr/sqlite3_c.h

Make configure a bit more flexible when is comes to SQLite:
 * When given the --with-sqlite flag:
    - check that the target is a sqlite installation that exists and meets
      our minimum requirements
    - check that the target is the sqlite amalgamation that exists and meets
      our minimum requirements

 * When not given the --with-sqlite flag:
    - check for the shared library via pkg-config
    - check for an appropriate amalgamation file in build/

INSTALL still needs to be updated, as does the code for including the
amalgamation file in -deps.  Those commits will follow shortly.

This commit also reverts portions of r35241, which added initial support
for the amalgamation file (to the detriment of library installs).

* Makefile.in, build.conf:
  Revert r35241.

* subversion/libsvn_subr/sqlite.c:
  Conditionally include the amalgamation.

* subversion/libsvn_subr/sqlite3_c.h:
  Remove.

* build/ac-macros/sqlite.m4
  (SVN_LIB_SQLITE): Update config order as described above, and refactor to make
    slightly more readable.
  (SVN_SQLITE_PKG_CONFIG, SVN_SQLITE_DIR_CONFIG, SVN_SQLITE_FILE_CONFIG,
   SVN_SQLITE_VERNUM_PARSE): New.
  (SVN_DOWNLOAD_SQLITE): Update text.

* build/getversion.py
  (svn_extractor, sqlite_extractor, extractors): New.
  (usage_and_exit): Update.
  (): Allow this file to parse SQLite version information as well as svn
    version information.

* configure.ac
  Partially revert r35241, and use a minimum version in place of an accepted
  pattern for SQLite checking.

------------------------------------------------------------------------
r35264 | hwright | 2009-01-15 18:15:33 +0100 (Thu, 15 Jan 2009) | 4 lines
Changed paths:
   M /trunk/INSTALL

* INSTALL
  (SQLite): Update with notes about where configure searchs for SQLite, and
    how a user can get it.

------------------------------------------------------------------------
r35265 | cmpilato | 2009-01-15 18:18:23 +0100 (Thu, 15 Jan 2009) | 12 lines
Changed paths:
   M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py

Make the svnmerge history migration tools able to deal with (by
ignoring) svnmerge-* records that lack revision ranges for their
paths.

* contrib/client-side/svnmerge/svnmerge-migrate-history.py
  (Migrator.svnmerge_prop_to_mergeinfo): Skip svnmerge mergeinfo with
    missing revision ranges.

* contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
  (svnmerge_prop_to_mergeinfo): Skip svnmerge mergeinfo with missing
    revision ranges.

------------------------------------------------------------------------
r35266 | hwright | 2009-01-15 18:45:53 +0100 (Thu, 15 Jan 2009) | 5 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

* build/ac-macros/sqlite.m4
  (SVN_SQLITE_VERNUM_PARSE): Followup to r35263:
    If `pkg-config sqlite --modversion` returns a two-tuple for the version
    number, assume the micro version is 0.

------------------------------------------------------------------------
r35267 | hwright | 2009-01-15 19:01:22 +0100 (Thu, 15 Jan 2009) | 4 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

* build/ac-macros/sqlite.m4
  (SVN_LIB_SQLITE): Another followup to r35263: Check standard system locations
    for sqlite before going to the amalgamation file.

------------------------------------------------------------------------
r35268 | hwright | 2009-01-15 21:09:00 +0100 (Thu, 15 Jan 2009) | 16 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4
   M /trunk/subversion/libsvn_subr/sqlite.c

Include the sqlite amalgamation in place, rather than copying it to
libsvn_subr.  This should also fix the build error created when building
and not using the amalgamation.

* build/ac-macros/sqlite.m4
  (SVN_LIB_SQLITE): Look for the amalgamation in ./sqlite-amalgamation
    This is consistent with other things we ship in deps (and people can
    always use --with-sqlite to point it somewhere else.
  (SVN_SQLITE_DIR_CONFIG): Add some informative text.
  (SVN_SQLITE_FILE_CONFIG): Set the SVN_SQLITE_INCLUDES to include the
    site of the amalgamation file.

* subversion/libsvn_subr/sqlite.c:
  Include the amalgamation file directly, and use <> notation so that
  gen-make.py doesn't create it as a dependency.

------------------------------------------------------------------------
r35269 | jwhitlock | 2009-01-15 21:16:21 +0100 (Thu, 15 Jan 2009) | 4 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

Fix some scripting errors when pkg-config doesn't find sqlite3.

* build/ac-macros/sqlite.m4: Only process the findings of pkg-config if found.

------------------------------------------------------------------------
r35270 | jwhitlock | 2009-01-15 21:23:35 +0100 (Thu, 15 Jan 2009) | 3 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

* build/ac-macros/sqlite.m4 (SVN_SQLITE_PKG_CONFIG): Removed false statement
   in function comment.

------------------------------------------------------------------------
r35271 | hwright | 2009-01-15 21:45:28 +0100 (Thu, 15 Jan 2009) | 8 lines
Changed paths:
   M /trunk/build.conf
   M /trunk/subversion/libsvn_subr

Various sqlite-related cleanups.

* build.conf
  (private-includes): Remove sqlite amalgamation.

* subversion/libsvn_subr/:
  Remove sqlite amalgamation ignore.

------------------------------------------------------------------------
r35272 | julianfoad | 2009-01-15 23:23:49 +0100 (Thu, 15 Jan 2009) | 14 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/switch_tests.py

On the issue-3334-dirs branch:
Fix the case where a 'switch' did not switch the URL of a node where an
incoming delete conflicted with a local modification. This previously left
the node marked as 'switched' (because its parent had been switched but it
had not), so an attempt to re-add it would not add it in the right place.

* subversion/libsvn_wc/update_editor.c
  (schedule_existing_item_for_re_add): Add a THEIR_URL parameter for the new
    URL, and change the node's base URL to that.
  (do_entry_deletion): Pass THEIR_URL to schedule_existing_item_for_re_add().

* subversion/tests/cmdline/switch_tests.py
  (failed_anchor_is_target): Remove the bogus 'switched' expectation.

------------------------------------------------------------------------
r35273 | hwright | 2009-01-15 23:23:57 +0100 (Thu, 15 Jan 2009) | 8 lines
Changed paths:
   M /trunk/tools/dist/construct-rolling-environment.sh
   M /trunk/tools/dist/dist.sh

Update the distribution scripts to ship the SQLite amalgamation.

* tools/dist/construct-rolling-environment.sh
  (create_deps): Fetch and include the sqlite amalgamation.

* tools/dist/dist.sh:
  Include the sqlite amalgamation dependency in the -deps tarball.

------------------------------------------------------------------------
r35274 | glasser | 2009-01-16 00:20:48 +0100 (Fri, 16 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Followup to r32523: always update the node_kind field when folding
changes (so that, eg, a series of changes like add-dir, delete-dir,
add-file does leave you with node_kind=file).

* subversion/libsvn_fs_fs/fs_fs.c
  (fold_change): Move assignment out of conditional.

------------------------------------------------------------------------
r35275 | glasser | 2009-01-16 00:41:01 +0100 (Fri, 16 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Followup to r32523: don't dereference a null pointer.

* subversion/libsvn_fs_fs/fs_fs.c
  (fold_change): Move assignment into conditional.

------------------------------------------------------------------------
r35276 | jwhitlock | 2009-01-16 06:02:09 +0100 (Fri, 16 Jan 2009) | 4 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

* build/ac-macros/sqlite.m4
  (SVN_SQLITE_PKG_CONFIG): Remove unnecessary output when pkg-config
   finds sqlite3.

------------------------------------------------------------------------
r35277 | stylesen | 2009-01-16 06:43:53 +0100 (Fri, 16 Jan 2009) | 7 lines
Changed paths:
   M /branches/1.5.x-issue2489
   M /branches/1.5.x-issue2489/CHANGES
   M /branches/1.5.x-issue2489/COMMITTERS
   M /branches/1.5.x-issue2489/STATUS
   M /branches/1.5.x-issue2489/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x-issue2489/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/1.5.x-issue2489/subversion/bindings/swig
   M /branches/1.5.x-issue2489/subversion/bindings/swig/ruby/test/test_wc.rb
   M /branches/1.5.x-issue2489/subversion/include/private
   M /branches/1.5.x-issue2489/subversion/include/private/svn_mergeinfo_private.h
   M /branches/1.5.x-issue2489/subversion/include/svn_client.h
   M /branches/1.5.x-issue2489/subversion/include/svn_mergeinfo.h
   M /branches/1.5.x-issue2489/subversion/include/svn_version.h
   M /branches/1.5.x-issue2489/subversion/include/svn_wc.h
   M /branches/1.5.x-issue2489/subversion/libsvn_client/commit.c
   M /branches/1.5.x-issue2489/subversion/libsvn_client/copy.c
   M /branches/1.5.x-issue2489/subversion/libsvn_client/merge.c
   M /branches/1.5.x-issue2489/subversion/libsvn_client/ra.c
   M /branches/1.5.x-issue2489/subversion/libsvn_diff/diff_file.c
   M /branches/1.5.x-issue2489/subversion/libsvn_fs_base/fs.c
   M /branches/1.5.x-issue2489/subversion/libsvn_fs_base/tree.c
   M /branches/1.5.x-issue2489/subversion/libsvn_ra_neon/mergeinfo.c
   M /branches/1.5.x-issue2489/subversion/libsvn_ra_svn/cyrus_auth.c
   M /branches/1.5.x-issue2489/subversion/libsvn_ra_svn/internal_auth.c
   M /branches/1.5.x-issue2489/subversion/libsvn_ra_svn/ra_svn.h
   M /branches/1.5.x-issue2489/subversion/libsvn_repos/log.c
   M /branches/1.5.x-issue2489/subversion/libsvn_subr
   M /branches/1.5.x-issue2489/subversion/libsvn_subr/mergeinfo.c
   M /branches/1.5.x-issue2489/subversion/libsvn_wc/adm_ops.c
   M /branches/1.5.x-issue2489/subversion/libsvn_wc/merge.c
   M /branches/1.5.x-issue2489/subversion/mod_dav_svn/mirror.c
   M /branches/1.5.x-issue2489/subversion/po/pl.po
   M /branches/1.5.x-issue2489/subversion/po/zh_CN.po
   M /branches/1.5.x-issue2489/subversion/svn/changelist-cmd.c
   M /branches/1.5.x-issue2489/subversion/svn/main.c
   M /branches/1.5.x-issue2489/subversion/tests/cmdline/commit_tests.py
   M /branches/1.5.x-issue2489/subversion/tests/cmdline/copy_tests.py
   M /branches/1.5.x-issue2489/subversion/tests/cmdline/depth_tests.py
   M /branches/1.5.x-issue2489/subversion/tests/cmdline/merge_tests.py
   M /branches/1.5.x-issue2489/subversion/tests/cmdline/revert_tests.py
   M /branches/1.5.x-issue2489/subversion/tests/cmdline/svntest/actions.py
   M /branches/1.5.x-issue2489/subversion/tests/cmdline/update_tests.py
   M /branches/1.5.x-issue2489/subversion/tests/libsvn_repos/repos-test.c
   M /branches/1.5.x-issue2489/www/images/subversion-diagram.png
   M /branches/1.5.x-issue2489/www/images/subversion_logo-200x173.png
   M /branches/1.5.x-issue2489/www/images/subversion_logo-384x332.png
   M /branches/1.5.x-issue2489/www/images/subversion_logo_hor-468x64.png

On the 1.5.x-issue2489 branch:

Merge from 1.5.x branch to 1.5.x-issue2489 branch to bring it up-to-date
with 1.5.5 release.

svn merge -r33842:34862 http://svn.collab.net/repos/svn/branches/1.5.x .

------------------------------------------------------------------------
r35278 | stylesen | 2009-01-16 06:56:39 +0100 (Fri, 16 Jan 2009) | 6 lines
Changed paths:
   M /branches/1.5.x-issue2489/README.branch
   M /branches/1.5.x-issue2489/subversion/include/svn_version.h

On the 1.5.x-issue2489 branch:

* README.branch
  (Revisions included): Record 1.5.5 merge.
  (subversion/include/svn_version.h): Update revision number to 1.5.5.

------------------------------------------------------------------------
r35279 | gstein | 2009-01-16 10:59:01 +0100 (Fri, 16 Jan 2009) | 4 lines
Changed paths:
   M /trunk/build/ac-macros/serf.m4

Fix linking against serf on some platforms.

* build/ac-macros/serf.m4: add serf's libdir to LDFLAGS

------------------------------------------------------------------------
r35280 | julianfoad | 2009-01-16 13:51:25 +0100 (Fri, 16 Jan 2009) | 1 line
Changed paths:
   M /trunk/COMMITTERS

* COMMITTERS: Update my email address.
------------------------------------------------------------------------
r35281 | julianfoad | 2009-01-16 14:39:43 +0100 (Fri, 16 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/cmdline/switch_tests.py

Fix the case where a 'switch' did not switch the URL of a node where an
incoming delete conflicted with a local modification. This previously left
the node marked as 'switched' (because its parent had been switched but it
had not), so an attempt to re-add it would not add it in the right place.

* subversion/libsvn_wc/update_editor.c
  (do_entry_deletion): Use THEIR_URL to fill in the new base URL.

* subversion/tests/cmdline/switch_tests.py
  (failed_anchor_is_target, tree_conflicts_on_switch_2_1): Remove the bogus
    'switched' expectation.

------------------------------------------------------------------------
r35282 | hwright | 2009-01-16 15:05:59 +0100 (Fri, 16 Jan 2009) | 3 lines
Changed paths:
   M /trunk/tools/dist/dist.sh

* tools/dist/dist.sh:
  Followupt to r35273: Remove stray debug statement.

------------------------------------------------------------------------
r35283 | hwright | 2009-01-16 15:07:10 +0100 (Fri, 16 Jan 2009) | 3 lines
Changed paths:
   M /trunk

* /:
  Ignore the optional sqlite-amalgamation directory.

------------------------------------------------------------------------
r35284 | hwright | 2009-01-16 15:15:48 +0100 (Fri, 16 Jan 2009) | 4 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

* build/ac-macros/sqlite.m4
  (SVN_LIB_SQLITE): Use $abs_srclib not `pwd` to check for an included
    sqlite amalgamation, to support out-of-tree builds.

------------------------------------------------------------------------
r35285 | hwright | 2009-01-16 15:58:13 +0100 (Fri, 16 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/include/svn_fs.h

* subversion/include/svn_fs.h
  (svn_fs_paths_changed2): Update docstring.

------------------------------------------------------------------------
r35286 | cmpilato | 2009-01-16 15:59:19 +0100 (Fri, 16 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/reports/get-location-segments.c

Remove a once-used helper function by merging it back into its only
caller.  This is a followup to r35250.

* subversion/mod_dav_svn/reports/get-location-segments.c
  (send_get_location_segments_report): Merge this function back into...
  (dav_svn__get_location_segments_report): ...here.  Also, use
    dav_new_error() instead of a combination of dav_svn__convert_err()
    and svn_error_create().

------------------------------------------------------------------------
r35287 | hwright | 2009-01-16 16:03:23 +0100 (Fri, 16 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/bdb/env.c

* subversion/libsvn_fs_base/bdb/env.c
  (svn_fs_bdb__close): Use a compile-time conditional in place of a run-time one
    to eliminate unexecutable code.

------------------------------------------------------------------------
r35288 | cmpilato | 2009-01-16 16:13:30 +0100 (Fri, 16 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

Add r35286 to the r35250 group.
------------------------------------------------------------------------
r35289 | hwright | 2009-01-16 16:25:54 +0100 (Fri, 16 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_repos/log.c

Followup to r35253: Update some callers of svn_fs_paths_changed() to use the
new API.

* subversion/libsvn_repos/log.c
  (svn_repos_check_revision_access, detect_changed, fs_mergeinfo_changed):
  Update to use the new API, along with the corresponding output datatype.

------------------------------------------------------------------------
r35290 | gstein | 2009-01-16 16:26:30 +0100 (Fri, 16 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

wiggle wiggle, you sniggly little piggle.
------------------------------------------------------------------------
r35291 | jwhitlock | 2009-01-16 18:23:01 +0100 (Fri, 16 Jan 2009) | 4 lines
Changed paths:
   M /trunk/build/ac-macros/serf.m4

* build/ac-macros/serf.m4
  (SVN_LIB_SERF): Default to using .la file but if not present, fall back
   to a graceful way to build without.

------------------------------------------------------------------------
r35292 | hwright | 2009-01-16 19:04:57 +0100 (Fri, 16 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/merge.c

* subversion/mod_dav_svn/merge.c
  (do_resources): More deprecated API removal.

------------------------------------------------------------------------
r35293 | hwright | 2009-01-16 19:33:53 +0100 (Fri, 16 Jan 2009) | 8 lines
Changed paths:
   M /trunk/configure.ac
   M /trunk/tools/dist/construct-rolling-environment.sh

Update the recommended SQLite version to 3.6.10.

* tools/dist/construct-rolling-environment.sh:
  Bump version included in deps tarball.

* configure.ac:
  Bump the recommended version reported by configure.

------------------------------------------------------------------------
r35294 | rhuijben | 2009-01-17 01:12:10 +0100 (Sat, 17 Jan 2009) | 7 lines
Changed paths:
   M /trunk/build/generator/gen_win.py
   M /trunk/gen-make.py

Following up on r35263, reverted r35252 to re-enable --with-sqlite option to
gen-make.py on Windows.

* build/generator/gen_win.py
* gen-make.py
  Reverse merged r35263

------------------------------------------------------------------------
r35295 | stsp | 2009-01-17 01:56:45 +0100 (Sat, 17 Jan 2009) | 27 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/merge.c

Break up svn_wc__merge_internal() into many smaller functions.

There's still room for improvement.
Some of the new functions take an insane amount of parameters,
these lack docstrings because I was too lazy^W busy to document
them. But the code is already much more readable.
And make check is still happy, except:
FAIL:  fs-pack-test 1: pack a FSFS filesystem
which should be unrelated to this change.

* subversion/libsvn_wc/merge.c
  (init_conflict_markers,
   do_text_merge,
   do_text_merge_external,
   save_merge_result,
   eval_conflict_func_result,
   preserve_pre_merge_files,
   setup_text_conflict_desc,
   maybe_resolve_conflicts,
   merge_text_file,
   merge_binary_file): New functions.
  (svn_wc__merge_internal): Instead of being a 636 lines long monster
   with almost 50 local variables, comments that tell you where in the
   control flow you currently are, and plenty goto statements, just call
   into a few of the above new functions. They will cascade control flow
   further among them.

------------------------------------------------------------------------
r35296 | stsp | 2009-01-17 01:59:46 +0100 (Sat, 17 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/merge.c

* subversion/libsvn_wc/merge.c
  (do_text_merge): Fix typo in docstring.

------------------------------------------------------------------------
r35297 | pburba | 2009-01-17 02:53:26 +0100 (Sat, 17 Jan 2009) | 44 lines
Changed paths:
   M /trunk/subversion/include/svn_mergeinfo.h
   M /trunk/subversion/libsvn_subr/mergeinfo.c
   M /trunk/subversion/libsvn_wc/props.c
   M /trunk/subversion/tests/cmdline/prop_tests.py
   M /trunk/subversion/tests/libsvn_subr/mergeinfo-test.c

Fix a symptom of issue #3302.

Though I still don't know *how* it can happen, it appears that it is (was?)
possible for svnmerge-migrate-history.py to convert svnmerge-integrated
properties into svn:mergeinfo properties with unordered rangelists.  This
breaks any subcommand which encounters this mergeinfo (you know, useful
little things like svn merge and log -g) when svn_mergeinfo_parse()
encounters the unordered rangelists.

Even if we fix svnmerge-migrate-history.py (issue #3302 even if it needs
fixing that is) it would be nice to save users from encountering this
problem.  So this commit allows svn_mergeinfo_parse() to tolerate unordered
rangelists while still guaranteeing the mergeinfo it creates has sorted
rangelists -- so there is still no way via the command line to set or
otherwise create unordered mergeinfo in the repository.

* subversion/include/svn_mergeinfo.h
  (svn_mergeinfo_parse): Tweak doc string to reflect loosened restrictions.

* subversion/libsvn_subr/mergeinfo.c
  (combine_with_adjacent_lastrange): Remove.  Among other things this
  function enforced the no overlapping revision ranges and no unordered
  revision ranges restrictions of svn_mergeinfo_parse().
  (parse_revlist): Don't combine adjacent ranges here, just push each one
  onto the rangelist.
  (parse_revision_line): Sort the rangelist created by parse_revlist(),
  then collapse adjacent ranges, and make sure there are no overlapping
  ranges.

* subversion/libsvn_wc/props.c
  (svn_wc_canonicalize_svn_prop): Ensure that canonical svn:mergeinfo
  has sorted rangelists. 

* subversion/tests/cmdline/prop_tests.py
  (inappropriate_props): Stop expecting a propset of unordered mergeinfo
  to fail.

* subversion/tests/libsvn_subr/mergeinfo-test.c
  (MAX_NBR_RANGES, NBR_MERGEINFO_VALS, mergeinfo_vals, mergeinfo_paths,
  mergeinfo_ranges): Add some test data for test_parse_single_line_mergeinfo
  which tries to parse mergeinfo with unordered rangelists.  Expect these to
  succeed, but for the results to be sorted.
  (NBR_BROKEN_MERGEINFO_VALS, broken_mergeinfo_vals): Remove some test data
  for test_parse_broken_mergeinfo().
------------------------------------------------------------------------
r35298 | rhuijben | 2009-01-17 03:05:21 +0100 (Sat, 17 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/fs.c

* subversion/libsvn_fs_base/fs.c
  (base_bdb_pack): Update arguments to match the pack_fs method
    in fs_library_vtable_t
    (To resolve warning on further unused argument)

------------------------------------------------------------------------
r35299 | stsp | 2009-01-17 03:28:56 +0100 (Sat, 17 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/merge.c

* subversion/libsvn_wc/merge.c
  (svn_wc__merge_internal): Fix a typo in variable name:
   destranslated_target -> detranslated_target
     ^

------------------------------------------------------------------------
r35300 | jerenkrantz | 2009-01-17 03:37:49 +0100 (Sat, 17 Jan 2009) | 12 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

Improve SQLite auto-fu so that you don't require 'python' at build-time by
using more traditional auto-fu.  Also permit pre-configured sqlite to just
'work' (and not require it to be in /usr).

* build/ac-macros/sqlite.m4
  (SVN_LIB_SQLITE): Always parse minimum version; don't pass /usr rather let
  the compiler do its magic (via CPPFLAGS/LDFLAGS already set);
  (SVN_SQLITE_DIR_CONFIG, SVN_SQLITE_FILE_CONFIG): Rewrite to use AC_EGREP_CPP
  rather than call into 'python'.
  (SVN_SQLITE_VERNUM_PARSE): Split out into... (N.B. could still be improved)
  (SVN_SQLITE_MIN_VERNUM_PARSE): this.

------------------------------------------------------------------------
r35301 | jerenkrantz | 2009-01-17 04:13:07 +0100 (Sat, 17 Jan 2009) | 8 lines
Changed paths:
   M /trunk/build/ac-macros/sasl.m4
   M /trunk/build/ac-macros/serf.m4

Some minor auto-fu cleanups.

* build/ac-macros/sasl.m4: 
  (SVN_LIB_SASL): I don't have /usr/local and I don't want it in my Makefile.
  Be gone!
* build/ac-macros/serf.m4
  (SVN_LIB_SERF): Simplify test and eliminate redundant redundancy.

------------------------------------------------------------------------
r35302 | fabien | 2009-01-17 11:01:44 +0100 (Sat, 17 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/po/fr.po

French translation update for r35301.

* subversion/po/fr.po: po-update, 2 new, 12 fuzzy fixed.

------------------------------------------------------------------------
r35303 | stsp | 2009-01-17 14:43:26 +0100 (Sat, 17 Jan 2009) | 14 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/merge.c

Fix issue #3354, update fails when file with local mods is
                 moved and modified

Note: This commit just fixes the problem, but does not
touch the regression test for this issue (update_test 52).
The test still needs work.

* subversion/libsvn_wc/merge.c
  (maybe_resolve_conflicts): Add copyfrom_text argument.
  (eval_conflict_func_result): As above, and also copy
   the copyfrom text into the working copy in case the user
   postpones conflict resolution.
  (merge_text_file): Track argument changes.

------------------------------------------------------------------------
r35304 | stsp | 2009-01-17 14:52:57 +0100 (Sat, 17 Jan 2009) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Update status of blocking issue #3354.

------------------------------------------------------------------------
r35305 | stsp | 2009-01-17 14:57:44 +0100 (Sat, 17 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/update_editor.c
  (merge_file): Remove comments about issue #3354 added in r35215.
   The bug has been found elsewhere, and fixed.

------------------------------------------------------------------------
r35306 | jerenkrantz | 2009-01-17 22:02:38 +0100 (Sat, 17 Jan 2009) | 3 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

* build/ac-macros/sqlite.m4
  (SVN_DOWNLOAD_SQLITE): Make doc consistent with code.

------------------------------------------------------------------------
r35307 | arfrever | 2009-01-18 01:51:18 +0100 (Sun, 18 Jan 2009) | 17 lines
Changed paths:
   M /trunk/INSTALL
   M /trunk/Makefile.in
   M /trunk/autogen.sh
   M /trunk/build/find_python.sh
   M /trunk/configure.ac
   M /trunk/subversion/bindings/swig/INSTALL
   M /trunk/subversion/tests/cmdline/README
   M /trunk/subversion/tests/cmdline/svntest/__init__.py
   M /trunk/tools/hook-scripts/svn2feed.py

Require Python >=2.4.

* build/find_python.sh: Require Python >=2.4.
* subversion/tests/cmdline/svntest/__init__.py: Require Python >=2.4.
* tools/hook-scripts/svn2feed.py: Require Python >=2.4.

* autogen.sh: Update error message.
* configure.ac: Update warning.
* Makefile.in
  (check): Update error message.

* INSTALL
  (Dependencies in Detail, Building the Latest Source under Windows): Update.
* subversion/bindings/swig/INSTALL
  (BUILDING SWIG BINDINGS FOR SVN ON UNIX): Update.
* subversion/tests/cmdline/README: Update.

------------------------------------------------------------------------
r35308 | arfrever | 2009-01-18 02:00:25 +0100 (Sun, 18 Jan 2009) | 3 lines
Changed paths:
   M /trunk/INSTALL

* INSTALL
  (Dependencies in Detail): Update SQLite amalgamation directory.

------------------------------------------------------------------------
r35309 | rhuijben | 2009-01-18 02:42:15 +0100 (Sun, 18 Jan 2009) | 15 lines
Changed paths:
   M /trunk/subversion/include/svn_fs.h
   A /trunk/subversion/libsvn_fs/util.c
   M /trunk/subversion/libsvn_fs_base/bdb/changes-table.c
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Following up on r35253, make the svn_fs_path_change2_t type future extensible
by adding a constructor function.

* subversion/include/svn_fs.h
  (svn_fs_path_change2_t): Document as future extensible.
  (svn_fs_path_change2_create): New function.
* subversion/libsvn_fs/util.c: Add new file
  (svn_fs_path_change2_create): Implement constructor.
* subversion/libsvn_fs_base/bdb/changes-table.c
  (fold_change): Use svn_fs_path_change2_create to create 
    svn_fs_path_change2_t.
* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__add_change): Use svn_fs_path_change2_create to create 
    svn_fs_path_change2_t.

------------------------------------------------------------------------
r35310 | rhuijben | 2009-01-18 02:46:00 +0100 (Sun, 18 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/include/svn_fs.h

* subversion/include/svn_fs.h
  (svn_fs_path_change2_t): Following up on r35309, remove comment reference
    to not existing function.

------------------------------------------------------------------------
r35311 | hwright | 2009-01-18 03:39:29 +0100 (Sun, 18 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_svn/client.c

General cleanup including:
 * Move variables to tigher scope.
 * Directly return errors at the end of functions.
 * Whitespace cleanups.
 * Rename 'subpool' to 'iterpool' when indicated.

The diff is pretty sizable, but there shouldn't be any functional changes.

* subversion/libsvn_ra_svn/client.c:
  Do above throughout.

------------------------------------------------------------------------
r35312 | sussman | 2009-01-18 15:13:44 +0100 (Sun, 18 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/COMMITTERS
   M /branches/http-protocol-v2/INSTALL
   M /branches/http-protocol-v2/Makefile.in
   M /branches/http-protocol-v2/TODO-1.6
   M /branches/http-protocol-v2/autogen.sh
   M /branches/http-protocol-v2/build/ac-macros/neon.m4
   M /branches/http-protocol-v2/build/ac-macros/sasl.m4
   M /branches/http-protocol-v2/build/ac-macros/serf.m4
   M /branches/http-protocol-v2/build/ac-macros/sqlite.m4
   M /branches/http-protocol-v2/build/find_python.sh
   M /branches/http-protocol-v2/build/getversion.py
   M /branches/http-protocol-v2/configure.ac
   M /branches/http-protocol-v2/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/http-protocol-v2/contrib/client-side/svnmerge/svnmerge-migrate-history.py
   M /branches/http-protocol-v2/notes/http-protocol-v2.txt
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/__init__.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/auth.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/core/__init__.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/ext/__init__.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/csvn/txn.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/examples/example.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/examples/log.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/setup.py
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
   M /branches/http-protocol-v2/subversion/bindings/swig/INSTALL
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/svn/commit-mailer.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/svn/synchronizer.rb
   M /branches/http-protocol-v2/subversion/bindings/swig/svn_diff.i
   M /branches/http-protocol-v2/subversion/include/private/svn_sqlite.h
   M /branches/http-protocol-v2/subversion/include/svn_auth.h
   M /branches/http-protocol-v2/subversion/include/svn_checksum.h
   M /branches/http-protocol-v2/subversion/include/svn_client.h
   M /branches/http-protocol-v2/subversion/include/svn_fs.h
   M /branches/http-protocol-v2/subversion/include/svn_io.h
   M /branches/http-protocol-v2/subversion/include/svn_mergeinfo.h
   M /branches/http-protocol-v2/subversion/include/svn_repos.h
   M /branches/http-protocol-v2/subversion/include/svn_subst.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/http-protocol-v2/subversion/libsvn_auth_gnome_keyring/version.c
   M /branches/http-protocol-v2/subversion/libsvn_auth_kwallet/version.c
   M /branches/http-protocol-v2/subversion/libsvn_client/add.c
   M /branches/http-protocol-v2/subversion/libsvn_client/blame.c
   M /branches/http-protocol-v2/subversion/libsvn_client/cat.c
   M /branches/http-protocol-v2/subversion/libsvn_client/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_client/export.c
   M /branches/http-protocol-v2/subversion/libsvn_client/info.c
   M /branches/http-protocol-v2/subversion/libsvn_client/log.c
   M /branches/http-protocol-v2/subversion/libsvn_client/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_client/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_client/prop_commands.c
   M /branches/http-protocol-v2/subversion/libsvn_client/ra.c
   M /branches/http-protocol-v2/subversion/libsvn_fs/fs-loader.c
   A /branches/http-protocol-v2/subversion/libsvn_fs/util.c (from /trunk/subversion/libsvn_fs/util.c:35311)
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/changes-table.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/env.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/tree.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/structure
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/tree.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_svn/client.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_svn/marshal.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/log.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/replay.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/auth.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/checksum.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/cmdline.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/error.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/sqlite.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/stream.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/subst.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_crawler.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/copy.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/crop.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/props.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/questions.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/translate.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/update_editor.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc_db.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/merge.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/reports/get-location-segments.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/reports/get-locations.c
   M /branches/http-protocol-v2/subversion/po/fr.po
   M /branches/http-protocol-v2/subversion/svn/log-cmd.c
   M /branches/http-protocol-v2/subversion/svn/main.c
   M /branches/http-protocol-v2/subversion/svn/notify.c
   M /branches/http-protocol-v2/subversion/svn/propdel-cmd.c
   M /branches/http-protocol-v2/subversion/svn/propset-cmd.c
   M /branches/http-protocol-v2/subversion/svn/tree-conflicts.c
   M /branches/http-protocol-v2/subversion/svn/tree-conflicts.h
   M /branches/http-protocol-v2/subversion/tests/cmdline/README
   M /branches/http-protocol-v2/subversion/tests/cmdline/checkout_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/http-protocol-v2/subversion/tests/cmdline/merge_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/prop_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/resolved_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/__init__.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/actions.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/main.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/switch_tests.py
   M /branches/http-protocol-v2/subversion/tests/libsvn_delta/window-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/auth-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/http-protocol-v2/tools/dist/construct-rolling-environment.sh
   M /branches/http-protocol-v2/tools/dist/dist.sh
   M /branches/http-protocol-v2/tools/hook-scripts/svn2feed.py
   M /branches/http-protocol-v2/www/faq.html
   M /branches/http-protocol-v2/www/faq.zh.html
   M /branches/http-protocol-v2/www/hacking.html
   M /branches/http-protocol-v2/www/links.html
   M /branches/http-protocol-v2/www/links.zh.html
   M /branches/http-protocol-v2/www/mailing-lists.html
   M /branches/http-protocol-v2/www/svn_1.6_releasenotes.html
   M /branches/http-protocol-v2/www/tools_contrib.zh.html

Catch up to trunk.
------------------------------------------------------------------------
r35313 | sussman | 2009-01-18 17:37:15 +0100 (Sun, 18 Jan 2009) | 15 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/mod_dav_svn/dav_svn.h
   M /branches/http-protocol-v2/subversion/mod_dav_svn/reports/update.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/repos.c

Teach mod_dav_svn to parse new rootstub and revstub.

* subversion/mod_dav_svn/dav_svn.h
  (enum dav_svn_private_restype):  add types for root-stub and rev-stub.

* subversion/mod_dav_svn/repos.c 
  (parse_rootstub_uri, parse_revstub_uri):  new parsing functions.
  (special_subdirs[]):  list the new parsing functions.

* subversion/mod_dav_svn/reports/update.c
  (dav_svn__update_report):  allow a root-stub URI on an update
                             REPORT, in addition to the VCC URI.

* BRANCH-README:  update.

------------------------------------------------------------------------
r35314 | arfrever | 2009-01-18 18:55:07 +0100 (Sun, 18 Jan 2009) | 26 lines
Changed paths:
   M /trunk/subversion/include/private/svn_cmdline_private.h
   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/cmdline.c
   M /trunk/subversion/libsvn_subr/prompt.c

Rename svn_auth_unlock_prompt_func_t to
svn_auth_gnome_keyring_unlock_prompt_func_t.
Rename svn_cmdline_auth_unlock_prompt() to
svn_cmdline__auth_gnome_keyring_unlock_prompt().

* subversion/include/svn_auth.h
  (svn_auth_unlock_prompt_func_t): Rename to ...
  (svn_auth_gnome_keyring_unlock_prompt_func_t): ... this.
  (svn_auth_get_gnome_keyring_simple_provider,
   svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider): Fix doc string.

* subversion/include/svn_cmdline.h
* subversion/libsvn_subr/prompt.c
  (svn_cmdline_auth_unlock_prompt): Rename to ...
* subversion/include/private/svn_cmdline_private.h
* subversion/libsvn_subr/prompt.c
  (svn_cmdline__auth_gnome_keyring_unlock_prompt): ... this.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (simple_gnome_keyring_first_creds,
   simple_gnome_keyring_save_creds,
   ssl_client_cert_pw_gnome_keyring_first_creds,
   ssl_client_cert_pw_gnome_keyring_save_creds): Update.
* subversion/libsvn_subr/cmdline.c
  (svn_cmdline_create_auth_baton): Update.

------------------------------------------------------------------------
r35315 | arfrever | 2009-01-18 19:27:52 +0100 (Sun, 18 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/svn/log-cmd.c
   M /trunk/subversion/svnlook/main.c

* subversion/svn/log-cmd.c
  (svn_cl__log):
* subversion/svnlook/main.c
  (main): Improve error messages.

------------------------------------------------------------------------
r35316 | arfrever | 2009-01-18 20:20:20 +0100 (Sun, 18 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/po/pl.po

Polish translation update.

* subversion/po/pl.po: Polish translation update.

------------------------------------------------------------------------
r35317 | arfrever | 2009-01-19 00:17:31 +0100 (Mon, 19 Jan 2009) | 2 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

* build/ac-macros/sqlite.m4: Delete svn:mergeinfo.

------------------------------------------------------------------------
r35318 | arfrever | 2009-01-19 00:27:25 +0100 (Mon, 19 Jan 2009) | 3 lines
Changed paths:
   M /branches/python-3-compatibility
   M /branches/python-3-compatibility/COMMITTERS
   M /branches/python-3-compatibility/INSTALL
   M /branches/python-3-compatibility/Makefile.in
   M /branches/python-3-compatibility/TODO-1.6
   M /branches/python-3-compatibility/autogen.sh
   M /branches/python-3-compatibility/build/ac-macros/berkeley-db.m4
   M /branches/python-3-compatibility/build/ac-macros/neon.m4
   M /branches/python-3-compatibility/build/ac-macros/sasl.m4
   M /branches/python-3-compatibility/build/ac-macros/serf.m4
   M /branches/python-3-compatibility/build/ac-macros/sqlite.m4
   M /branches/python-3-compatibility/build/find_python.sh
   M /branches/python-3-compatibility/build/getversion.py
   M /branches/python-3-compatibility/build/run_tests.py
   M /branches/python-3-compatibility/build.conf
   M /branches/python-3-compatibility/configure.ac
   M /branches/python-3-compatibility/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/python-3-compatibility/contrib/client-side/svnmerge/svnmerge-migrate-history.py
   D /branches/python-3-compatibility/contrib/client-side/svnmucc
   A /branches/python-3-compatibility/contrib/hook-scripts/require-mergeinfo.pl (from /trunk/contrib/hook-scripts/require-mergeinfo.pl:35316)
   M /branches/python-3-compatibility/notes/http-protocol-v2.txt
   M /branches/python-3-compatibility/notes/wc-ng-design
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/csvn/__init__.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/csvn/auth.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/csvn/core/__init__.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/csvn/ext/__init__.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/csvn/txn.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/examples/example.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/examples/log.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/python-3-compatibility/subversion/bindings/ctypes-python/setup.py
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/SVNClient.h
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
   M /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
   M /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
   M /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
   M /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
   M /branches/python-3-compatibility/subversion/bindings/swig/INSTALL
   M /branches/python-3-compatibility/subversion/bindings/swig/ruby/svn/client.rb
   M /branches/python-3-compatibility/subversion/bindings/swig/ruby/svn/commit-mailer.rb
   M /branches/python-3-compatibility/subversion/bindings/swig/ruby/svn/synchronizer.rb
   M /branches/python-3-compatibility/subversion/bindings/swig/ruby/test/test_client.rb
   M /branches/python-3-compatibility/subversion/bindings/swig/svn_diff.i
   M /branches/python-3-compatibility/subversion/include/private/svn_cmdline_private.h
   M /branches/python-3-compatibility/subversion/include/private/svn_sqlite.h
   M /branches/python-3-compatibility/subversion/include/svn_auth.h
   M /branches/python-3-compatibility/subversion/include/svn_base64.h
   M /branches/python-3-compatibility/subversion/include/svn_checksum.h
   M /branches/python-3-compatibility/subversion/include/svn_client.h
   M /branches/python-3-compatibility/subversion/include/svn_cmdline.h
   M /branches/python-3-compatibility/subversion/include/svn_dirent_uri.h
   M /branches/python-3-compatibility/subversion/include/svn_error.h
   M /branches/python-3-compatibility/subversion/include/svn_error_codes.h
   M /branches/python-3-compatibility/subversion/include/svn_fs.h
   M /branches/python-3-compatibility/subversion/include/svn_io.h
   M /branches/python-3-compatibility/subversion/include/svn_mergeinfo.h
   M /branches/python-3-compatibility/subversion/include/svn_repos.h
   M /branches/python-3-compatibility/subversion/include/svn_subst.h
   M /branches/python-3-compatibility/subversion/include/svn_wc.h
   M /branches/python-3-compatibility/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/python-3-compatibility/subversion/libsvn_auth_gnome_keyring/version.c
   M /branches/python-3-compatibility/subversion/libsvn_auth_kwallet/version.c
   M /branches/python-3-compatibility/subversion/libsvn_client/add.c
   M /branches/python-3-compatibility/subversion/libsvn_client/blame.c
   M /branches/python-3-compatibility/subversion/libsvn_client/cat.c
   M /branches/python-3-compatibility/subversion/libsvn_client/deprecated.c
   M /branches/python-3-compatibility/subversion/libsvn_client/export.c
   M /branches/python-3-compatibility/subversion/libsvn_client/externals.c
   M /branches/python-3-compatibility/subversion/libsvn_client/info.c
   M /branches/python-3-compatibility/subversion/libsvn_client/log.c
   M /branches/python-3-compatibility/subversion/libsvn_client/merge.c
   M /branches/python-3-compatibility/subversion/libsvn_client/mergeinfo.c
   M /branches/python-3-compatibility/subversion/libsvn_client/prop_commands.c
   M /branches/python-3-compatibility/subversion/libsvn_client/ra.c
   M /branches/python-3-compatibility/subversion/libsvn_delta/compose_delta.c
   M /branches/python-3-compatibility/subversion/libsvn_diff/diff.h
   M /branches/python-3-compatibility/subversion/libsvn_diff/diff_file.c
   M /branches/python-3-compatibility/subversion/libsvn_diff/diff_memory.c
   M /branches/python-3-compatibility/subversion/libsvn_diff/util.c
   M /branches/python-3-compatibility/subversion/libsvn_fs/fs-loader.c
   M /branches/python-3-compatibility/subversion/libsvn_fs/fs-loader.h
   A /branches/python-3-compatibility/subversion/libsvn_fs/util.c (from /trunk/subversion/libsvn_fs/util.c:35316)
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/bdb/changes-table.h
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/bdb/env.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/dag.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/dag.h
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/fs.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/tree.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/dag.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/dag.h
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/fs.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/fs.h
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/lock.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/structure
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/tree.c
   M /branches/python-3-compatibility/subversion/libsvn_ra_svn/client.c
   M /branches/python-3-compatibility/subversion/libsvn_ra_svn/marshal.c
   M /branches/python-3-compatibility/subversion/libsvn_repos/fs-wrap.c
   M /branches/python-3-compatibility/subversion/libsvn_repos/log.c
   M /branches/python-3-compatibility/subversion/libsvn_repos/replay.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/auth.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/checksum.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/cmdline.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/deprecated.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/dirent_uri.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/error.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/io.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/mergeinfo.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/path.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/prompt.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/sqlite.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/stream.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/subst.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/svn_base64.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/adm_crawler.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/adm_files.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/adm_files.h
   M /branches/python-3-compatibility/subversion/libsvn_wc/adm_ops.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/copy.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/crop.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/deprecated.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/log.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/merge.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/props.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/questions.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/translate.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/tree_conflicts.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/tree_conflicts.h
   M /branches/python-3-compatibility/subversion/libsvn_wc/update_editor.c
   A /branches/python-3-compatibility/subversion/libsvn_wc/wc-metadata.sql (from /trunk/subversion/libsvn_wc/wc-metadata.sql:35316)
   D /branches/python-3-compatibility/subversion/libsvn_wc/wc-metadata.sql3
   M /branches/python-3-compatibility/subversion/libsvn_wc/wc_db.c
   M /branches/python-3-compatibility/subversion/mod_dav_svn/merge.c
   M /branches/python-3-compatibility/subversion/mod_dav_svn/reports/get-location-segments.c
   M /branches/python-3-compatibility/subversion/mod_dav_svn/reports/get-locations.c
   M /branches/python-3-compatibility/subversion/po/fr.po
   M /branches/python-3-compatibility/subversion/po/pl.po
   M /branches/python-3-compatibility/subversion/po/zh_CN.po
   M /branches/python-3-compatibility/subversion/svn/cl.h
   M /branches/python-3-compatibility/subversion/svn/log-cmd.c
   M /branches/python-3-compatibility/subversion/svn/main.c
   M /branches/python-3-compatibility/subversion/svn/notify.c
   M /branches/python-3-compatibility/subversion/svn/propdel-cmd.c
   M /branches/python-3-compatibility/subversion/svn/propset-cmd.c
   M /branches/python-3-compatibility/subversion/svn/tree-conflicts.c
   M /branches/python-3-compatibility/subversion/svn/tree-conflicts.h
   M /branches/python-3-compatibility/subversion/svnadmin/main.c
   M /branches/python-3-compatibility/subversion/svnlook/main.c
   M /branches/python-3-compatibility/subversion/svnsync/main.c
   M /branches/python-3-compatibility/subversion/tests/cmdline/README
   M /branches/python-3-compatibility/subversion/tests/cmdline/basic_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/checkout_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/externals_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
   M /branches/python-3-compatibility/subversion/tests/cmdline/log_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/merge_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/prop_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/resolved_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svnsync_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/__init__.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/actions.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/main.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/switch_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/update_tests.py
   M /branches/python-3-compatibility/subversion/tests/libsvn_delta/window-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_fs/fs-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_fs_base/fs-base-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_fs_fs/fs-pack-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_subr/auth-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_subr/dirent_uri-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/python-3-compatibility/tools/buildbot/slaves/ubuntu-x64
   M /branches/python-3-compatibility/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh
   A /branches/python-3-compatibility/tools/client-side/svnmucc (from /trunk/tools/client-side/svnmucc:35316)
   R /branches/python-3-compatibility/tools/client-side/svnmucc/svnmucc-test.py (from /trunk/tools/client-side/svnmucc/svnmucc-test.py:35316)
   R /branches/python-3-compatibility/tools/client-side/svnmucc/svnmucc.c (from /trunk/tools/client-side/svnmucc/svnmucc.c:35316)
   M /branches/python-3-compatibility/tools/dev/contribulyze.py
   M /branches/python-3-compatibility/tools/dev/mlpatch.py
   M /branches/python-3-compatibility/tools/dist/construct-rolling-environment.sh
   M /branches/python-3-compatibility/tools/dist/dist.sh
   M /branches/python-3-compatibility/tools/dist/post-to-tigris.py
   M /branches/python-3-compatibility/tools/hook-scripts/mailer/mailer.py
   M /branches/python-3-compatibility/tools/hook-scripts/svn2feed.py
   M /branches/python-3-compatibility/tools/server-side/svn_server_log_parse.py
   M /branches/python-3-compatibility/tools/server-side/test_svn_server_log_parse.py
   M /branches/python-3-compatibility/win-tests.py
   M /branches/python-3-compatibility/www/faq.html
   M /branches/python-3-compatibility/www/faq.zh.html
   M /branches/python-3-compatibility/www/hacking.html
   M /branches/python-3-compatibility/www/links.html
   M /branches/python-3-compatibility/www/links.zh.html
   M /branches/python-3-compatibility/www/mailing-lists.html
   M /branches/python-3-compatibility/www/security.html
   M /branches/python-3-compatibility/www/svn_1.6_releasenotes.html
   M /branches/python-3-compatibility/www/tools_contrib.html
   M /branches/python-3-compatibility/www/tools_contrib.zh.html

On the 'python-3-compatibility' branch:
Merge r34999:35317 from trunk.

------------------------------------------------------------------------
r35319 | stylesen | 2009-01-19 11:46:58 +0100 (Mon, 19 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/prompt.c

Follow up r35314. Fix compiler warning.

* subversion/libsvn_subr/prompt.c
  (): Include svn_cmdline_private header in order to fix compiler warning
   of missing prototype.

------------------------------------------------------------------------
r35320 | stylesen | 2009-01-19 12:54:26 +0100 (Mon, 19 Jan 2009) | 3 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS
  Vote for r35143, r35145 group.

------------------------------------------------------------------------
r35321 | julianfoad | 2009-01-19 13:43:46 +0100 (Mon, 19 Jan 2009) | 2 lines
Changed paths:
   M /branches/issue-3334-dirs
   M /branches/issue-3334-dirs/COMMITTERS
   M /branches/issue-3334-dirs/INSTALL
   M /branches/issue-3334-dirs/Makefile.in
   M /branches/issue-3334-dirs/TODO-1.6
   M /branches/issue-3334-dirs/autogen.sh
   M /branches/issue-3334-dirs/build/ac-macros/neon.m4
   M /branches/issue-3334-dirs/build/ac-macros/sasl.m4
   M /branches/issue-3334-dirs/build/ac-macros/serf.m4
   M /branches/issue-3334-dirs/build/ac-macros/sqlite.m4
   M /branches/issue-3334-dirs/build/find_python.sh
   M /branches/issue-3334-dirs/build/getversion.py
   M /branches/issue-3334-dirs/configure.ac
   M /branches/issue-3334-dirs/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /branches/issue-3334-dirs/contrib/client-side/svnmerge/svnmerge-migrate-history.py
   M /branches/issue-3334-dirs/notes/http-protocol-v2.txt
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/csvn/__init__.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/csvn/auth.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/csvn/core/__init__.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/csvn/ext/__init__.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/csvn/ext/callback_receiver.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/csvn/ext/listmixin.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/csvn/repos.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/csvn/txn.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/examples/example.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/examples/log.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/examples/mucc.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/examples/trunkify.py
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/setup.py
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
   M /branches/issue-3334-dirs/subversion/bindings/swig/INSTALL
   M /branches/issue-3334-dirs/subversion/bindings/swig/ruby/svn/commit-mailer.rb
   M /branches/issue-3334-dirs/subversion/bindings/swig/ruby/svn/synchronizer.rb
   M /branches/issue-3334-dirs/subversion/bindings/swig/svn_diff.i
   M /branches/issue-3334-dirs/subversion/include/private/svn_cmdline_private.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_sqlite.h
   M /branches/issue-3334-dirs/subversion/include/svn_auth.h
   M /branches/issue-3334-dirs/subversion/include/svn_client.h
   M /branches/issue-3334-dirs/subversion/include/svn_cmdline.h
   M /branches/issue-3334-dirs/subversion/include/svn_fs.h
   M /branches/issue-3334-dirs/subversion/include/svn_io.h
   M /branches/issue-3334-dirs/subversion/include/svn_mergeinfo.h
   M /branches/issue-3334-dirs/subversion/include/svn_subst.h
   M /branches/issue-3334-dirs/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
   M /branches/issue-3334-dirs/subversion/libsvn_auth_gnome_keyring/version.c
   M /branches/issue-3334-dirs/subversion/libsvn_auth_kwallet/version.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/blame.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/cat.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/export.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs/fs-loader.c
   A /branches/issue-3334-dirs/subversion/libsvn_fs/util.c (from /trunk/subversion/libsvn_fs/util.c:35319)
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/changes-table.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/changes-table.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/env.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/fs.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/tree.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/fs.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/fs_fs.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/structure
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/tree.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_svn/client.c
   M /branches/issue-3334-dirs/subversion/libsvn_repos/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_repos/replay.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/cmdline.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/error.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/mergeinfo.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/prompt.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/sqlite.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/subst.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/copy.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/crop.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/merge.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/props.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/questions.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/translate.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/tree_conflicts.h
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/wc_db.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/merge.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/get-location-segments.c
   M /branches/issue-3334-dirs/subversion/po/fr.po
   M /branches/issue-3334-dirs/subversion/po/pl.po
   M /branches/issue-3334-dirs/subversion/svn/log-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/notify.c
   M /branches/issue-3334-dirs/subversion/svn/propdel-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/tree-conflicts.c
   M /branches/issue-3334-dirs/subversion/svn/tree-conflicts.h
   M /branches/issue-3334-dirs/subversion/svnlook/main.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/README
   M /branches/issue-3334-dirs/subversion/tests/cmdline/prop_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/resolved_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/__init__.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/switch_tests.py
   M /branches/issue-3334-dirs/subversion/tests/libsvn_delta/window-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_subr/auth-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_wc/tree-conflict-data-test.c
   M /branches/issue-3334-dirs/tools/dist/construct-rolling-environment.sh
   M /branches/issue-3334-dirs/tools/dist/dist.sh
   M /branches/issue-3334-dirs/tools/hook-scripts/svn2feed.py
   M /branches/issue-3334-dirs/www/faq.html
   M /branches/issue-3334-dirs/www/faq.zh.html
   M /branches/issue-3334-dirs/www/hacking.html
   M /branches/issue-3334-dirs/www/links.html
   M /branches/issue-3334-dirs/www/links.zh.html
   M /branches/issue-3334-dirs/www/mailing-lists.html
   M /branches/issue-3334-dirs/www/tools_contrib.zh.html

On the issue-3334-dirs branch: Merge changes from trunk up to r35319.

------------------------------------------------------------------------
r35322 | pburba | 2009-01-19 17:11:38 +0100 (Mon, 19 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/update_tests.py

Correct expectations for issue #3354 test.

* subversion/tests/cmdline/update_tests.py
  (update_moves_and_modifies_an_edited_file): Add some newlines to text
  edits to make text conflicts clearer.  Expect an update which moves a
  locally edited to file to result in a text conflict on the move
  destination and a tree conflict on the move source.

------------------------------------------------------------------------
r35323 | julianfoad | 2009-01-19 17:20:25 +0100 (Mon, 19 Jan 2009) | 20 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/tests/cmdline/commit_tests.py

Fix a text expectation: expect a file to be gone from disk when a "delete +
delete" tree conflict is raised.

Remaining failures after this change are:
FAIL:  update_tests.py 7: update that deletes modified files
FAIL:  update_tests.py 47: tree conflicts on update 1.2
FAIL:  update_tests.py 48: tree conflicts on update 2.1
FAIL:  update_tests.py 49: tree conflicts on update 2.2
FAIL:  update_tests.py 51: tree conflicts on update 3
FAIL:  switch_tests.py 32: tree conflicts on switch 1.2
FAIL:  switch_tests.py 33: tree conflicts on switch 2.1
FAIL:  switch_tests.py 34: tree conflicts on switch 2.2
FAIL:  switch_tests.py 35: tree conflicts on switch 3
FAIL:  revert_tests.py 19: revert tree conflicts in updated files
FAIL:  stat_tests.py 31: status with tree conflicts
FAIL:  tree_conflict_tests.py 6: up/sw dir: del/rpl/mv onto modify

* subversion/tests/cmdline/commit_tests.py
  (tree_conflicts_resolved): Tweak.

------------------------------------------------------------------------
r35324 | julianfoad | 2009-01-19 17:45:47 +0100 (Mon, 19 Jan 2009) | 8 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c

Fix a path calculation, thereby making another test pass.

Remaining test failures: 11

* subversion/libsvn_wc/update_editor.c
  (schedule_existing_item_for_re_add): Make the PATH argument relative to
    the current working directory. (That's how the caller is passing it.)

------------------------------------------------------------------------
r35325 | pburba | 2009-01-19 18:07:07 +0100 (Mon, 19 Jan 2009) | 10 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/update_tests.py

Make clear in test for issue #3354 that we are not interactively resolving
conflicts.

* subversion/tests/cmdline/update_tests.py
  (update_moves_and_modifies_an_edited_file): Explicitly use --accept
  postpone on the final update in this test.  This is already done
  implicitly when running the test suite via the [miscellany]
  interactive-conflicts config option, but the error this test is looking
  for doesn't occur if we interactively postpone conflict resolution.

------------------------------------------------------------------------
r35326 | julianfoad | 2009-01-19 18:12:08 +0100 (Mon, 19 Jan 2009) | 13 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/tests/cmdline/commit_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/revert_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/stat_tests.py

Fix two test expectations, thus reducing the number of test failures to 9.

* subversion/tests/cmdline/commit_tests.py
  (tree_conflicts_resolved): Remove an old comment.

* subversion/tests/cmdline/revert_tests.py
  (revert_tree_conflicts_in_updated_files): Expect the deleted file to be
    gone from disk.

* subversion/tests/cmdline/stat_tests.py
  (status_with_tree_conflicts): Expect the deleted file to have a status
    code of '!' and no last-commit or current-revision status.

------------------------------------------------------------------------
r35327 | pburba | 2009-01-19 18:28:11 +0100 (Mon, 19 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/update_tests.py

Fix expectations for issue #2618 test.

* subversion/tests/cmdline/update_tests.py
  (update_wc_with_replaced): Change expected outcome when an update pulls
  down a replacement on a locally replaced file.  This should be a
  tree conflict of the 'local delete, incoming edit upon update' variety
  since the incoming edit conflicts with the delete half of the replace.
  (test_list): Remove XFail from update_wc_with_replaced.

------------------------------------------------------------------------
r35328 | cmpilato | 2009-01-19 18:40:49 +0100 (Mon, 19 Jan 2009) | 53 lines
Changed paths:
   M /trunk/subversion/mod_dav_svn/dav_svn.h
   M /trunk/subversion/mod_dav_svn/reports/dated-rev.c
   M /trunk/subversion/mod_dav_svn/reports/deleted-rev.c
   M /trunk/subversion/mod_dav_svn/reports/file-revs.c
   M /trunk/subversion/mod_dav_svn/reports/get-location-segments.c
   M /trunk/subversion/mod_dav_svn/reports/get-locations.c
   M /trunk/subversion/mod_dav_svn/reports/get-locks.c
   M /trunk/subversion/mod_dav_svn/reports/log.c
   M /trunk/subversion/mod_dav_svn/reports/mergeinfo.c
   M /trunk/subversion/mod_dav_svn/reports/replay.c
   M /trunk/subversion/mod_dav_svn/reports/update.c
   M /trunk/subversion/mod_dav_svn/util.c

Try to alleviate issue #3102 (ap_fflush() calls in mod_dav_svn can
hide some errors from client) by adding a helper function for wrapping
up REPORT responses, and using it consistently across all the REPORT
handlers.  The hope is that as future REPORTs appear, the use of this
helper function will be so well-established that it will be replicated
to the new code, too.

* subversion/mod_dav_svn/util.c
  (dav_svn__final_flush_or_error): New function.

* subversion/mod_dav_svn/reports/dated-rev.c
  (dav_svn__dated_rev_report): Replace flush and error logic with a
    call to dav_svn__final_flush_or_error().

* subversion/mod_dav_svn/reports/deleted-rev.c
  (dav_svn__get_deleted_rev_report): Replace flush and error logic
    with a call to dav_svn__final_flush_or_error().  Also, make a little
    code formatting tweak.

* subversion/mod_dav_svn/reports/file-revs.c
  (dav_svn__file_revs_report): Replace flush and error logic with a
    call to dav_svn__final_flush_or_error().

* subversion/mod_dav_svn/reports/get-locations.c
  (dav_svn__get_locations_report): Replace flush and error logic with
    a call to dav_svn__final_flush_or_error().

* subversion/mod_dav_svn/reports/get-location-segments.c
  (dav_svn__get_location_segments_report): Replace flush and error
    logic with a call to dav_svn__final_flush_or_error().

* subversion/mod_dav_svn/reports/get-locks.c
  (send_get_lock_response): New helper function, cored out of ...
  (dav_svn__get_locks_report): ... this, which in addition to calling
    send_get_lock_response() now also uses dav_svn__final_flush_or_error().

* subversion/mod_dav_svn/reports/log.c
  (dav_svn__log_report): Replace flush and error logic with a call to
    dav_svn__final_flush_or_error().

* subversion/mod_dav_svn/reports/mergeinfo.c
  (dav_svn__get_mergeinfo_report): Replace flush and error logic with a call
    to dav_svn__final_flush_or_error().

* subversion/mod_dav_svn/reports/replay.c
  (dav_svn__replay_report): Replace flush and error logic with a call
    to dav_svn__final_flush_or_error().

* subversion/mod_dav_svn/reports/update.c
  (dav_svn__update_report): Replace flush and error logic with a call
    to dav_svn__final_flush_or_error().  This also changes some nearby logic
    ordering regarding subpool deletion and such.

------------------------------------------------------------------------
r35329 | hwright | 2009-01-19 18:59:38 +0100 (Mon, 19 Jan 2009) | 46 lines
Changed paths:
   M /trunk/subversion/include/svn_types.h
   M /trunk/subversion/libsvn_ra_neon/log.c
   M /trunk/subversion/libsvn_ra_serf/log.c
   M /trunk/subversion/libsvn_ra_svn/client.c
   M /trunk/subversion/libsvn_ra_svn/protocol
   M /trunk/subversion/libsvn_repos/log.c
   M /trunk/subversion/mod_dav_svn/reports/log.c
   M /trunk/subversion/svn/log-cmd.c
   M /trunk/subversion/svnserve/serve.c

Fix issue #1967: Return the kind of a node in the changed_paths portion of the
log receiver interface.  Ultimately the presence or lack thereof of this value
could depend on the server version, and whether or not the filesystem is storing
this information.

Note: This doesn't actually *use* these values in the command line client, but
I figure that's a bikeshed for another day.

* subversion/mod_dav_svn/reports/log.c
  (kind_str): New.
  (log_receiver): Use svn_log_changed_path2_t and report the node kind to the
    client.

* subversion/libsvn_ra_svn/client.c
  (interpret_kind): If the passed string is NULL, return an unknown kind.
  (ra_svn_log): Use sv_log_changed_path2_t and report the node kind to the
    client.

* subversion/libsvn_ra_svn/protocol
  (changed-path-entry): Update.
 
* subversion/svn/log-cmd.c
  (log_entry_receiver): Use a svn_log_changed_path2_t, even though we don't
    currently use the extra node kind field.

* subversion/include/svn_types.h
  (svn_log_changed_path2_t): New.
  (svn_log_changed_path_t): Deprecate.

* subversion/libsvn_ra_neon/log.c
  (log_baton): Use svn_log_changed_path2_t.
  (kind_val): New.
  (log_start_element): Parse the node-kind attribute.

* subversion/libsvn_repos/log.c
  (detect_changed): Use svn_log_changed_path2_t and set the node kind member
    from the filesystem value.

* subversion/svnserve/serve.c
  (log_receiver): Write the changed node kind to the client.

* subversion/libsvn_ra_serf/log.c
  (log_info_t): Use svn_log_changed_path2_t.
  (kind_val): New.
  (start_log): Parse the changed node kind received from the server.

------------------------------------------------------------------------
r35330 | hwright | 2009-01-19 19:14:52 +0100 (Mon, 19 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/include/svn_types.h

* subversion/include/svn_types.h
  (svn_log_entry_t): Followup to r35329: Update docstring.

Suggested by: rhuijben

------------------------------------------------------------------------
r35331 | hwright | 2009-01-19 20:01:37 +0100 (Mon, 19 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java

Followup to r35329: Pass the node kind information to JavaHL.

[ in subversion/bindings/javahl/ ]
* native/LogMessageCallback.cpp
  (singleMessage): Pass the node kind information back up to Java.

* src/org/tigris/subversion/javahl/ChangePath.java
  (serialVersionUID): Bump.
  (ChangePath): Add new value to constructor.
  (nodeKind): New.
  (getNodeKind): New.

------------------------------------------------------------------------
r35332 | jwhitlock | 2009-01-19 20:22:21 +0100 (Mon, 19 Jan 2009) | 7 lines
Changed paths:
   M /trunk/build/generator/swig/header_wrappers.py

Follow-up to r35314, fix the SWIG bindings to no longer wrapper
svn_auth_gnome_keyring_unlock_prompt_func_t.

* build/generator/swig/header_wrappers.py
  (_ignores): Ignore 'svn_auth_gnome_keyring_unlock_prompt_func_t'.
  (write_makefile_rules): Updated ignore logic to apply to callbacks.

------------------------------------------------------------------------
r35333 | hwright | 2009-01-19 20:55:36 +0100 (Mon, 19 Jan 2009) | 29 lines
Changed paths:
   M /trunk/subversion/include/svn_types.h
   M /trunk/subversion/libsvn_ra_neon/log.c
   M /trunk/subversion/libsvn_ra_serf/log.c
   M /trunk/subversion/libsvn_ra_svn/client.c
   M /trunk/subversion/libsvn_subr/kitchensink.c
   M /trunk/subversion/mod_dav_svn/reports/log.c
   M /trunk/subversion/svnserve/serve.c

In a followup to r35329: Centralize the node kind word parsing and unparse,
partly for consistency and partly to eliminate code duplication.

* subversion/libsvn_subr/kitchensink.c
  (svn_node_kind_to_word, svn_node_kind_from_word): New.

* subversion/mod_dav_svn/reports/log.c
  (kind_str): Remove.
  (log_receiver): Update callers.

* subversion/libsvn_ra_svn/client.c
  (interpret_kind): Remove.
  (ra_svn_get_dir, ra_svn_log, ra_svn_check_path, ra_svn_stat): Update callers.

* subversion/include/svn_types.h
  (svn_node_kind_to_word, svn_node_kind_from_word): New.

* subversion/libsvn_ra_neon/log.c
  (kind_val): Remove.
  (log_start_element): Update caller.

* subversion/libsvn_ra_serf/log.c
  (kind_val): Remove.
  (start_log): Update caller.

* subversion/svnserve/serve.c
  (kind_word): Remove.
  (get_dir, log_receiver, check_path, stat): Update callers.

------------------------------------------------------------------------
r35334 | pburba | 2009-01-19 22:14:29 +0100 (Mon, 19 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/update_tests.py

Make an update test a bit clearer.

* subversion/tests/cmdline/update_tests.py
  (forced_update_failures): Rework how the test works to make it a bit
  clearer.  Dump some thoughts related to issue #3209 into the comment.

------------------------------------------------------------------------
r35335 | cmpilato | 2009-01-19 22:23:12 +0100 (Mon, 19 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Add another (optional) TODO item.
------------------------------------------------------------------------
r35336 | cmpilato | 2009-01-19 22:24:22 +0100 (Mon, 19 Jan 2009) | 4 lines
Changed paths:
   M /trunk/www/project_tools.html

* www/project_tools.html
  Fix the "via RSS" link to point to the new Announcements feed URL.

Reported by: Gustavo Chaves <gustavo{_AT_}gnustavo.com>
------------------------------------------------------------------------
r35337 | hwright | 2009-01-19 22:49:51 +0100 (Mon, 19 Jan 2009) | 11 lines
Changed paths:
   M /trunk/aclocal.m4
   A /trunk/build/ac-macros/kwallet.m4
   M /trunk/configure.ac

Move the KWallet autoconf code out of configure.ac.

* build/ac-macros/kwallet.m4:
  New.

* configure.ac:
  Yank KWallet checking in favor of the imported macro.

* aclocal.m4:
  Include the new file.

------------------------------------------------------------------------
r35338 | pburba | 2009-01-19 23:14:44 +0100 (Mon, 19 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Fix some incorrect expectations for XFailing merge test for issue #2690.

* subversion/tests/cmdline/merge_tests.py
  (merge_dir_and_file_replace): Account for mergeinfo and correct expected
  output from a merge.  This test still fails, but now fails as described
  in issue #2690.

------------------------------------------------------------------------
r35339 | rhuijben | 2009-01-20 00:08:35 +0100 (Tue, 20 Jan 2009) | 25 lines
Changed paths:
   M /trunk/subversion/include/svn_types.h
   M /trunk/subversion/libsvn_ra_neon/log.c
   M /trunk/subversion/libsvn_ra_serf/log.c
   M /trunk/subversion/libsvn_ra_svn/client.c
   M /trunk/subversion/libsvn_repos/log.c
   M /trunk/subversion/libsvn_subr/constructors.c
   M /trunk/subversion/libsvn_subr/deprecated.c

Following up on r35329, make the new svn_log_changed_path2_t type future
extensible by providing create and dup functions.

* subversion/include/svn_types.h
  (svn_log_changed_path2_t): Note that you should use 
    svn_log_changed_path2_create() to create instances and
    svn_log_changed_path2_dup() to duplicate.
  (svn_log_changed_path2_create): New function.
  (svn_log_changed_path2_dup): New function.
  (svn_log_changed_path_dup): Deprecate function
* subversion/libsvn_ra_neon/log.c
  (log_start_element): Use svn_log_changed_path2_create()
* subversion/libsvn_ra_serf/log.c  
  (push_state): Use svn_log_changed_path2_create()
* subversion/libsvn_ra_svn/client.c
  (ra_svn_log): Use svn_log_changed_path2_create()
* subversion/libsvn_repos/log.c
  (detect_changed): Use svn_log_changed_path2_create()
* subversion/libsvn_subr/constructors.c
  (svn_log_changed_path2_create): New function.
  (svn_log_changed_path2_dup): New function.
  (svn_log_changed_path_dup): Move to ...
* subversion/libsvn_subr/deprecated.c
  (svn_log_changed_path_dup): ... here.

------------------------------------------------------------------------
r35340 | rhuijben | 2009-01-20 00:11:17 +0100 (Tue, 20 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/constructors.c

* subversion/libsvn_subr/constructors.c
  (svn_log_changed_path2_create, svn_log_changed_path2_dup):
    Fix two whitespace aligning typos.

------------------------------------------------------------------------
r35341 | pburba | 2009-01-20 00:50:53 +0100 (Tue, 20 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Fix a merge test that is XFailing due to incorrect expectations in the
brave new tree conflict world.

* subversion/tests/cmdline/merge_tests.py
  (merge_add_over_versioned_file_conflicts): Expect a tree conflict when
  merging a file addition onto an existing versioned file.
  (test_list): Remove XFail from merge_add_over_versioned_file_conflicts.

------------------------------------------------------------------------
r35342 | rhuijben | 2009-01-20 00:58:35 +0100 (Tue, 20 Jan 2009) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/constructors.c

* subversion/libsvn_subr/constructors.c
  (svn_log_changed_path2_dup): Fix argument type to resolve compiler warning/error.
------------------------------------------------------------------------
r35343 | cauchy | 2009-01-20 10:34:07 +0100 (Tue, 20 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/po/zh_CN.po

Simplified chinese translation update.

* subversion/po/zh_CN.po: Update to r35342, translate new strings.

------------------------------------------------------------------------
r35344 | rhuijben | 2009-01-20 11:30:38 +0100 (Tue, 20 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_wc/status.c

Record actual text and property status when walking files for status,
to give API users information on whether a diff is available for the
node.

* subversion/include/svn_wc.h
  (svn_wc_status2_t): Add pristine_text_status and pristine_prop_status
    fields and document file_external as new in Subversion 1.6.  
* subversion/libsvn_wc/status.c
  (assemble_status): Record pristine_text_status and pristine_prop_status,
    when we have the values anyway. And provide these values in the
    assembled structure.

------------------------------------------------------------------------
r35345 | julianfoad | 2009-01-20 12:54:59 +0100 (Tue, 20 Jan 2009) | 9 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

Tweak some doc strings and code trivia related to the detection of SQLite.

* build/ac-macros/sqlite.m4
  (SVN_LIB_SQLITE): Correct the doc string. Stop passing an (unused)
    argument to SVN_SQLITE_VERNUM_PARSE.
  (SVN_SQLITE_VERNUM_PARSE): Remove an unused argument assignment. Expand
    the doc string.
  (SVN_SQLITE_MIN_VERNUM_PARSE): Add a doc string.

------------------------------------------------------------------------
r35346 | julianfoad | 2009-01-20 14:52:02 +0100 (Tue, 20 Jan 2009) | 2 lines
Changed paths:
   M /branches/issue-3334-dirs
   M /branches/issue-3334-dirs/aclocal.m4
   A /branches/issue-3334-dirs/build/ac-macros/kwallet.m4 (from /trunk/build/ac-macros/kwallet.m4:35345)
   M /branches/issue-3334-dirs/build/ac-macros/sqlite.m4
   M /branches/issue-3334-dirs/build/generator/swig/header_wrappers.py
   M /branches/issue-3334-dirs/configure.ac
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/LogMessageCallback.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
   M /branches/issue-3334-dirs/subversion/include/svn_types.h
   M /branches/issue-3334-dirs/subversion/include/svn_wc.h
   M /branches/issue-3334-dirs/subversion/libsvn_ra_neon/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_svn/client.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_svn/protocol
   M /branches/issue-3334-dirs/subversion/libsvn_repos/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/constructors.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/kitchensink.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/status.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/dav_svn.h
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/dated-rev.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/deleted-rev.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/file-revs.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/get-location-segments.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/get-locations.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/get-locks.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/log.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/mergeinfo.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/replay.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/update.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/util.c
   M /branches/issue-3334-dirs/subversion/po/zh_CN.po
   M /branches/issue-3334-dirs/subversion/svn/log-cmd.c
   M /branches/issue-3334-dirs/subversion/svnserve/serve.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py
   M /branches/issue-3334-dirs/www/project_tools.html

On the issue-3334-dirs branch: Merge changes from trunk up to r35345.

------------------------------------------------------------------------
r35347 | hwright | 2009-01-20 16:22:08 +0100 (Tue, 20 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_fs/fs-test.c

* subversion/tests/libsvn_fs/fs-test.c
  (merging_commit): Followup to r15569: Fix the expectation on the XFail'ing
    fs-test 18.
  (test_funcs): Mark test as passing.

------------------------------------------------------------------------
r35348 | rhuijben | 2009-01-20 16:36:01 +0100 (Tue, 20 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/constructors.c

Following up on r35339, make sure all fields are empty from
svn_svn_log_changed_path2_create.

* subversion/libsvn_subr/constructors.c
  (svn_log_changed_path2_create): Use apr_pcalloc instead of apr_palloc.
  (svn_log_changed_path2_dup): Copy the structure directly instead of via
    memcpy.
    
Found by: hwright
(and the ubuntu bindings buildbot)

------------------------------------------------------------------------
r35349 | pburba | 2009-01-20 17:45:58 +0100 (Tue, 20 Jan 2009) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Note that issue #3354 is not completely fixed.

------------------------------------------------------------------------
r35350 | cmpilato | 2009-01-20 20:11:25 +0100 (Tue, 20 Jan 2009) | 1 line
Changed paths:
   M /trunk/TODO-1.6

Remove TODO item that was completed in r34108.
------------------------------------------------------------------------
r35351 | hwright | 2009-01-20 20:50:46 +0100 (Tue, 20 Jan 2009) | 9 lines
Changed paths:
   A /trunk/build/transform-sql.py

Add a helper script which will transform a file full of SQL commands into a
header file suitable for inclusion in a standard C file and use with the
Subversion SQLite APIs.  The goal here is that we can maintain our SQL schema
directly as such, and let this script do the appropriate transformation as
part of autogen.sh.

* build/transform-sql.py:
  New.

------------------------------------------------------------------------
r35352 | hwright | 2009-01-20 21:48:59 +0100 (Tue, 20 Jan 2009) | 18 lines
Changed paths:
   M /trunk/autogen.sh
   M /trunk/build/transform-sql.py
   M /trunk/subversion/libsvn_fs_fs
   A /trunk/subversion/libsvn_fs_fs/rep-cache-db.sql
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c

Move the rep-sharing sql schema to it's own file.

* subversion/libsvn_fs_fs:
  Ignore the generated sql header.

* subversion/libsvn_fs_fs/rep-cache-db.sql:
  New.

* subversion/libsvn_fs_fs/rep-cache.c
  (upgrade_sql): Use the string defined in the generated header file.

* build/transform-sql.py
  (main): Don't output an entire array of sql, rather just define the sql
    as a string so the consuming file can use it as it pleases.

* autogen.sh:
  Transform the sql file into a header for compilation.

------------------------------------------------------------------------
r35353 | hwright | 2009-01-20 21:52:51 +0100 (Tue, 20 Jan 2009) | 3 lines
Changed paths:
   M /trunk/autogen.sh

* autogen.sh:
  Fix comment about requiring Python 2.4.

------------------------------------------------------------------------
r35354 | hwright | 2009-01-20 21:54:19 +0100 (Tue, 20 Jan 2009) | 4 lines
Changed paths:
   M /trunk/build/ac-macros/sqlite.m4

* build/ac-macros/sqlite.m4
  (SVN_SQLITE_DIR_CONFIG): When checking for an sqlite installation directory,
    set the hoped-for compiler flags before running the test compilation.

------------------------------------------------------------------------
r35355 | cmpilato | 2009-01-20 22:03:37 +0100 (Tue, 20 Jan 2009) | 4 lines
Changed paths:
   M /trunk/www/links.html

* www/links.html
  (social-networking): New section, with the Subversion Facebook page to
    kick things off.

------------------------------------------------------------------------
r35356 | hwright | 2009-01-20 22:57:17 +0100 (Tue, 20 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c

Remove some ifdef'd out code which has been around since r1.  In spite of our
best intentions to the contrary, I doubt we'll use it before wc-ng.

* subversion/libsvn_wc/entries.c
  (check_entries): Nuke.

------------------------------------------------------------------------
r35357 | hwright | 2009-01-20 23:21:00 +0100 (Tue, 20 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

* subversion/libsvn_wc/wc-metadata.sql:
  Fix sql syntax by removing a stray comma.

------------------------------------------------------------------------
r35358 | cmpilato | 2009-01-20 23:25:54 +0100 (Tue, 20 Jan 2009) | 12 lines
Changed paths:
   M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
   M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py

Finish issue #3302 (svnmerge.py migration tool(s) do not guarantee
proper svn:mergeinfo range ordering) by including a critical sort() of
revision-range-items-to-be.

* contrib/client-side/svnmerge/svnmerge-migrate-history.py
  (Migrator.get_natural_history): Sort the location segments before
    transforming them into mergeinfo revision ranges.

* contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
  (SvnClient.get_history_as_mergeinfo): Sort the location segments before
    transforming them into mergeinfo revision ranges.

------------------------------------------------------------------------
r35359 | pburba | 2009-01-21 02:20:03 +0100 (Wed, 21 Jan 2009) | 13 lines
Changed paths:
   M /trunk/autogen.sh
   M /trunk/build/generator/gen_win.py
   D /trunk/build/transform-sql.py
   A /trunk/build/transform_sql.py (from /trunk/build/transform-sql.py:35358)

Follow-up to r35352, fix the Windows build by transforming the rep-sharing
sql schema file into a header file on Windows too.

* autogen.sh: Account for rename of transform-sql.py to transform_sql.py

* build/generator/gen_win.py
  (WinGeneratorBase.__init__): Call _find_sqlite().
  (WinGeneratorBase._create_sqlite_header): New, does for Windows what
  autogen.sh and r35352 do for Linux.

* build/transform-sql.py: Rename from this...
* build/transform_sql.py: ...to this, because gen_win.py needs to import it
  and imported modules must follow the same rules for valid variable names.
------------------------------------------------------------------------
r35360 | rhuijben | 2009-01-21 10:47:26 +0100 (Wed, 21 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/include/svn_types.h

* subversion/include/svn_types.h
  (svn_log_entry_t): Following up on r25159, mark as new in 1.5.

------------------------------------------------------------------------
r35361 | rhuijben | 2009-01-21 12:24:22 +0100 (Wed, 21 Jan 2009) | 36 lines
Changed paths:
   M /trunk/subversion/include/svn_types.h
   M /trunk/subversion/libsvn_ra/compat.c
   M /trunk/subversion/libsvn_ra_neon/log.c
   M /trunk/subversion/libsvn_ra_serf/log.c
   M /trunk/subversion/libsvn_ra_svn/client.c
   M /trunk/subversion/libsvn_repos/log.c
   M /trunk/subversion/libsvn_subr/compat.c
   M /trunk/subversion/libsvn_subr/constructors.c
   M /trunk/subversion/mod_dav_svn/reports/log.c
   M /trunk/subversion/svn/log-cmd.c
   M /trunk/subversion/svnserve/serve.c

Following up on r35329, r35330, extend svn_log_entry_t in a ABI compatible way.

* subversion/include/svn_types.h
  (svn_log_entry_t): Add new changed_path2 field containing a hash of 
    svn_changed_path2_t items that is documented to be always the same as
    the changed_paths hash when svn_changed_path2_t typed structures are 
    available. This makes sure third party providers of svn_log_entry_t will never
    be bitten by not providing the larger svn_changed_path2_t structures.
  (svn_log_entry_dup): New function.
* subversion/libsvn_subr/constructors.c
  (svn_log_entry_dup): New function.
  
* subversion/libsvn_ra/compat.c
 (log_receiver, gls_log_receiver, fr_log_message_receiver,
  log_path_del_receiver): 
* subversion/libsvn_subr/compat.c
 (log_wrapper_callback):
* subversion/mod_dav_svn/reports/log.c
  (log_receiver):
* subversion/libsvn_ra_svn/client.c
  (ra_svn_log(svn_ra_session_t):
* subversion/svn/log-cmd.c
  (log_entry_receiver, log_entry_receiver_xml):
* subversion/libsvn_ra_serf/log.c
  (push_state,end_log):
* subversion/libsvn_ra_neon/log.c
  (reset_log_item, log_end_item):
* subversion/libsvn_repos/log.c
  (fill_log_entry):
*  subversion/svnserve/serve.c
  (log_receiver): Always set changed_paths2 and changed_paths; always read
    changed_paths2.

Suggested by: gstein
              me

------------------------------------------------------------------------
r35362 | rhuijben | 2009-01-21 13:35:42 +0100 (Wed, 21 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/constructors.c

* subversion/libsvn_subr/constructors.c
  (svn_log_entry_dup): Following up on r35361, really use changed_paths2 for
    input. And some pointer usage for hashing cleanups.

Suggested by: gstein

------------------------------------------------------------------------
r35363 | rhuijben | 2009-01-21 15:03:13 +0100 (Wed, 21 Jan 2009) | 17 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/prop_commands.c
   M /trunk/subversion/libsvn_wc/util.c
   M /trunk/subversion/svn/notify.c

Provide information in svn_wc_notify_t on whether the notification is about
a path or an url. This allows us to backwards compatible avoid invalid paths
from the notifications.

* subversion/include/svn_wc.h
  (svn_wc_notify_t): Add new url field and document path as "." or another valid path
    when the url is set, because path is documented to always specify a valid absolute
    or relative path.
  (svn_wc_create_notify_url): New function.
* subversion/libsvn_wc/util.c
  (svn_wc_create_notify_url): New function.
  (svn_wc_dup_notify): Make copy of url if set.
* subversion/svn/notify.c
  (notify): Use url for notifications when available, otherwise use path.
* subversion/libsvn_client/prop_commands.c
  (svn_client_revprop_set2): Use svn_wc_create_notify_url for url notification.

------------------------------------------------------------------------
r35364 | rhuijben | 2009-01-21 15:05:50 +0100 (Wed, 21 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/svn/notify.c

* subversion/svn/notify.c
  (notify): Following up on r35363, add missing pointer reference.

------------------------------------------------------------------------
r35494 | cmpilato | 2009-01-27 16:13:09 +0100 (Tue, 27 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/Makefile.in
   M /branches/http-protocol-v2/TODO-1.6
   M /branches/http-protocol-v2/build/generator/gen_make.py
   M /branches/http-protocol-v2/build/generator/gen_msvc_dsp.py
   M /branches/http-protocol-v2/build/generator/gen_vcnet_vcproj.py
   M /branches/http-protocol-v2/build/generator/util/executable.py
   M /branches/http-protocol-v2/contrib/client-side/svn-push/svn-push.c
   M /branches/http-protocol-v2/notes/http-protocol-v2.txt
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/ConflictResolverCallback.h
   A /branches/http-protocol-v2/subversion/bindings/javahl/native/CreateJ.cpp (from /trunk/subversion/bindings/javahl/native/CreateJ.cpp:35493)
   A /branches/http-protocol-v2/subversion/bindings/javahl/native/CreateJ.h (from /trunk/subversion/bindings/javahl/native/CreateJ.h:35493)
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/InfoCallback.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/ListCallback.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/RevpropTable.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNAdmin.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNClient.h
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
   A /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java:35493)
   M /branches/http-protocol-v2/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/http-protocol-v2/subversion/bindings/swig/core.i
   M /branches/http-protocol-v2/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /branches/http-protocol-v2/subversion/bindings/swig/python/svn/fs.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/svn/repos.py
   M /branches/http-protocol-v2/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/http-protocol-v2/subversion/bindings/swig/svn_delta.i
   M /branches/http-protocol-v2/subversion/bindings/swig/svn_fs.i
   M /branches/http-protocol-v2/subversion/bindings/swig/svn_wc.i
   M /branches/http-protocol-v2/subversion/include/private/ra_svn_sasl.h
   M /branches/http-protocol-v2/subversion/include/private/svn_auth_private.h
   M /branches/http-protocol-v2/subversion/include/private/svn_cmdline_private.h
   M /branches/http-protocol-v2/subversion/include/private/svn_fs_util.h
   M /branches/http-protocol-v2/subversion/include/private/svn_log.h
   M /branches/http-protocol-v2/subversion/include/private/svn_mergeinfo_private.h
   M /branches/http-protocol-v2/subversion/include/private/svn_opt_private.h
   M /branches/http-protocol-v2/subversion/include/private/svn_sqlite.h
   M /branches/http-protocol-v2/subversion/include/private/svn_utf_private.h
   M /branches/http-protocol-v2/subversion/include/svn_auth.h
   M /branches/http-protocol-v2/subversion/include/svn_base64.h
   M /branches/http-protocol-v2/subversion/include/svn_checksum.h
   M /branches/http-protocol-v2/subversion/include/svn_client.h
   M /branches/http-protocol-v2/subversion/include/svn_cmdline.h
   M /branches/http-protocol-v2/subversion/include/svn_config.h
   M /branches/http-protocol-v2/subversion/include/svn_delta.h
   M /branches/http-protocol-v2/subversion/include/svn_diff.h
   M /branches/http-protocol-v2/subversion/include/svn_dirent_uri.h
   M /branches/http-protocol-v2/subversion/include/svn_dso.h
   M /branches/http-protocol-v2/subversion/include/svn_error.h
   M /branches/http-protocol-v2/subversion/include/svn_error_codes.h
   M /branches/http-protocol-v2/subversion/include/svn_fs.h
   M /branches/http-protocol-v2/subversion/include/svn_hash.h
   M /branches/http-protocol-v2/subversion/include/svn_io.h
   M /branches/http-protocol-v2/subversion/include/svn_iter.h
   M /branches/http-protocol-v2/subversion/include/svn_md5.h
   M /branches/http-protocol-v2/subversion/include/svn_mergeinfo.h
   M /branches/http-protocol-v2/subversion/include/svn_opt.h
   M /branches/http-protocol-v2/subversion/include/svn_path.h
   M /branches/http-protocol-v2/subversion/include/svn_pools.h
   M /branches/http-protocol-v2/subversion/include/svn_props.h
   M /branches/http-protocol-v2/subversion/include/svn_quoprint.h
   M /branches/http-protocol-v2/subversion/include/svn_ra.h
   M /branches/http-protocol-v2/subversion/include/svn_ra_svn.h
   M /branches/http-protocol-v2/subversion/include/svn_repos.h
   M /branches/http-protocol-v2/subversion/include/svn_sorts.h
   M /branches/http-protocol-v2/subversion/include/svn_string.h
   M /branches/http-protocol-v2/subversion/include/svn_subst.h
   M /branches/http-protocol-v2/subversion/include/svn_time.h
   M /branches/http-protocol-v2/subversion/include/svn_types.h
   M /branches/http-protocol-v2/subversion/include/svn_user.h
   M /branches/http-protocol-v2/subversion/include/svn_utf.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/include/svn_xml.h
   M /branches/http-protocol-v2/subversion/libsvn_client/commit.c
   M /branches/http-protocol-v2/subversion/libsvn_client/export.c
   M /branches/http-protocol-v2/subversion/libsvn_client/list.c
   M /branches/http-protocol-v2/subversion/libsvn_client/log.c
   M /branches/http-protocol-v2/subversion/libsvn_diff/diff_file.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/dag.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/tree.c
   M /branches/http-protocol-v2/subversion/libsvn_ra/compat.c
   M /branches/http-protocol-v2/subversion/libsvn_ra/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_ra/wrapper_template.h
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/log.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/util.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/blame.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/commit.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/log.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/property.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/replay.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/update.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/rev_hunt.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/auth.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/checksum.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/cmdline.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/compat.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/config_impl.h
   M /branches/http-protocol-v2/subversion/libsvn_subr/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/error.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/iter.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/opt.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/quoprint.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/sha1.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/sqlite.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/ssl_server_trust_providers.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/subst.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/utf.c
   D /branches/http-protocol-v2/subversion/libsvn_subr/utf_impl.h
   M /branches/http-protocol-v2/subversion/libsvn_subr/utf_validate.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/xml.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/copy.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/entries.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/questions.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/translate.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/update_editor.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/util.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc-metadata.sql
   M /branches/http-protocol-v2/subversion/mod_dav_svn/activity.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/reports/log.c
   M /branches/http-protocol-v2/subversion/svn/changelist-cmd.c
   M /branches/http-protocol-v2/subversion/svn/conflict-callbacks.c
   M /branches/http-protocol-v2/subversion/svn/list-cmd.c
   M /branches/http-protocol-v2/subversion/svn/log-cmd.c
   M /branches/http-protocol-v2/subversion/tests/cmdline/prop_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/stat_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/__init__.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/actions.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/main.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/verify.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/trans_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/update_tests.py
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs/fs-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_repos/repos-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/utf-test.c
   M /branches/http-protocol-v2/tools/backup/hot-backup.py.in
   M /branches/http-protocol-v2/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
   M /branches/http-protocol-v2/tools/client-side/bash_completion
   M /branches/http-protocol-v2/tools/client-side/change-svn-wc-format.py
   M /branches/http-protocol-v2/tools/client-side/svnmucc/svnmucc.c
   M /branches/http-protocol-v2/tools/dev/contribulyze.py
   A /branches/http-protocol-v2/tools/dev/find-bad-style.py (from /trunk/tools/dev/find-bad-style.py:35493)
   A /branches/http-protocol-v2/tools/dev/min-includes.sh (from /trunk/tools/dev/min-includes.sh:35493)
   M /branches/http-protocol-v2/tools/hook-scripts/log-police.py
   M /branches/http-protocol-v2/tools/hook-scripts/mailer/mailer.py
   M /branches/http-protocol-v2/tools/hook-scripts/verify-po.py
   M /branches/http-protocol-v2/tools/server-side/svn-backup-dumps.py
   M /branches/http-protocol-v2/tools/server-side/svn-populate-node-origins-index.c
   M /branches/http-protocol-v2/www/getting.html

Bring up to date with trunk (Merged /trunk:r35389-35493).
------------------------------------------------------------------------
r35495 | hwright | 2009-01-27 16:14:46 +0100 (Tue, 27 Jan 2009) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Note that the branch is blocking on the failing JavaHL test.

------------------------------------------------------------------------
r35496 | hwright | 2009-01-27 16:19:26 +0100 (Tue, 27 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

* subversion/libsvn_wc/wc-metadata.sql
  (LOCKS): Rename to...
  (LOCK): ...this.  To consistify table names as singular within this file.

------------------------------------------------------------------------
r35497 | hwright | 2009-01-27 16:32:39 +0100 (Tue, 27 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Add tree conflict data to the wc-ng schema.  Currently this data is only set
on a directory, but contains information about the children.  Perhaps it would
be useful to set individual information for each of the children?

* subversion/libsvn_wc/wc-metadata.sql
  (WORKING_NODE): Add the tree conflict data.

------------------------------------------------------------------------
r35498 | hwright | 2009-01-27 16:54:05 +0100 (Tue, 27 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc_db.h

Add a number of structures which mirror the rows of tables described in
wc-metadata.sql.  These structures are intended to use native Subversion types,
any code which inserts or retrieves from SQL will need to translated to
the correct SQL type.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_base_node_t, svn_wc__db_working_node_t, svn_wc__db_actual_node_t,
   svn_wc__db_changelist_t, svn_wc__db_lock_t): New.

[ Reverted in r35500. ]

------------------------------------------------------------------------
r35499 | hwright | 2009-01-27 16:57:14 +0100 (Tue, 27 Jan 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/TODO-1.6
   M /branches/explore-wc/subversion/include/svn_dirent_uri.h
   M /branches/explore-wc/subversion/include/svn_path.h
   M /branches/explore-wc/subversion/libsvn_wc/wc-metadata.sql
   M /branches/explore-wc/subversion/libsvn_wc/wc_db.h

On the explore-wc branch:
Bring up-to-date with trunk.  (to get the wc-metadata.sql changes)

------------------------------------------------------------------------
r35500 | hwright | 2009-01-27 17:08:28 +0100 (Tue, 27 Jan 2009) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc_db.h

After having some sense beat into my by gstein, revert r35498.

------------------------------------------------------------------------
r35501 | rhuijben | 2009-01-27 17:30:24 +0100 (Tue, 27 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_client/client.h
   M /trunk/subversion/libsvn_client/mergeinfo.c

Following up on r35199, document that the path returned by 
svn_client__get_copy_source doesn't start with a'/' and update
its only caller that assumes it does.

* subversion/libsvn_client/client.h
  (svn_client__get_copy_source): Add note on not providing initial '/'.
* subversion/libsvn_client/mergeinfo.c
  (svn_client_suggest_merge_sources): Don't try to skip the '/'.
  
Found by: javahl tests

------------------------------------------------------------------------
r35502 | hwright | 2009-01-27 18:24:25 +0100 (Tue, 27 Jan 2009) | 22 lines
Changed paths:
   M /trunk/subversion/include/private/svn_skel.h
   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

Move property list skel parsing and unparsing to libsvn_subr.

* subversion/libsvn_subr/skel.c
  (skel_err, is_valid_proplist_skel): Copied from libsvn_fs_base.
  (svn_skel__parse_proplist, svn_skel__unparse_proplist): New.

* subversion/libsvn_fs_base/dag.c
  (svn_fs_base__dag_get_proplist): Update caller.

* subversion/libsvn_fs_base/util/fs_skels.h
  (svn_fs_base__parse_proplist_skel, svn_fs_base__unparse_proplist_skel):
    Remove.

* subversion/libsvn_fs_base/util/fs_skels.c
  (is_valid_proplist_skel, svn_fs_base_parse_proplist_skel,
   svn_fs_base__unparse_proplist_skel): Remove.
  (svn_fs_base__parse_transaction_skel,
   svn_fs_base__unparse_transaction_skel): Update caller.

* subversion/include/private/svn_skel.h
  (svn_skel__parse_proplist, svn_skel__unparse_proplist): New.

------------------------------------------------------------------------
r35503 | hwright | 2009-01-27 18:39:32 +0100 (Tue, 27 Jan 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/subversion/include/private/svn_skel.h
   M /branches/explore-wc/subversion/libsvn_client/client.h
   M /branches/explore-wc/subversion/libsvn_client/mergeinfo.c
   M /branches/explore-wc/subversion/libsvn_fs_base/dag.c
   M /branches/explore-wc/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/explore-wc/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/explore-wc/subversion/libsvn_subr/skel.c
   M /branches/explore-wc/subversion/libsvn_wc/wc_db.h

On the explore-wc branch:
Bring up-to-date with trunk.  (to get the skel changes)

------------------------------------------------------------------------
r35504 | markphip | 2009-01-27 19:57:07 +0100 (Tue, 27 Jan 2009) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove a TODO
------------------------------------------------------------------------
r35505 | gstein | 2009-01-27 20:03:36 +0100 (Tue, 27 Jan 2009) | 72 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_client/info.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/entries.h
   M /trunk/subversion/libsvn_wc/lock.c
   M /trunk/subversion/libsvn_wc/log.c
   M /trunk/subversion/libsvn_wc/log.h
   M /trunk/subversion/libsvn_wc/props.c
   M /trunk/subversion/libsvn_wc/questions.c
   M /trunk/subversion/libsvn_wc/questions.h
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/libsvn_wc/wc_db.h
   M /trunk/subversion/svn/info-cmd.c

Remove all handling for wc_entry.prop_time. It is not persisted into
.svn/entries, so it will always be zero. Nothing attempts to change the
value *away* from zero, so we can simply remove all prop_time code.

Also trimmed out some code that attempted to read changelist and file
external stuff from XML files (old entries and logs). We modify both
synchronously (rather than via loggy), and they are newer features than
old xml entries files.

* subversion/include/svn_wc.h:
  (svn_wc_entry_t.prop_time): mark as deprecated

* subversion/include/svn_client.h:
  (svn_info_t): note that prop_time will always be zero.

* svn/info-cmd.c:
  (print_info_xml): don't "print" prop_time
  (print_info): don't print prop_time

* subversion/libsvn_clie/ninfo.c:
  (build_info_from_entry): don't copy prop_time

* subversion/libsvn_wc/props.c:
  (load_props): simplify; we don't have to check for a missing file again.
  (svn_wc_props_modified_t): forget the subpool. remove all the
    optimizations since this section of code only fires for OLD formats

* subversion/libsvn_wc/adm_ops.c:
  (revert_admin_things): no need to specify "which" timestamp to update in
    the svn_wc__loggy_set_entry_timestamp_from_wc call.

* subversion/libsvn_wc/lock.c:
  (introduce_propcaching): no need to zero out prop_time since, by this
    point, the new entries format is used, and has a zeroed time already.

* subversion/libsvn_wc/update_editor.c:
  (merge_file, svn_wc_add_repos_file3): no need to specify "which"
    timestamp to update in the svn_wc__loggy_set_entry_timestamp_from_wc
    call.

* subversion/libsvn_wc/questions.c:
  (svn_wc__timestamps_equal_p): no need for a TIMESTAMP_KIND param, as
    there is only one kind of timestamp now. simplify function body.

* subversion/libsvn_wc/questions.h:
  (svn_wc__timestamp_kind): remove
  (svn_wc__timestamps_equal_p): remove TIMESTAMP_KIND param.

* subversion/libsvn_wc/entries.c:
  (svn_wc__atts_to_entry): don't bother looking for a PROP_TIME attr since
    anything in it (an old log, for example) will end up getting ignored
    anyways. also, don't bother looking for CHANGELIST or FILE_EXTERNAL
    attributes since they are not in old XML entries files, nor in logs
    that modify entries.

* subversion/libsvn_wc/entries.h:
  (SVN_WC__ENTRY_ATTR_PROP_TIME): remove
  (SVN_WC__ENTRY_MODIFY_PROP_TIME): remove

* subversion/libsvn_wc/log.c:
  (log_do_modify_entry): don't worry about prop_time. update an obsolete
    comment, wrt TEXT_TIME
  (svn_wc__loggy_entry_modify): ignore prop_time
  (svn_wc__loggy_set_entry_timestamp_from_wc): remove TIME_PROP param and
    just hard-code it to the one kind.

* subversion/libsvn_wc/wc_db.h:
  (): update a comment referring to prop_time

* subversion/libsvn_wc/log.h:
  (svn_wc__loggy_set_entry_timestamp_from_wc): remove TIME_PROP param

------------------------------------------------------------------------
r35506 | hwright | 2009-01-27 20:19:49 +0100 (Tue, 27 Jan 2009) | 14 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Abstract out the insertion of the base_nodes as part of wc-ng.

* subversion/libsvn_wc/entries.c
  (MAYBE_ALLOC): New.
  (statements): Update statement to include a new field.
  (db_base_node_t, db_working_node_t, db_actual_node_t, db_changelist_t,
   db_lock_t): New.
  (insert_base_node): Completely rewrite, as just a function which inserts or
    replaces a given base node into the database.
  (insert_working_node): Change signature.
  (insert_actual_node): New.
  (write_entry): Start to reason about when to create various node rows.

------------------------------------------------------------------------
r35507 | hwright | 2009-01-27 21:35:28 +0100 (Tue, 27 Jan 2009) | 12 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Insert rows into the working_node table, and other sundry fixes.

* subversion/libsvn_wc/entries.c
  (MAYBE_ALLOC): Wrap the entire expression in parens.
  (statements): Add extra column for insert working nodes.
  (db_working_node): Add additional columns.
  (insert_base_node): Don't worry about creating an intermediate svn_string_t.
  (insert_working_node): Implement.
  (write_entry): Create the right kinds of node depending on the schedule of
    an entry.  Populate the working node for the database.

------------------------------------------------------------------------
r35508 | rhuijben | 2009-01-27 22:09:07 +0100 (Tue, 27 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_svn/client.c

Resolve malformed network data error on performing
$ svn log -v --limit 1 svn://svn.tartarus.org/sgt/

* subversion/libsvn_ra_svn/client.c
  (ra_svn_log): Following up on r35329, make the new tuple list for the node
    kind optional for better interoperability with older svnserve versions.

Found by: SharpSvn tests.

------------------------------------------------------------------------
r35509 | danielsh | 2009-01-27 22:43:34 +0100 (Tue, 27 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/main.py

When testing with packing enabled, don't depend on the cwd in the hook
script.

Found by: commit_tests.py

* subversion/tests/cmdline/svntest/main.py
  (create_repos):
    Use the absolute path to the repository in the hook script.
------------------------------------------------------------------------
r35510 | hwright | 2009-01-27 22:50:32 +0100 (Tue, 27 Jan 2009) | 9 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

More parsing of the svn_wc_entry_t and insert rows into an actual node.

* subversion/libsvn_wc/entries.c
  (statement_keys, statements): Add a statement to insert into the actual_node
    table.
  (insert_actual_node): Implement.
  (write_entry): Look at some additional fields in the entry struct, and set
    new fields in the actual node table.

------------------------------------------------------------------------
r35511 | rhuijben | 2009-01-27 23:15:38 +0100 (Tue, 27 Jan 2009) | 4 lines
Changed paths:
   M /trunk/tools/client-side/svnmucc/svnmucc.c

* tools/client-side/svnmucc/svnmucc.c
  (open_tmp_file): Use svn_io_open_unique_file3 instead of deprecated
    svn_io_open_unique_file2.

------------------------------------------------------------------------
r35512 | rhuijben | 2009-01-27 23:23:31 +0100 (Tue, 27 Jan 2009) | 24 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/client.h
   M /trunk/subversion/libsvn_client/delete.c
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/externals.c
   M /trunk/subversion/libsvn_client/status.c
   M /trunk/subversion/svn/status-cmd.c

Following up on r32970, introduce a structure to hold arguments to 
svn_client_status4(), hoping that in the future we can just add members to 
the structure instead of rev'ing the entire API.

* subversion/include/svn_client.h
  (svn_client_status_args_t): New.
  (svn_client_status_args_create): New.
  (svn_client_status4): Update prototype to use svn_client_status_args_t.
* subversion/libsvn_client/client.h
  (svn_client__do_external_status): Forward svn_client_status_args_t instead
    of individual values.
* subversion/libsvn_client/delete.c
  (svn_client__can_delete): Updated for calling svn_client_status4.
* subversion/libsvn_client/deprecated.c
  (svn_client_status3): Updated for calling svn_client_status4.
* subversion/libsvn_client/externals.c
  (svn_client__do_external_status): Forward args to svn_client_status4.
* subversion/libsvn_client/status.c
  (svn_client_status4): Arguments updated.
  (svn_client_status_args_create): New.
* subversion/svn/status-cmd.c
  (svn_cl__status): Updated for calling svn_client_status4.

[Reverted in r35557]
------------------------------------------------------------------------
r35513 | hwright | 2009-01-27 23:28:10 +0100 (Tue, 27 Jan 2009) | 9 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Insert changelists and link them to actual and working nodes.

* subversion/libsvn_wc/entries.c
  (statement_keys, statements): Add a statement.
  (insert_changelist): New.
  (write_entry): If the entry has a changelist associated with it, get the
    value from the database, and set appropriate values.

------------------------------------------------------------------------
r35514 | rhuijben | 2009-01-27 23:36:49 +0100 (Tue, 27 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

* subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::status): Following up on r35512, update call to
    svn_client_status4.

[Reverted in r35557]

------------------------------------------------------------------------
r35515 | rhuijben | 2009-01-27 23:47:39 +0100 (Tue, 27 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

* subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::getVersionInfo): Following up on r35512,r35514 update another
    call to svn_client_status4.

[Reverted in r35557]

------------------------------------------------------------------------
r35516 | pburba | 2009-01-27 23:48:24 +0100 (Tue, 27 Jan 2009) | 8 lines
Changed paths:
   M /trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py

Prevent svnmerge-migrate-history.py from committing non-canonical mergeinfo.

See issue #3302.

* contrib/client-side/svnmerge/svnmerge-migrate-history.py
 (Migrator.convert_path_history): Run any new svn:mergeinfo through
 svn_mergeinfo_parse() before committing it, ensuring that it is in
 canonical form.
------------------------------------------------------------------------
r35517 | pburba | 2009-01-27 23:48:41 +0100 (Tue, 27 Jan 2009) | 2 lines
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r35516.

------------------------------------------------------------------------
r35518 | rhuijben | 2009-01-27 23:55:00 +0100 (Tue, 27 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp

* subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::status): Fix typo in call to svn_client_status_args_create.

[Reverted in r35557]

------------------------------------------------------------------------
r35519 | rhuijben | 2009-01-28 01:29:19 +0100 (Wed, 28 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_client/info.c

* subversion/libsvn_client/info.c
  (build_info_from_dirent): Initialize working_size64 with 
    SVN_INVALID_FILESIZE instead of setting working_size twice.

Found by: SharpSvn tests

------------------------------------------------------------------------
r35520 | stylesen | 2009-01-28 10:30:38 +0100 (Wed, 28 Jan 2009) | 5 lines
Changed paths:
   M /branches/1.5.x-issue2489
   M /branches/1.5.x-issue2489/CHANGES
   M /branches/1.5.x-issue2489/COMMITTERS
   M /branches/1.5.x-issue2489/build/generator/gen_make.py
   M /branches/1.5.x-issue2489/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x-issue2489/subversion/bindings/swig
   M /branches/1.5.x-issue2489/subversion/bindings/swig/core.i
   M /branches/1.5.x-issue2489/subversion/include/private
   M /branches/1.5.x-issue2489/subversion/include/private/svn_auth_private.h
   M /branches/1.5.x-issue2489/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/1.5.x-issue2489/subversion/libsvn_client/merge.c
   M /branches/1.5.x-issue2489/subversion/libsvn_subr
   M /branches/1.5.x-issue2489/subversion/libsvn_wc/adm_ops.c
   M /branches/1.5.x-issue2489/subversion/tests/cmdline/svntest/actions.py
   M /branches/1.5.x-issue2489/subversion/tests/libsvn_subr
   M /branches/1.5.x-issue2489/www/images/subversion-diagram.png
   M /branches/1.5.x-issue2489/www/images/subversion_logo-200x173.png
   M /branches/1.5.x-issue2489/www/images/subversion_logo-384x332.png
   M /branches/1.5.x-issue2489/www/images/subversion_logo_hor-468x64.png

On the 1.5.x-issue2489 branch:

Backport r33640 and r34607 from trunk to 1.5.x-issue2489 branch which
fixes SWIG related build errors.

------------------------------------------------------------------------
r35521 | stylesen | 2009-01-28 11:00:26 +0100 (Wed, 28 Jan 2009) | 5 lines
Changed paths:
   M /branches/1.5.x-issue2489/README.branch

On the 1.5.x-issue2489 branch:

* README.branch
  (Revisions included): Record r35520.

------------------------------------------------------------------------
r35522 | danielsh | 2009-01-28 11:38:24 +0100 (Wed, 28 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svnadmin_tests.py

Print a better error message on test failure.

* subversion/tests/cmdline/svnadmin_tests.py
  (hotcopy_dot):  s/run_svnadmin/run_and_verify_svnadmin/.
------------------------------------------------------------------------
r35523 | danielsh | 2009-01-28 12:52:59 +0100 (Wed, 28 Jan 2009) | 20 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/fs_fs.c

Fix 'svnadmin hotcopy' of packed repositories.

To reproduce (with vanilla trunk):

	#!/bin/sh
	rm -rf Foo Bar Bar2
	svnadmin create Foo
	sed -i 's/sharded 1000/sharded 1/' Foo/db/format
	svnadmin hotcopy Foo Bar
	svnadmin pack Foo
	echo "=== *Now* it will error:"
	svnadmin hotcopy Foo Bar2
	
The bug was found by svnadmin_tests.py with -DPACK_AFTER_EVERY_COMMIT.  (It
did not reproduce if only --fsfs-packing was used to enable packing in the
post-commit hook in the tests.)

* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__hotcopy):
    Account for packed shards when copying the revs/ directory.
------------------------------------------------------------------------
r35524 | danielsh | 2009-01-28 13:05:09 +0100 (Wed, 28 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_fs/fs-loader.c

Add a new #define for debugging the packing functionality.  (Apparently,
just having --fsfs-packing in the Python tests is not enough; see r35523).

* subversion/libsvn_fs/fs-loader.c
  (PACK_AFTER_EVERY_COMMIT):
    Make svn_fs_commit_txn() pack the filesystem if the macro is defined at
    compile time.  Leave it not-defined by default.
------------------------------------------------------------------------
r35525 | cmpilato | 2009-01-28 16:39:29 +0100 (Wed, 28 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/actions.py

Add a kludge to the merge tests to try to prevent unnecessarily
reported test failures when testing ra-serf.

* subversion/tests/cmdline/svntest/actions.py
  (run_and_verify_merge2): If the dry-run and regular merge outputs
    differ, compare them again sorted just in case ra_serf's
    multi-threaded model has simply generated output in a different
    order across the two runs.

------------------------------------------------------------------------
r35526 | cmpilato | 2009-01-28 17:16:15 +0100 (Wed, 28 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/actions.py

Merge r35525 from trunk.  Consistent test results are ... helpful.
------------------------------------------------------------------------
r35527 | cmpilato | 2009-01-28 18:49:47 +0100 (Wed, 28 Jan 2009) | 13 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/commit.c

On the http-protocol-v2 branch:  Get the ra-serf tests passing again!

NOTE: I'm not exactly sure how this collection of fixes would be
specific to the work done on this branch so far.  But as far as I
know, the trunk is working fine, so I'm making the fixes here.

* subversion/libsvn_ra_serf/commit.c
  (checkout_dir, checkout_file, proppatch_resource): Tweak error
    handling to avoid unnecessary (and often incorrect) work.

* BRANCH-README
  Remove notice about failing tests.

------------------------------------------------------------------------
r35528 | hwright | 2009-01-28 20:01:15 +0100 (Wed, 28 Jan 2009) | 6 lines
Changed paths:
   M /trunk/www/svn_1.6_releasenotes.html

Update the section on FSFS packing.

* www/svn_1.6_releasenotes.html
  (fsfs-packing): Flesh out, noting some of the benefits, as well as a
    pitfall.

------------------------------------------------------------------------
r35529 | hwright | 2009-01-28 20:06:31 +0100 (Wed, 28 Jan 2009) | 6 lines
Changed paths:
   M /trunk/www/svn_1.6_releasenotes.html

Flesh out the SQLite part of the release notes.

* www/svn_1.6_releasenotes.html
  (sqlite): Mention that we support both the amalgamation and library
    versions of SQLite, and how to use them.

------------------------------------------------------------------------
r35530 | hwright | 2009-01-28 20:15:14 +0100 (Wed, 28 Jan 2009) | 6 lines
Changed paths:
   M /trunk/www/links.html

Add Sublime to list of higher-level tools that use Subversion.

* www/links.html: Add new link at the bottom of higher-level tools list.

Patch by: Glen Cooper <glenc@pico-logic.com>

------------------------------------------------------------------------
r35531 | hwright | 2009-01-29 00:36:16 +0100 (Thu, 29 Jan 2009) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite.c

Ensure we parse variable argument lists in the correct order.  We can't
count on the order of function argument evaluation, so to ensure proper
ordering, use some temporary variables.

Suggested by: danielsh
              gstein

* subversion/libsvn_subr/sqlite.c
  (vbindf): Use a couple of temporary variables.

------------------------------------------------------------------------
r35532 | cmpilato | 2009-01-29 00:44:13 +0100 (Thu, 29 Jan 2009) | 26 lines
Changed paths:
   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/repos.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/version.c

On the http-protocol-v2 branch: Add a mod_dav_svn configuration
directive ("SVNAdvertiseV2Protocol") for toggling OPTIONS
advertisement of support for the v2 protocol (defaulting to "on").
This is mostly to facilitate testing, and is not necessarily expected
to survive the official release of this functionality.

* subversion/mod_dav_svn/dav_svn.h
  (dav_svn_repos): Add 'v2_protocol' member.
  (dav_svn__get_v2_protocol_flag): New prototype.

* subversion/mod_dav_svn/mod_dav_svn.c
  (dir_conf_t): Add 'v2_protocol' member.
  (create_dir_config): Default 'v2_protocol' to "on".
  (merge_dir_config): Handle merge of 'v2_protocol' flag.
  (SVNAdvertiseV2Protocol_cmd): New function.
  (dav_svn__get_v2_protocol_flag): New function.
  (cmds): Add record for SVNAdvertiseV2Protocol option.

* subversion/mod_dav_svn/version.c
  (get_option): Only send the HTTP v2 headers if we're configured to
    advertise support for HTTP v2.

* subversion/mod_dav_svn/repos.c
  (get_parentpath_resource, get_resource): Populate the 'v2_protocol'
    repos struct member.

------------------------------------------------------------------------
r35533 | hwright | 2009-01-29 00:57:44 +0100 (Thu, 29 Jan 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_svn/client.c

Fix issue #2580: Don't kill ssh processes when closing svn+ssh connections.
See the issue for all the details here, but this bad behavior hurts
people in a number of ways, and there really isn't any true justification
for it.

Reviewed by: maxb

* subversion/libsvn_ra_svn/client.c
  (make_tunnel): Don't send an explicit SIGKILL to the underlying ssh
    process when the connection pool gets destroyed.  Let it die in piece,
    in its own time, on its own terms.

------------------------------------------------------------------------
r35534 | hwright | 2009-01-29 02:11:26 +0100 (Thu, 29 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Change the 'kind' and 'depth' columns in the wc-ng metadata schema to text
values, partly for human readability, and partly for consistency with
existing ways of persisting these values.

* subversion/libsvn_wc/wc-metadata.sql
  (BASE_NODE, WORKING_NODE): Make kind and depth TEXT type.

------------------------------------------------------------------------
r35535 | hwright | 2009-01-29 02:19:55 +0100 (Thu, 29 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite.c

Revert r35414 and r35403, which had to do with SQLite error handling.
Paradoxically, the errors returned by svn_sqlite__reset() are much more
verbose than those returned by sqlite3_step().

------------------------------------------------------------------------
r35536 | hwright | 2009-01-29 02:28:09 +0100 (Thu, 29 Jan 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/TODO-1.6
   M /branches/explore-wc/contrib/client-side/svnmerge/svnmerge-migrate-history.py
   M /branches/explore-wc/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/explore-wc/subversion/include/svn_client.h
   M /branches/explore-wc/subversion/include/svn_wc.h
   M /branches/explore-wc/subversion/libsvn_client/client.h
   M /branches/explore-wc/subversion/libsvn_client/delete.c
   M /branches/explore-wc/subversion/libsvn_client/deprecated.c
   M /branches/explore-wc/subversion/libsvn_client/externals.c
   M /branches/explore-wc/subversion/libsvn_client/info.c
   M /branches/explore-wc/subversion/libsvn_client/status.c
   M /branches/explore-wc/subversion/libsvn_fs/fs-loader.c
   M /branches/explore-wc/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/explore-wc/subversion/libsvn_ra_svn/client.c
   M /branches/explore-wc/subversion/libsvn_subr/sqlite.c
   M /branches/explore-wc/subversion/libsvn_wc/adm_ops.c
   M /branches/explore-wc/subversion/libsvn_wc/entries.c
   M /branches/explore-wc/subversion/libsvn_wc/entries.h
   M /branches/explore-wc/subversion/libsvn_wc/lock.c
   M /branches/explore-wc/subversion/libsvn_wc/log.c
   M /branches/explore-wc/subversion/libsvn_wc/log.h
   M /branches/explore-wc/subversion/libsvn_wc/props.c
   M /branches/explore-wc/subversion/libsvn_wc/questions.c
   M /branches/explore-wc/subversion/libsvn_wc/questions.h
   M /branches/explore-wc/subversion/libsvn_wc/update_editor.c
   M /branches/explore-wc/subversion/libsvn_wc/wc-metadata.sql
   M /branches/explore-wc/subversion/libsvn_wc/wc_db.h
   M /branches/explore-wc/subversion/svn/info-cmd.c
   M /branches/explore-wc/subversion/svn/status-cmd.c
   M /branches/explore-wc/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/svntest/actions.py
   M /branches/explore-wc/subversion/tests/cmdline/svntest/main.py
   M /branches/explore-wc/tools/client-side/svnmucc/svnmucc.c
   M /branches/explore-wc/www/links.html
   M /branches/explore-wc/www/svn_1.6_releasenotes.html

On the explore-wc branch:
Bring up-to-date with trunk, resolving conflicts in libsvn_wc/entries.c.

------------------------------------------------------------------------
r35537 | hwright | 2009-01-29 02:52:12 +0100 (Thu, 29 Jan 2009) | 7 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Put text values for depth and node kind in the sqlite database.

* subversion/libsvn_wc/entries.c
  (insert_base_node, insert_working_node): Convert depth and node kind
    enums to text for sqlite storage.

------------------------------------------------------------------------
r35538 | glasser | 2009-01-29 06:14:55 +0100 (Thu, 29 Jan 2009) | 14 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/autoprop_tests.py
   M /trunk/subversion/tests/cmdline/svntest/tree.py

Speed up test suite by running 'svn proplist' only once per wc tree instead of
once per file in it.  (Yeah, there's an extra tree walk, but that should just
make the second tree walk come from cache.)

* subversion/tests/cmdline/svntest/tree.py
  (get_nodes_which_might_have_props): New.
  (get_props): Take a list of paths and return a hash of prop hashes.
  (handle_dir): Change load_props arg to props hash.  Look in hash instead of
   calling get_props.
  (build_tree_from_wc): Adjust.

* subversion/tests/cmdline/autoprop_tests.py
  (check_proplist): Adjust.

------------------------------------------------------------------------
r35539 | glasser | 2009-01-29 06:27:56 +0100 (Thu, 29 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/autoprop_tests.py

Follow-up to r35538: Actually pass autoprop_tests.py.

* subversion/tests/cmdline/autoprop_tests.py
  (check_proplist): Work for "expected no props" as well.

------------------------------------------------------------------------
r35540 | rhuijben | 2009-01-29 10:12:18 +0100 (Thu, 29 Jan 2009) | 1 line
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Add note on svn_(log/status)_args_t
------------------------------------------------------------------------
r35541 | rhuijben | 2009-01-29 10:40:20 +0100 (Thu, 29 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_client/prop_commands.c

* subversion/libsvn_client/prop_commands.c
  (svn_client_revprop_set2): Following up on r35224, send the right 
    notification action on setting/deleting revision properties.
    
Found by: cmpilato

------------------------------------------------------------------------
r35542 | julianfoad | 2009-01-29 12:17:52 +0100 (Thu, 29 Jan 2009) | 4 lines
Changed paths:
   M /trunk/autogen.sh

* autogen.sh
  Don't re-build a SQL header file every time, but only if it's changed, to
  avoid a consequent re-build of several objects during "make".

------------------------------------------------------------------------
r35543 | julianfoad | 2009-01-29 12:21:03 +0100 (Thu, 29 Jan 2009) | 4 lines
Changed paths:
   M /trunk/build/transform_sql.py

* build/transform_sql.py
  Check for the required number of arguments. Note in the doc string how the
  output file is named.

------------------------------------------------------------------------
r35544 | rhuijben | 2009-01-29 12:27:57 +0100 (Thu, 29 Jan 2009) | 20 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/EnumMapper.cpp
   M /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /trunk/subversion/include/svn_wc.h
   M /trunk/subversion/libsvn_wc/tree_conflicts.c
   M /trunk/subversion/svn/util.c

Add svn_wc_operation_none, to give the operation value in
svn_wc_conflict_description_t a better default value than update for
property and text conflicts.

This allows us to start filling this description value for property
and text conflicts in future subversion versions without rev'ving this
field.

* subversion/bindings/javahl/native/EnumMapper.cpp
  (EnumMapper::mapOperation): Map none value. 
* subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
  (Operation): Insert none value.
* subversion/svn/util.c
  (svn_cl__operation_str_xml, 
   svn_cl__operation_str_human_readable): Map none value.
* subversion/include/svn_wc.h
  (svn_wc_operation_t): Add none (=0) value.
* subversion/libsvn_wc/tree_conflicts.c
  (operation_map): Map none value for skeleton mapping.

------------------------------------------------------------------------
r35545 | julianfoad | 2009-01-29 13:23:19 +0100 (Thu, 29 Jan 2009) | 7 lines
Changed paths:
   M /trunk/www/commercial-support.html

* www/commercial-support.html
  Add an entry for "HOOD Group".

Patch by: Andreas Kreß <andreas.kress{_AT_}HOOD-Group.com>
(tweaked by me)


------------------------------------------------------------------------
r35546 | rhuijben | 2009-01-29 13:38:30 +0100 (Thu, 29 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_conflict_kind_t): Use doxygen comment style and mark 
    svn_wc_conflict_kind_tree New in 1.6.

------------------------------------------------------------------------
r35547 | cmpilato | 2009-01-29 15:28:15 +0100 (Thu, 29 Jan 2009) | 17 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/include/svn_dav.h
   M /branches/http-protocol-v2/subversion/mod_dav_svn/version.c

On the http-protocol-v2 branch: Transmit the youngest revision and
(now) repository UUID with every OPTIONS request aimed at a repository
resource.  While here, tweak the name of the header used for the root
URI, too.

* subversion/include/svn_dav.h
  (SVN_DAV_ROOT_URI_HEADER): Don't be lazy -- spell out Repository in
    the header.
  (SVN_DAV_REPOS_UUID_HEADER): New.

* subversion/mod_dav_svn/version.c
  (get_option): Sent the youngest revision header regardless of the
    protocol level, and also send the new SVN-Repository-UUID header.

* BRANCH-README
  Mark the UUID task as finished.

------------------------------------------------------------------------
r35548 | cmpilato | 2009-01-29 15:28:59 +0100 (Thu, 29 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Be a little more clear about possible Neon improvements.
------------------------------------------------------------------------
r35549 | cmpilato | 2009-01-29 15:55:00 +0100 (Thu, 29 Jan 2009) | 11 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/options.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/serf.c

On the http-protocol-v2 branch: Cache the UUID from the OPTIONS response.

* subversion/libsvn_ra_serf/options.c
  (capabilities_headers_iterator_callback): If the OPTIONS response
    contains the repository UUID, cache it.

* subversion/libsvn_ra_serf/serf.c
  (svn_ra_serf__get_uuid): Assert that if we find ourselves having to
    look up a repository UUID, it's because the server isn't advertising
    HTTP v2 support.

------------------------------------------------------------------------
r35550 | hwright | 2009-01-29 18:17:02 +0100 (Thu, 29 Jan 2009) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite.c

Followup to r35535: Why return one error, when we can return *two*!
Return errors from both svn_sqlite__reset() and sqlite3_step() if
stepping of a statement goes awry.

Suggested by: rhuijben

* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__step): Compose a new error of the two errors relating to
    stepping and resetting of the statement.

------------------------------------------------------------------------
r35551 | hwright | 2009-01-29 19:05:36 +0100 (Thu, 29 Jan 2009) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c

Remove yet another redundant argument in libsvn_wc.

* subversion/libsvn_wc/entries.c
  (entries_accumulator): Remove member.
  (handle_start_tag): Simplify logic assuming show_hidden is always TRUE.
  (parse_entries_xml): Remove argument, don't persist in baton.
  (read_entries): Remove argument SHOW_HIDDEN, and simplify logic within the
    function.
  (svn_wc_entries_read): Remove extra parameter from the only call site.

------------------------------------------------------------------------
r35552 | hwright | 2009-01-29 19:43:48 +0100 (Thu, 29 Jan 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/TODO-1.6
   M /branches/explore-wc/autogen.sh
   M /branches/explore-wc/build/transform_sql.py
   M /branches/explore-wc/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/explore-wc/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /branches/explore-wc/subversion/include/svn_wc.h
   M /branches/explore-wc/subversion/libsvn_client/prop_commands.c
   M /branches/explore-wc/subversion/libsvn_subr/sqlite.c
   M /branches/explore-wc/subversion/libsvn_wc/entries.c
   M /branches/explore-wc/subversion/libsvn_wc/tree_conflicts.c
   M /branches/explore-wc/subversion/svn/util.c
   M /branches/explore-wc/subversion/tests/cmdline/autoprop_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/svntest/tree.py
   M /branches/explore-wc/www/commercial-support.html

On the explore-wc branch:
Bring up-to-date with trunk, resolving conflicts in libsvn_wc/entries.c.

------------------------------------------------------------------------
r35553 | hwright | 2009-01-29 20:02:42 +0100 (Thu, 29 Jan 2009) | 7 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Trade one TODO for another.

* subversion/libsvn_wc/entries.c
  (svn_wc__entries_write): Properly return errors, and explain why we're doing
    things like we are.

------------------------------------------------------------------------
r35554 | cmpilato | 2009-01-29 20:52:02 +0100 (Thu, 29 Jan 2009) | 26 lines
Changed paths:
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/copy.c
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/svn/copy-cmd.c
   M /trunk/subversion/svn/main.c

Finish issue #3365 - Support --ignore-externals option for "svn copy".

* subversion/include/svn_client.h
  (svn_client_copy5): New function.
  (svn_client_copy4): Deprecate, and rework docstring to describe
    delta against previous version.

* subversion/libsvn_client/deprecated.c
  (svn_client_copy4): Move here, and now just wrap svn_client_copy5().
  (svn_client_copy3): Update this to be a wrapper around svn_client_copy5().

* subversion/libsvn_client/copy.c
  (repos_to_wc_copy_single): Add 'ignore_externals' parameter, passed
    to svn_client__checkout_internal().
  (repos_to_wc_copy): Add 'ignore_externals' parameter, passed to
    repos_to_wc_copy_single().
  (try_copy): Add 'ignore_externals' parameter, passed to repos_to_wc_copy().
  (svn_client_copy5): New.  Like svn_client_copy4, but accepts
    'ignore_externals' parameter, which is passed to try_copy().

* subversion/svn/main.c
  (svn_cl__cmd_table): Add support for --ignore-externals to "copy".

* subversion/svn/copy-cmd.c
  (svn_cl__copy): Now call svn_client_copy5() instead of svn_client_copy4().

------------------------------------------------------------------------
r35555 | cmpilato | 2009-01-29 21:08:04 +0100 (Thu, 29 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_client/deprecated.c

Revert a change made in r35554, not so much because it was wrong, but
because it doesn't follow our typical patterns.

* subversion/libsvn_client/deprecated.c
  (svn_client_copy3): Return this to wrapping svn_client_copy4()
    instead of svn_client_copy5().

Suggested by: hwright

------------------------------------------------------------------------
r35556 | hwright | 2009-01-29 21:28:03 +0100 (Thu, 29 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_client/update.c

Avoid the possible dereference of a NULL pointer.

* subversion/libsvn_client/update.c
  (svn_client__update_internal): When fetch the entry, use an API which
    guarantees a non-NULL entry will be returned.

------------------------------------------------------------------------
r35557 | rhuijben | 2009-01-29 22:27:56 +0100 (Thu, 29 Jan 2009) | 13 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/client.h
   M /trunk/subversion/libsvn_client/delete.c
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/externals.c
   M /trunk/subversion/libsvn_client/status.c
   M /trunk/subversion/svn/status-cmd.c

Revert r35512,r35514-r35515,r35518: the introduction of 
svn_client_status_args_t.

* subversion/bindings/javahl/native/SVNClient.cpp
* subversion/svn/status-cmd.c
* subversion/include/svn_client.h
* subversion/libsvn_client/deprecated.c
* subversion/libsvn_client/delete.c
* subversion/libsvn_client/externals.c
* subversion/libsvn_client/client.h
* subversion/libsvn_client/status.c
  Reverted changes of r35512,r35514-r35515,r35518.

------------------------------------------------------------------------
r35558 | cmpilato | 2009-01-29 22:37:14 +0100 (Thu, 29 Jan 2009) | 21 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/blame.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/get_deleted_rev.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/getlocations.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/getlocationsegments.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/log.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/property.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: Allow svn_ra_serf__get_baseline_info()
callers to specify which connection they wish to use.  This change is
in preparation for at least one future change that's less ... boring.

* subversion/libsvn_ra_serf/ra_serf.h,
* subversion/libsvn_ra_serf/property.c
  (svn_ra_serf__get_baseline_info): Add 'conn' parameter, allowing
    callers to dictate which connection to use (if they care).  All
    existing callers updated to pass NULL.

* subversion/libsvn_ra_serf/blame.c,
* subversion/libsvn_ra_serf/get_deleted_rev.c,
* subversion/libsvn_ra_serf/getlocations.c,
* subversion/libsvn_ra_serf/getlocationsegments.c,
* subversion/libsvn_ra_serf/log.c,
* subversion/libsvn_ra_serf/mergeinfo.c,
* subversion/libsvn_ra_serf/property.c,
* subversion/libsvn_ra_serf/serf.c
  Callers of svn_ra_serf__get_baseline_info() updated to pass NULL for
  the new 'conn' parameter.

------------------------------------------------------------------------
r35559 | cmpilato | 2009-01-29 22:38:53 +0100 (Thu, 29 Jan 2009) | 11 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/update.c

On the 'http-protocol-v2' branch, teach svn_ra_serf__get_file() to use
the new HTTP v2 protocol stuffs.

* subversion/libsvn_ra_serf/update.c
  (svn_ra_serf__get_file): Lose some redundant code by calling
    svn_ra_serf__get_baseline_info() with a specific connection.  This
    also brings the benefit of using the new HTTP v2 stuffs when available.

* BRANCH-README
  Mark related task completed.

------------------------------------------------------------------------
r35560 | rhuijben | 2009-01-29 22:57:30 +0100 (Thu, 29 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp
   M /trunk/subversion/include/svn_client.h
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/log.c
   M /trunk/subversion/libsvn_client/mergeinfo.c
   M /trunk/subversion/svn/log-cmd.c

Revert r35242,r35245: The introduction of svn_client_log_args_t.

* subversion/bindings/javahl/native/SVNClient.cpp
* subversion/svn/log-cmd.c
* subversion/include/svn_client.h
* subversion/libsvn_client/deprecated.c
* subversion/libsvn_client/mergeinfo.c
* subversion/libsvn_client/log.c
  Revert changes of r35242,r35245.
------------------------------------------------------------------------
r35561 | rhuijben | 2009-01-29 23:22:30 +0100 (Thu, 29 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/cmdline.c
   M /trunk/subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/cmdline.c
  (svn_cmdline_setup_auth_baton): Move deprecated function to ...
* subversion/libsvn_subr/deprecated.c
  (svn_cmdline_setup_auth_baton): ... deprecated.c

------------------------------------------------------------------------
r35562 | rhuijben | 2009-01-29 23:30:43 +0100 (Thu, 29 Jan 2009) | 8 lines
Changed paths:
   M /trunk/tools/client-side/svnmucc/svnmucc.c

Update usage of deprecated apis in svnmucc.

* tools/client-side/svnmucc/svnmucc.c
  (open_tmp_file): Remove unused variable introduced in r35511.
  (ra_callbacks): Renamed to ...
  (create_ra_callbacks): ... this and create svn_ra_callbacks2_t.
  (execute): Use create_ra_callbacks and svn_ra_open3.

------------------------------------------------------------------------
r35563 | rhuijben | 2009-01-29 23:34:05 +0100 (Thu, 29 Jan 2009) | 4 lines
Changed paths:
   M /trunk/tools/client-side/svnmucc/svnmucc.c

* tools/client-side/svnmucc/svnmucc.c
  (create_ra_callbacks): Following up on r35562, don't set unused
    callbacks.

------------------------------------------------------------------------
r35564 | hwright | 2009-01-29 23:36:40 +0100 (Thu, 29 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_subr/sqlite.c

Add a new sqlite API to determine whether or not a returned column is NULL.

* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__column_is_null): New.

* subversion/include/private/svn_sqlite.h
  (svn_sqlite__column_is_null): New.

------------------------------------------------------------------------
r35565 | hwright | 2009-01-29 23:43:41 +0100 (Thu, 29 Jan 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/explore-wc/subversion/include/private/svn_sqlite.h
   M /branches/explore-wc/subversion/include/svn_client.h
   M /branches/explore-wc/subversion/libsvn_client/client.h
   M /branches/explore-wc/subversion/libsvn_client/copy.c
   M /branches/explore-wc/subversion/libsvn_client/delete.c
   M /branches/explore-wc/subversion/libsvn_client/deprecated.c
   M /branches/explore-wc/subversion/libsvn_client/externals.c
   M /branches/explore-wc/subversion/libsvn_client/log.c
   M /branches/explore-wc/subversion/libsvn_client/mergeinfo.c
   M /branches/explore-wc/subversion/libsvn_client/status.c
   M /branches/explore-wc/subversion/libsvn_client/update.c
   M /branches/explore-wc/subversion/libsvn_subr/cmdline.c
   M /branches/explore-wc/subversion/libsvn_subr/deprecated.c
   M /branches/explore-wc/subversion/libsvn_subr/sqlite.c
   M /branches/explore-wc/subversion/svn/copy-cmd.c
   M /branches/explore-wc/subversion/svn/log-cmd.c
   M /branches/explore-wc/subversion/svn/main.c
   M /branches/explore-wc/subversion/svn/status-cmd.c
   M /branches/explore-wc/tools/client-side/svnmucc/svnmucc.c

On the explore-wc branch:
Bring up to date with trunk (to get the new sqlite API)

------------------------------------------------------------------------
r35566 | rhuijben | 2009-01-30 00:10:44 +0100 (Fri, 30 Jan 2009) | 13 lines
Changed paths:
   M /trunk/subversion/libsvn_client/log.c

Only create a second ra session to Subversion <1.5 servers when we actually
need more revision properties than the standard author, date, log properties.

Do this by delaying the opening of the second ra session until the session is
needed for the first time. (This decreases the time before the first result
by about 30% (Netherlands -> Collabnet))

* subversion/libsvn_client/log.c
  (pre_15_receiver_baton_t): Add ra_session_url and ra_session_pool fields.
  (pre_15_receiver): Open the secondary ra session if there is no available.
  (svn_client_log5): Initialize rb to empty and store information needed to
    open a secondary session instead of doing this directly.

------------------------------------------------------------------------
r35567 | rhuijben | 2009-01-30 00:16:40 +0100 (Fri, 30 Jan 2009) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove svn_client_status_args_t item.

------------------------------------------------------------------------
r35568 | rhuijben | 2009-01-30 00:22:24 +0100 (Fri, 30 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Nominate r35566.
------------------------------------------------------------------------
r35569 | hwright | 2009-01-30 00:38:03 +0100 (Fri, 30 Jan 2009) | 3 lines
Changed paths:
   M /trunk/build/run_tests.py

* build/run_tests.py:
  (TestHarness.run): Use the built-in enumerate() function.

------------------------------------------------------------------------
r35570 | arfrever | 2009-01-30 01:22:22 +0100 (Fri, 30 Jan 2009) | 5 lines
Changed paths:
   M /trunk/tools/dev/find-bad-style.py

Follow-up to r35464:

* tools/dev/find-bad-style.py
  (scan_file): Update calls to print().

------------------------------------------------------------------------
r35571 | hwright | 2009-01-30 01:30:12 +0100 (Fri, 30 Jan 2009) | 6 lines
Changed paths:
   M /trunk/build/run_tests.py

Output a quantitative summary of test failures after running the tests.

* build/run_tests.py
  (TestHarness.run): Output a summary of the number of tests that FAILed,
    XFAILed, and were SKIPped.

------------------------------------------------------------------------
r35572 | arfrever | 2009-01-30 02:28:32 +0100 (Fri, 30 Jan 2009) | 3 lines
Changed paths:
   M /trunk/build/run_tests.py

* build/run_tests.py
  (TestHarness.run): Separate FAILed and XPASSed tests in the summary.

------------------------------------------------------------------------
r35573 | hwright | 2009-01-30 03:14:58 +0100 (Fri, 30 Jan 2009) | 13 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Make sure we pass the repos_root parameter to write_entry(), and that it
gets written into the base_node table.

* subversion/libsvn_wc/entries.c
  (statement_keys, statements): Add a new statement and key.
  (write_entry): Add the repos_root parameter, and use it to selectively
    populate a base_node column.
  (svn_wc__entries_write): Attempt to fetch the repository root value, and
    pass it to write_entry().
  (svn_wc__entries_init): Pass the correct repos_root parameter to
    write_entry().

------------------------------------------------------------------------
r35574 | rhuijben | 2009-01-30 10:04:05 +0100 (Fri, 30 Jan 2009) | 1 line
Changed paths:
   A /branches/1.5.x-r35566 (from /branches/1.5.x:35573)
   M /branches/1.5.x-r35566/CHANGES
   M /branches/1.5.x-r35566/COMMITTERS
   M /branches/1.5.x-r35566/notes/tree-conflicts/scratch-pad.txt
   M /branches/1.5.x-r35566/subversion/bindings/swig
   M /branches/1.5.x-r35566/subversion/include/private
   M /branches/1.5.x-r35566/subversion/libsvn_client/log.c
   M /branches/1.5.x-r35566/subversion/libsvn_client/merge.c
   M /branches/1.5.x-r35566/subversion/libsvn_subr
   M /branches/1.5.x-r35566/subversion/libsvn_wc/adm_ops.c
   M /branches/1.5.x-r35566/subversion/tests/cmdline/svntest/actions.py
   M /branches/1.5.x-r35566/www/images/subversion-diagram.png
   M /branches/1.5.x-r35566/www/images/subversion_logo-200x173.png
   M /branches/1.5.x-r35566/www/images/subversion_logo-384x332.png
   M /branches/1.5.x-r35566/www/images/subversion_logo_hor-468x64.png

Create a 1.5.x backport branch for r35566
------------------------------------------------------------------------
r35575 | rhuijben | 2009-01-30 10:29:38 +0100 (Fri, 30 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Add reference to backport branch to r35566 group
------------------------------------------------------------------------
r35576 | rhuijben | 2009-01-30 10:41:26 +0100 (Fri, 30 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Remove mispaste introduced in r35575
------------------------------------------------------------------------
r35577 | rhuijben | 2009-01-30 10:55:04 +0100 (Fri, 30 Jan 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast vote on the r35250 group, approving.
------------------------------------------------------------------------
r35578 | stylesen | 2009-01-30 12:51:17 +0100 (Fri, 30 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c

Partially fix issue #3361.

* subversion/libsvn_client/merge.c
  (merge_cousins_and_supplement_mergeinfo, svn_client_merge3,
   svn_client_merge_peg3): Determine same repositories by comparing UUIDs
   of the repositories instead of doing a URL match.

Found by: Miles Crawford <mcrawfor@u.washington.edu>

------------------------------------------------------------------------
r35579 | pburba | 2009-01-30 15:11:21 +0100 (Fri, 30 Jan 2009) | 6 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c

Follow-up to r35578, make variable declarations C89 friendly (fix VS build).

* subversion/libsvn_client/merge.c
  (merge_cousins_and_supplement_mergeinfo): Move all declarations to start
  of block.

------------------------------------------------------------------------
r35580 | julianfoad | 2009-01-30 15:29:15 +0100 (Fri, 30 Jan 2009) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/util/fs_skels.c
   M /trunk/subversion/libsvn_subr/checksum.c
   M /trunk/subversion/libsvn_subr/stream.c
   M /trunk/subversion/tests/libsvn_fs/fs-test.c

Simplify some checksum code.

* subversion/libsvn_fs_base/util/fs_skels.c
  (svn_fs_base__unparse_representation_skel): Simplify, removing a redundant
    call to clear a checksum that is already clear.

* subversion/libsvn_subr/checksum.c
  (svn_checksum_dup): Grossly simplify, and remove a redundant allocation.

* subversion/libsvn_subr/stream.c
  (close_handler_md5): Simplify, avoiding casting away "const".

* subversion/tests/libsvn_fs/fs-test.c
  (get_file_checksum): Simplify, removing a redundant allocation.

------------------------------------------------------------------------
r35581 | julianfoad | 2009-01-30 15:38:33 +0100 (Fri, 30 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_fs/fs-test.c

* subversion/tests/libsvn_fs/fs-test.c
  (get_file_checksum): Correct the doc string.

------------------------------------------------------------------------
r35582 | julianfoad | 2009-01-30 16:07:42 +0100 (Fri, 30 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/include/svn_checksum.h

Tweak doc strings.

* subversion/include/svn_checksum.h
  (svn_checksum_create): Say how the result is initialized.
  (svn_checksum_match): Say "checksum" instead of "digest".
  (svn_checksum_parse_hex): Mention "hex" parameter and "all-zeros" behaviour.
  (svn_checksum_empty_checksum): Fix a typo.

------------------------------------------------------------------------
r35583 | hwright | 2009-01-30 16:43:37 +0100 (Fri, 30 Jan 2009) | 7 lines
Changed paths:
   M /trunk/tools/dev/graph-dav-servers.py
   M /trunk/www/images/svn-dav-securityspace-survey.png
   M /trunk/www/svn-dav-securityspace-survey.html

Update the dav server survey for Groundhog Day 2009.

* www/svn-dav-securityspace-survey.html,
  www/images/svn-dav-securityspace-survey.png,
  tools/dev/graph-dav-servers.py:
  Update image and table.

------------------------------------------------------------------------
r35584 | julianfoad | 2009-01-30 17:12:50 +0100 (Fri, 30 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/util/fs_skels.c

* subversion/libsvn_fs_base/util/fs_skels.c
  (prepend_checksum): Add a doc string.

------------------------------------------------------------------------
r35585 | gstein | 2009-01-30 17:32:08 +0100 (Fri, 30 Jan 2009) | 15 lines
Changed paths:
   M /trunk/tools/dev/graph-dav-servers.py

Make the Python code more sensible and the STATS easier to maintain.

Thanks to hwright for testing.

* tools/dev/graph-dav-servers.py:
  (): fix up imports. AVOID: from foo import *. that is Badness.
  (STATS): use a structured format rather than a bigass string that we'll
    just end having to parse.
  (get_date): just split the string rather than fancy date parsing.
  (get_ordinal_date): return an integer. func name does say "ordinal"
  (parse_stats): renamed to ...
  (load_stats): ... this. screw parsing. use normal Python types.
  (draw_graph): add module names onto symbols so we know where the hell
    they came from.

------------------------------------------------------------------------
r35586 | gstein | 2009-01-30 17:41:46 +0100 (Fri, 30 Jan 2009) | 31 lines
Changed paths:
   M /trunk/CHANGES
   M /trunk/subversion/libsvn_ra_serf/ra_serf.h
   M /trunk/subversion/libsvn_ra_serf/serf.c
   M /trunk/subversion/libsvn_ra_serf/util.c
   M /trunk/tools/dist/construct-rolling-environment.sh

Require serf 0.3.0 and clean out support for earlier versions.

* CHANGES: note requirement

* tools/dist/construct-rolling-environment.sh: update serf version

* subversion/libsvn_ra_serf/ra_serf.h:
  (): error if serf is not at least 0.3.0. remove version test for
    defining SVN_RA_SERF_SSPI_ENABLED.
  (svn_ra_erf__is_conn_closing): remove

* subversion/libsvn_ra_serf/serf.c:
  (load_config): remove version tests
  (svn_ra_serf__progress): remove version test. always define.
  (svn_ra_serf__open): always set progress callback.

* subversion/libsvn_ra_serf/util.c:
  (serf_failure_map): remove version test. always define.
  (ssl_server_cert): remove version tests on some code.
  (svn_ra_serf__conn_setup): always use the new context-based socket
    bucket creation. remove version tests around other code.
  (svn_ra_serf__conn_closed): strip it all out. nothing to do.
  (svn_ra_serf__setup_serf_req): strip out version tests.
  (svn_ra_esrf__is_conn_closing): remove.
  (svn_ra_werf__handle_server_error): use struct init rather than memset.
    remove some version-tested code.
  (handle_response): remove some version-tested code.
  (setup_request): remove some version tests.
  (svn_ra_serf__priority_request_create): always use the new priority
    request creation.

------------------------------------------------------------------------
r35587 | cmpilato | 2009-01-30 17:47:12 +0100 (Fri, 30 Jan 2009) | 7 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/property.c

On the 'http-protocol-v2' branch: Add some safety barriers to PROPFIND
logic.

* subversion/libsvn_ra_serf/property.c
  (svn_ra_serf__deliver_props): Add some assertion logic to prevent
    unexpected PROP_CTX reuse.

------------------------------------------------------------------------
r35588 | cmpilato | 2009-01-30 17:55:13 +0100 (Fri, 30 Jan 2009) | 10 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/serf.c

On the 'http-protocol-v2' branch:  Make the revision prop lookup logic
use the new HTTP v2 rev stub when available.

* subversion/libsvn_ra_serf/serf.c
  (svn_ra_serf__rev_proplist): If v2 is available, construct (and use)
    a rev-stub-based path for PROPFINDs.

* BRANCH-README
  Note some finished items.

------------------------------------------------------------------------
r35589 | cmpilato | 2009-01-30 18:07:40 +0100 (Fri, 30 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/CHANGES
   M /branches/http-protocol-v2/autogen.sh
   M /branches/http-protocol-v2/build/run_tests.py
   M /branches/http-protocol-v2/build/transform_sql.py
   M /branches/http-protocol-v2/contrib/client-side/svnmerge/svnmerge-migrate-history.py
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/http-protocol-v2/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /branches/http-protocol-v2/subversion/include/private/svn_skel.h
   M /branches/http-protocol-v2/subversion/include/private/svn_sqlite.h
   M /branches/http-protocol-v2/subversion/include/svn_checksum.h
   M /branches/http-protocol-v2/subversion/include/svn_client.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_client/client.h
   M /branches/http-protocol-v2/subversion/libsvn_client/copy.c
   M /branches/http-protocol-v2/subversion/libsvn_client/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_client/info.c
   M /branches/http-protocol-v2/subversion/libsvn_client/log.c
   M /branches/http-protocol-v2/subversion/libsvn_client/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_client/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_client/prop_commands.c
   M /branches/http-protocol-v2/subversion/libsvn_client/update.c
   M /branches/http-protocol-v2/subversion/libsvn_fs/fs-loader.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/dag.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/serf.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/util.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_svn/client.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/checksum.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/cmdline.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/skel.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/sqlite.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/stream.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_ops.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/entries.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/entries.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/lock.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/log.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/props.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/questions.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/questions.h
   M /branches/http-protocol-v2/subversion/libsvn_wc/tree_conflicts.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/update_editor.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc-metadata.sql
   M /branches/http-protocol-v2/subversion/libsvn_wc/wc_db.h
   M /branches/http-protocol-v2/subversion/svn/copy-cmd.c
   M /branches/http-protocol-v2/subversion/svn/info-cmd.c
   M /branches/http-protocol-v2/subversion/svn/log-cmd.c
   M /branches/http-protocol-v2/subversion/svn/main.c
   M /branches/http-protocol-v2/subversion/svn/util.c
   M /branches/http-protocol-v2/subversion/tests/cmdline/autoprop_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/main.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/tree.py
   M /branches/http-protocol-v2/subversion/tests/libsvn_fs/fs-test.c
   M /branches/http-protocol-v2/tools/client-side/svnmucc/svnmucc.c
   M /branches/http-protocol-v2/tools/dev/find-bad-style.py
   M /branches/http-protocol-v2/tools/dev/graph-dav-servers.py
   M /branches/http-protocol-v2/tools/dist/construct-rolling-environment.sh
   M /branches/http-protocol-v2/www/commercial-support.html
   M /branches/http-protocol-v2/www/images/svn-dav-securityspace-survey.png
   M /branches/http-protocol-v2/www/links.html
   M /branches/http-protocol-v2/www/svn-dav-securityspace-survey.html
   M /branches/http-protocol-v2/www/svn_1.6_releasenotes.html

Bring up to date with trunk. (Merged /trunk:r35494-35524,35526-35588).
------------------------------------------------------------------------
r35590 | julianfoad | 2009-01-30 18:11:29 +0100 (Fri, 30 Jan 2009) | 8 lines
Changed paths:
   M /trunk/subversion/include/svn_props.h
   M /trunk/subversion/include/svn_wc.h

Update some doc strings.

* subversion/include/svn_props.h
  (svn_prop_diffs): Describe the output array.

* subversion/include/svn_wc.h
  (svn_wc_diff_callbacks3_t): Note a possibly unexpected behaviour.

------------------------------------------------------------------------
r35591 | arfrever | 2009-01-30 18:32:43 +0100 (Fri, 30 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/include/private/svn_utf_private.h

* subversion/include/private/svn_utf_private.h
  (svn_utf__last_valid): Fix doc string.

------------------------------------------------------------------------
r35592 | julianfoad | 2009-01-30 18:43:12 +0100 (Fri, 30 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/include/svn_checksum.h
   M /trunk/subversion/libsvn_subr/checksum.c

Rename some checksum API arguments, giving (perhaps) a little more clarity and
consistency.

* subversion/include/svn_checksum.h,
  subversion/libsvn_subr/checksum.c
  (svn_checksum_match, svn_checksum_dup): Rename arguments.

------------------------------------------------------------------------
r35593 | hwright | 2009-01-30 19:31:29 +0100 (Fri, 30 Jan 2009) | 14 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c
   M /branches/explore-wc/subversion/libsvn_wc/wc.h

On the explore-wc branch:
Bump the working copy format.

* subversion/libsvn_wc/wc.h
  (SVN_WC__VERSION): Bump.
  (SVN_WC__WC_NG_VERSION): New.

* subversion/libsvn_wc/entries.c
  (WC_DB_SCHEMA_FORMAT): Remove.
  (upgrade_sql): Add the needed number of NULLs so the sql statemets fall
    in the correct location for the version number.
  (svn_wc__entries_write, svn_wc__entries_init): Use the library-wide
    version number when opening the sqlite database.

------------------------------------------------------------------------
r35594 | hwright | 2009-01-30 19:41:36 +0100 (Fri, 30 Jan 2009) | 11 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/old-and-busted.c

On the explore-wc branch:
Add some include files and a required function.

Interesting note:  Since we aren't actually calling anything in this file
yet (it's all defined as static), the compiler complained about an implicit
function definition, but ended up stripping out that code, so the linker
didn't complain.  Still, it's good to get rid of the warnings...

* subversion/libsvn_wc/old-and-busted.c
  (take_from_entry): Copied from entries.c.

------------------------------------------------------------------------
r35595 | julianfoad | 2009-01-30 19:59:43 +0100 (Fri, 30 Jan 2009) | 11 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/checksum.c
   M /trunk/subversion/libsvn_subr/svn_base64.c
   M /trunk/subversion/tests/libsvn_delta/window-test.c

Simplify slightly by using svn_checksum__from_digest().

* subversion/libsvn_subr/checksum.c
  (svn_checksum_empty_checksum): Simplify, thus avoiding casting away "const".

* subversion/libsvn_subr/svn_base64.c
  (svn_base64_from_md5): Simplify.

* subversion/tests/libsvn_delta/window-test.c
  (stream_window_test): Simplify.

------------------------------------------------------------------------
r35596 | cmpilato | 2009-01-30 20:44:37 +0100 (Fri, 30 Jan 2009) | 8 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/serf.c

On the 'http-protocol-v2' branch:  Followup tweaks to r35588.

* subversion/libsvn_ra_serf/serf.c
  (svn_ra_serf__rev_proplist): Lose trailing slash from rev-stubby
    URI, and explain why we reset 'rev' to SVN_INVALID_REVNUM.

Suggested by: gstein

------------------------------------------------------------------------
r35597 | arfrever | 2009-01-30 20:48:25 +0100 (Fri, 30 Jan 2009) | 6 lines
Changed paths:
   M /trunk/tools/dev/graph-dav-servers.py

Follow-up to r35585:

* tools/dev/graph-dav-servers.py
  (load_stats): Use list comprehension instead of map() for compatibility with
   Python 3.

------------------------------------------------------------------------
r35598 | arfrever | 2009-01-30 20:57:15 +0100 (Fri, 30 Jan 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_diff/diff_file.c

Follow-up to r35446:

* subversion/libsvn_diff/diff_file.c
  (output_unified_diff_modified): Check validity of the last potentially
   invalid character of output_baton->hunk_extra_context.

Suggested by: danielsh
              me

------------------------------------------------------------------------
r35599 | arfrever | 2009-01-30 21:29:55 +0100 (Fri, 30 Jan 2009) | 7 lines
Changed paths:
   M /trunk/build/generator/ezt.py
   M /trunk/build/generator/gen_make.py
   M /trunk/tools/dev/trails.py

Python 3 compatibility:
Don't use tuple arguments.

* build/generator/ezt.py:
* build/generator/gen_make.py:
* tools/dev/trails.py: Don't use tuple arguments.

------------------------------------------------------------------------
r35600 | arfrever | 2009-01-30 21:43:02 +0100 (Fri, 30 Jan 2009) | 8 lines
Changed paths:
   M /trunk/build/generator/gen_make.py
   M /trunk/build/generator/gen_msvc_dsp.py
   M /trunk/build/generator/gen_vcnet_vcproj.py
   M /trunk/build/generator/gen_win.py

Python 3 compatibility:
Don't use 'cmp' argument of sort() in 'build' directory.

* build/generator/gen_make.py:
* build/generator/gen_msvc_dsp.py:
* build/generator/gen_vcnet_vcproj.py:
* build/generator/gen_win.py: Don't use 'cmp' argument of sort().

------------------------------------------------------------------------
r35601 | arfrever | 2009-01-30 21:47:46 +0100 (Fri, 30 Jan 2009) | 24 lines
Changed paths:
   M /trunk/build/generator/gen_base.py
   M /trunk/build/generator/gen_make.py
   M /trunk/build/generator/gen_vcnet_vcproj.py
   M /trunk/build/win32/make_dist.py
   M /trunk/doc/tools/bin/find-xsl.py
   M /trunk/gen-make.py
   M /trunk/subversion/bindings/swig/python/tests/mergeinfo.py
   M /trunk/subversion/bindings/swig/python/tests/ra.py
   M /trunk/subversion/tests/cmdline/changelist_tests.py
   M /trunk/subversion/tests/cmdline/svnadmin_tests.py
   M /trunk/subversion/tests/cmdline/svnlook_tests.py
   M /trunk/subversion/tests/cmdline/svntest/actions.py
   M /trunk/subversion/tests/cmdline/svntest/tree.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/which-error.py
   M /trunk/tools/examples/svnshell.py
   M /trunk/tools/hook-scripts/mailer/mailer.py
   M /trunk/tools/po/l10n-report.py

Use sorted() to simplify some code.

* build/generator/gen_base.py:
* build/generator/gen_make.py:
* build/generator/gen_vcnet_vcproj.py:
* build/win32/make_dist.py:
* doc/tools/bin/find-xsl.py:
* gen-make.py:
* subversion/bindings/swig/python/tests/mergeinfo.py:
* subversion/bindings/swig/python/tests/ra.py:
* subversion/tests/cmdline/changelist_tests.py:
* subversion/tests/cmdline/svnadmin_tests.py:
* subversion/tests/cmdline/svnlook_tests.py:
* subversion/tests/cmdline/svntest/actions.py:
* subversion/tests/cmdline/svntest/tree.py:
* tools/bdb/svn-bdb-view.py:
* tools/dev/contribulyze.py:
* tools/dev/gen-javahl-errors.py:
* tools/dev/normalize-dump.py:
* tools/dev/which-error.py:
* tools/examples/svnshell.py:
* tools/hook-scripts/mailer/mailer.py:
* tools/po/l10n-report.py: Use sorted() to simplify some code.

------------------------------------------------------------------------
r35602 | arfrever | 2009-01-30 22:42:59 +0100 (Fri, 30 Jan 2009) | 3 lines
Changed paths:
   M /branches/python-3-compatibility
   M /branches/python-3-compatibility/CHANGES
   M /branches/python-3-compatibility/autogen.sh
   M /branches/python-3-compatibility/build/generator/ezt.py
   M /branches/python-3-compatibility/build/generator/gen_base.py
   M /branches/python-3-compatibility/build/generator/gen_make.py
   M /branches/python-3-compatibility/build/generator/gen_msvc_dsp.py
   M /branches/python-3-compatibility/build/generator/gen_vcnet_vcproj.py
   M /branches/python-3-compatibility/build/generator/gen_win.py
   M /branches/python-3-compatibility/build/generator/util/executable.py
   M /branches/python-3-compatibility/build/run_tests.py
   M /branches/python-3-compatibility/build/transform_sql.py
   M /branches/python-3-compatibility/build/win32/make_dist.py
   M /branches/python-3-compatibility/contrib/client-side/svnmerge/svnmerge-migrate-history.py
   M /branches/python-3-compatibility/doc/tools/bin/find-xsl.py
   M /branches/python-3-compatibility/gen-make.py
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/ConflictResolverCallback.h
   A /branches/python-3-compatibility/subversion/bindings/javahl/native/CreateJ.cpp (from /trunk/subversion/bindings/javahl/native/CreateJ.cpp:35601)
   A /branches/python-3-compatibility/subversion/bindings/javahl/native/CreateJ.h (from /trunk/subversion/bindings/javahl/native/CreateJ.h:35601)
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/InfoCallback.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/ListCallback.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/SVNAdmin.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/SVNClient.h
   M /branches/python-3-compatibility/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
   A /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java:35601)
   M /branches/python-3-compatibility/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /branches/python-3-compatibility/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/python-3-compatibility/subversion/bindings/swig/python/svn/fs.py
   M /branches/python-3-compatibility/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/python-3-compatibility/subversion/bindings/swig/python/tests/ra.py
   M /branches/python-3-compatibility/subversion/include/private/svn_skel.h
   M /branches/python-3-compatibility/subversion/include/private/svn_sqlite.h
   M /branches/python-3-compatibility/subversion/include/private/svn_utf_private.h
   M /branches/python-3-compatibility/subversion/include/svn_checksum.h
   M /branches/python-3-compatibility/subversion/include/svn_client.h
   M /branches/python-3-compatibility/subversion/include/svn_dirent_uri.h
   M /branches/python-3-compatibility/subversion/include/svn_mergeinfo.h
   M /branches/python-3-compatibility/subversion/include/svn_path.h
   M /branches/python-3-compatibility/subversion/include/svn_props.h
   M /branches/python-3-compatibility/subversion/include/svn_subst.h
   M /branches/python-3-compatibility/subversion/include/svn_wc.h
   M /branches/python-3-compatibility/subversion/libsvn_client/client.h
   M /branches/python-3-compatibility/subversion/libsvn_client/commit.c
   M /branches/python-3-compatibility/subversion/libsvn_client/copy.c
   M /branches/python-3-compatibility/subversion/libsvn_client/deprecated.c
   M /branches/python-3-compatibility/subversion/libsvn_client/export.c
   M /branches/python-3-compatibility/subversion/libsvn_client/info.c
   M /branches/python-3-compatibility/subversion/libsvn_client/log.c
   M /branches/python-3-compatibility/subversion/libsvn_client/merge.c
   M /branches/python-3-compatibility/subversion/libsvn_client/mergeinfo.c
   M /branches/python-3-compatibility/subversion/libsvn_client/prop_commands.c
   M /branches/python-3-compatibility/subversion/libsvn_client/update.c
   M /branches/python-3-compatibility/subversion/libsvn_diff/diff_file.c
   M /branches/python-3-compatibility/subversion/libsvn_fs/fs-loader.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/dag.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/python-3-compatibility/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/python-3-compatibility/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/python-3-compatibility/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/python-3-compatibility/subversion/libsvn_ra_serf/serf.c
   M /branches/python-3-compatibility/subversion/libsvn_ra_serf/util.c
   M /branches/python-3-compatibility/subversion/libsvn_ra_svn/client.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/checksum.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/cmdline.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/config_impl.h
   M /branches/python-3-compatibility/subversion/libsvn_subr/deprecated.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/mergeinfo.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/skel.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/sqlite.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/stream.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/subst.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/svn_base64.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/utf.c
   D /branches/python-3-compatibility/subversion/libsvn_subr/utf_impl.h
   M /branches/python-3-compatibility/subversion/libsvn_subr/utf_validate.c
   M /branches/python-3-compatibility/subversion/libsvn_subr/xml.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/adm_ops.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/copy.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/entries.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/entries.h
   M /branches/python-3-compatibility/subversion/libsvn_wc/lock.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/log.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/log.h
   M /branches/python-3-compatibility/subversion/libsvn_wc/merge.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/props.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/questions.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/questions.h
   M /branches/python-3-compatibility/subversion/libsvn_wc/translate.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/tree_conflicts.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/update_editor.c
   M /branches/python-3-compatibility/subversion/libsvn_wc/wc-metadata.sql
   M /branches/python-3-compatibility/subversion/libsvn_wc/wc_db.h
   M /branches/python-3-compatibility/subversion/svn/copy-cmd.c
   M /branches/python-3-compatibility/subversion/svn/info-cmd.c
   M /branches/python-3-compatibility/subversion/svn/log-cmd.c
   M /branches/python-3-compatibility/subversion/svn/main.c
   M /branches/python-3-compatibility/subversion/svn/util.c
   M /branches/python-3-compatibility/subversion/tests/cmdline/autoprop_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/changelist_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/prop_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/stat_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svnlook_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/actions.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/main.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/tree.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/verify.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/trans_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/update_tests.py
   M /branches/python-3-compatibility/subversion/tests/libsvn_delta/window-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_fs/fs-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/python-3-compatibility/subversion/tests/libsvn_subr/utf-test.c
   M /branches/python-3-compatibility/tools/backup/hot-backup.py.in
   M /branches/python-3-compatibility/tools/bdb/svn-bdb-view.py
   M /branches/python-3-compatibility/tools/client-side/svnmucc/svnmucc.c
   M /branches/python-3-compatibility/tools/dev/contribulyze.py
   A /branches/python-3-compatibility/tools/dev/find-bad-style.py (from /trunk/tools/dev/find-bad-style.py:35601)
   M /branches/python-3-compatibility/tools/dev/gen-javahl-errors.py
   M /branches/python-3-compatibility/tools/dev/graph-dav-servers.py
   A /branches/python-3-compatibility/tools/dev/min-includes.sh (from /trunk/tools/dev/min-includes.sh:35601)
   M /branches/python-3-compatibility/tools/dev/normalize-dump.py
   M /branches/python-3-compatibility/tools/dev/trails.py
   M /branches/python-3-compatibility/tools/dev/which-error.py
   M /branches/python-3-compatibility/tools/dist/construct-rolling-environment.sh
   M /branches/python-3-compatibility/tools/examples/svnshell.py
   M /branches/python-3-compatibility/tools/hook-scripts/mailer/mailer.py
   M /branches/python-3-compatibility/tools/hook-scripts/verify-po.py
   M /branches/python-3-compatibility/tools/po/l10n-report.py
   M /branches/python-3-compatibility/tools/server-side/svn-backup-dumps.py
   M /branches/python-3-compatibility/www/commercial-support.html
   M /branches/python-3-compatibility/www/images/svn-dav-securityspace-survey.png
   M /branches/python-3-compatibility/www/links.html
   M /branches/python-3-compatibility/www/svn-dav-securityspace-survey.html
   M /branches/python-3-compatibility/www/svn_1.6_releasenotes.html

On the 'python-3-compatibility' branch:
Merge r35451:35601 from trunk.

------------------------------------------------------------------------
r35603 | cmpilato | 2009-01-30 22:55:03 +0100 (Fri, 30 Jan 2009) | 13 lines
Changed paths:
   M /trunk/subversion/libsvn_ra/ra_loader.c

Make the RA loader sanity-check the revisions passed through the revprop-
related interfaces so the various implementations don't have to.

Note: The underlying RA layers basically require valid revisions
anyway -- if not by explicitly checking themselves, then at least by
falling on their faces when handed something invalid.  And the API
never explicitly permitted invalid revisions.  So, I'm not feeling too
bad about backwards compatibility here.

* subversion/libsvn_ra/ra_loader.c
  (svn_ra_change_rev_prop, svn_ra_rev_proplist, svn_ra_rev_prop):
    Assert that we were given a valid revision.

------------------------------------------------------------------------
r35604 | arfrever | 2009-01-30 23:17:44 +0100 (Fri, 30 Jan 2009) | 7 lines
Changed paths:
   M /trunk/tools/dev/graph-dav-servers.py

Follow-up to r35597:

* tools/dev/graph-dav-servers.py
  (load_stats): Simplify list comprehension.

Suggested by: gstein

------------------------------------------------------------------------
r35605 | sussman | 2009-01-30 23:51:09 +0100 (Fri, 30 Jan 2009) | 15 lines
Changed paths:
   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/repos.c

Begin teaching mod_dav_svn code to accept POST on 'me' resource.

* subversion/mod_dav_svn/dav_svn.h
  (dav_svn__method_post):  declare new POST handler.
  (enum dav_svn_private_restype):  two new enums for txn stubs.

* subversion/mod_dav_svn/mod_dav_svn.c 
  (register_hooks):  hook in a new generic request handler.
  (dav_svn__handler):  our new generic request handler.

* subversion/mod_dav_svn/repos.c 
  (dav_svn__method_post):  beginning of POST handler.



------------------------------------------------------------------------
r35606 | arfrever | 2009-01-31 00:31:48 +0100 (Sat, 31 Jan 2009) | 4 lines
Changed paths:
   M /trunk/subversion/po/pl.po

Polish translation update.

* subversion/po/pl.po: Polish translation update.

------------------------------------------------------------------------
r35607 | cmpilato | 2009-01-31 00:33:37 +0100 (Sat, 31 Jan 2009) | 17 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_neon/options.c
   M /trunk/subversion/libsvn_ra_neon/ra_neon.h
   M /trunk/subversion/libsvn_ra_neon/session.c

Move all the libsvn_ra_neon OPTIONS-related stuff to the same source file.

* subversion/libsvn_ra_neon/ra_neon.h
  (svn_ra_neon__exchange_capabilities): New prototype.

* subversion/libsvn_ra_neon/session.c
  (capability_yes, capability_no, capability_server_yes,
   parse_capabilities, svn_ra_neon__has_capability): Moved to options.c.
  (exchange_capabilities): Renamed to svn_ra_neon__exchange_capabilities(),
    and moved to options.c.  Callers updated.
  (svn_ra_neon__open): Track rename of exchange_capabilities().

* subversion/libsvn_ra_neon/options.c
  (capability_yes, capability_no, capability_server_yes,
   parse_capabilities, svn_ra_neon__has_capability): Moved from session.c.
  (svn_ra_neon__exchange_capabilities): Was session.c:exchange_capabilities().

------------------------------------------------------------------------
r35608 | arfrever | 2009-01-31 01:00:04 +0100 (Sat, 31 Jan 2009) | 14 lines
Changed paths:
   M /branches/python-3-compatibility/subversion/tests/cmdline/basic_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/import_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/prop_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/schedule_tests.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/actions.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/svntest/main.py
   M /branches/python-3-compatibility/subversion/tests/cmdline/update_tests.py
   M /branches/python-3-compatibility/tools/backup/hot-backup.py.in
   M /branches/python-3-compatibility/tools/client-side/change-svn-wc-format.py

On the 'python-3-compatibility' branch:
Python 3 compatibility:
Update syntax of octal numbers.

* subversion/tests/cmdline/basic_tests.py:
* subversion/tests/cmdline/import_tests.py:
* subversion/tests/cmdline/prop_tests.py:
* subversion/tests/cmdline/schedule_tests.py:
* subversion/tests/cmdline/svntest/actions.py:
* subversion/tests/cmdline/svntest/main.py:
* subversion/tests/cmdline/update_tests.py:
* tools/backup/hot-backup.py.in:
* tools/client-side/change-svn-wc-format.py: Update syntax of octal numbers.

------------------------------------------------------------------------
r35609 | arfrever | 2009-01-31 01:31:36 +0100 (Sat, 31 Jan 2009) | 3 lines
Changed paths:
   M /branches/svnpatch-diff
   M /branches/svnpatch-diff/CHANGES
   M /branches/svnpatch-diff/autogen.sh
   M /branches/svnpatch-diff/build/generator/ezt.py
   M /branches/svnpatch-diff/build/generator/gen_base.py
   M /branches/svnpatch-diff/build/generator/gen_make.py
   M /branches/svnpatch-diff/build/generator/gen_msvc_dsp.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/run_tests.py
   M /branches/svnpatch-diff/build/transform_sql.py
   M /branches/svnpatch-diff/build/win32/make_dist.py
   M /branches/svnpatch-diff/contrib/client-side/svnmerge/svnmerge-migrate-history.py
   M /branches/svnpatch-diff/doc/tools/bin/find-xsl.py
   M /branches/svnpatch-diff/gen-make.py
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/ConflictResolverCallback.h
   A /branches/svnpatch-diff/subversion/bindings/javahl/native/CreateJ.cpp (from /trunk/subversion/bindings/javahl/native/CreateJ.cpp:35607)
   A /branches/svnpatch-diff/subversion/bindings/javahl/native/CreateJ.h (from /trunk/subversion/bindings/javahl/native/CreateJ.h:35607)
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/InfoCallback.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/ListCallback.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/SVNAdmin.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/SVNClient.h
   M /branches/svnpatch-diff/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/svnpatch-diff/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
   A /branches/svnpatch-diff/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java:35607)
   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/python/tests/mergeinfo.py
   M /branches/svnpatch-diff/subversion/bindings/swig/python/tests/ra.py
   M /branches/svnpatch-diff/subversion/include/private/svn_skel.h
   M /branches/svnpatch-diff/subversion/include/private/svn_sqlite.h
   M /branches/svnpatch-diff/subversion/include/private/svn_utf_private.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_dirent_uri.h
   M /branches/svnpatch-diff/subversion/include/svn_mergeinfo.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_subst.h
   M /branches/svnpatch-diff/subversion/include/svn_wc.h
   M /branches/svnpatch-diff/subversion/libsvn_client/client.h
   M /branches/svnpatch-diff/subversion/libsvn_client/commit.c
   M /branches/svnpatch-diff/subversion/libsvn_client/copy.c
   M /branches/svnpatch-diff/subversion/libsvn_client/deprecated.c
   M /branches/svnpatch-diff/subversion/libsvn_client/export.c
   M /branches/svnpatch-diff/subversion/libsvn_client/info.c
   M /branches/svnpatch-diff/subversion/libsvn_client/log.c
   M /branches/svnpatch-diff/subversion/libsvn_client/merge.c
   M /branches/svnpatch-diff/subversion/libsvn_client/mergeinfo.c
   M /branches/svnpatch-diff/subversion/libsvn_client/prop_commands.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_base/dag.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/svnpatch-diff/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/svnpatch-diff/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/svnpatch-diff/subversion/libsvn_ra/ra_loader.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_neon/options.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_serf/ra_serf.h
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/serf.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_serf/util.c
   M /branches/svnpatch-diff/subversion/libsvn_ra_svn/client.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_impl.h
   M /branches/svnpatch-diff/subversion/libsvn_subr/deprecated.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/mergeinfo.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/skel.c
   M /branches/svnpatch-diff/subversion/libsvn_subr/sqlite.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/svn_base64.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/copy.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/entries.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/entries.h
   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/questions.h
   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/update_editor.c
   M /branches/svnpatch-diff/subversion/libsvn_wc/wc-metadata.sql
   M /branches/svnpatch-diff/subversion/libsvn_wc/wc_db.h
   M /branches/svnpatch-diff/subversion/po/pl.po
   M /branches/svnpatch-diff/subversion/svn/copy-cmd.c
   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/util.c
   M /branches/svnpatch-diff/subversion/tests/cmdline/autoprop_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/changelist_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/prop_tests.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svnadmin_tests.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/main.py
   M /branches/svnpatch-diff/subversion/tests/cmdline/svntest/tree.py
   M /branches/svnpatch-diff/subversion/tests/libsvn_delta/window-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_fs/fs-test.c
   M /branches/svnpatch-diff/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/svnpatch-diff/tools/bdb/svn-bdb-view.py
   M /branches/svnpatch-diff/tools/client-side/svnmucc/svnmucc.c
   M /branches/svnpatch-diff/tools/dev/contribulyze.py
   A /branches/svnpatch-diff/tools/dev/find-bad-style.py (from /trunk/tools/dev/find-bad-style.py:35607)
   M /branches/svnpatch-diff/tools/dev/gen-javahl-errors.py
   M /branches/svnpatch-diff/tools/dev/graph-dav-servers.py
   A /branches/svnpatch-diff/tools/dev/min-includes.sh (from /trunk/tools/dev/min-includes.sh:35607)
   M /branches/svnpatch-diff/tools/dev/normalize-dump.py
   M /branches/svnpatch-diff/tools/dev/trails.py
   M /branches/svnpatch-diff/tools/dev/which-error.py
   M /branches/svnpatch-diff/tools/dist/construct-rolling-environment.sh
   M /branches/svnpatch-diff/tools/examples/svnshell.py
   M /branches/svnpatch-diff/tools/hook-scripts/mailer/mailer.py
   M /branches/svnpatch-diff/tools/po/l10n-report.py
   M /branches/svnpatch-diff/www/commercial-support.html
   M /branches/svnpatch-diff/www/images/svn-dav-securityspace-survey.png
   M /branches/svnpatch-diff/www/links.html
   M /branches/svnpatch-diff/www/svn-dav-securityspace-survey.html
   M /branches/svnpatch-diff/www/svn_1.6_releasenotes.html

On the 'svnpatch-diff' branch:
Merge r35462:35608 from trunk.

------------------------------------------------------------------------
r35610 | rhuijben | 2009-01-31 02:15:12 +0100 (Sat, 31 Jan 2009) | 10 lines
Changed paths:
   M /trunk/subversion/svn/log-cmd.c
   M /trunk/subversion/svn/schema/log.rnc

Add nodekind attribute to the xml output of log paths.

The attribute name is "kind" to match the name used by svn info.

* svn/log-cmd.c
  (log_entry_receiver_xml): Add kind attribute with nodekind.
  (svn_cl__log): Replace tabs with spaces.
* svn/schema/log.rnc
  (path): Define kind attribute.

------------------------------------------------------------------------
r35611 | rhuijben | 2009-01-31 02:21:09 +0100 (Sat, 31 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/svn/log-cmd.c

* subversion/svn/log-cmd.c
  (svn_cl__log): Repair the indenting I broke in r35610.

------------------------------------------------------------------------
r35612 | arfrever | 2009-01-31 03:36:05 +0100 (Sat, 31 Jan 2009) | 17 lines
Changed paths:
   M /trunk/build/generator/gen_vcnet_vcproj.py
   M /trunk/subversion/bindings/ctypes-python/README
   M /trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /trunk/subversion/tests/cmdline/info_tests.py
   M /trunk/tools/client-side/server-version.py
   M /trunk/tools/hook-scripts/mailer/mailer.py

* build/generator/gen_vcnet_vcproj.py
  (Generator.makeguid): Delete code used only by Python 1.*.

* subversion/bindings/ctypes-python/README
  (BUILDING CSVN): Update.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
  (): Don't define Py_RETURN_NONE.

* subversion/tests/cmdline/info_tests.py
  (match_xml_element): Directly compare dictionaries.
  (same_dict): Delete.

* tools/client-side/server-version.py: Delete probably outdated comment.

* tools/hook-scripts/mailer/mailer.py: Delete code used only by Python <2.3.

------------------------------------------------------------------------
r35613 | gstein | 2009-01-31 03:54:03 +0100 (Sat, 31 Jan 2009) | 5 lines
Changed paths:
   M /trunk/subversion/svn/log-cmd.c

Noticed in a prior commit's context. This fits on one line. Make it so.

* subversion/svn/log-cmd.c:
  (svn_cl__log): whitespace change. no functional change.

------------------------------------------------------------------------
r35614 | arfrever | 2009-01-31 04:05:06 +0100 (Sat, 31 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_subr/path-test.c

* subversion/tests/libsvn_subr/path-test.c
  (test_path_join): Fix compiler warning.

------------------------------------------------------------------------
r35615 | arfrever | 2009-01-31 04:16:54 +0100 (Sat, 31 Jan 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_auth_kwallet/kwallet.cpp

* subversion/libsvn_auth_kwallet/kwallet.cpp
  (kwallet_password_get): Fix a typo.

------------------------------------------------------------------------
r35616 | cmpilato | 2009-01-31 05:52:02 +0100 (Sat, 31 Jan 2009) | 22 lines
Changed paths:
   M /trunk/subversion/libsvn_ra_neon/commit.c
   M /trunk/subversion/libsvn_ra_neon/options.c
   M /trunk/subversion/libsvn_ra_neon/ra_neon.h

Do all libsvn_ra_neon OPTIONS stuff -- capabilities exchange and
activity collection querying -- in one fell swoop.

* subversion/libsvn_ra_neon/ra_neon.h
  (svn_ra_neon__session_t): Add 'act_coll' member.
  (svn_ra_neon__get_activity_collection): Lose unnecessary 'url' parameter.
  (svn_ra_neon__exchange_capabilities): Flesh out the docstring a
    little better.

* subversion/libsvn_ra_neon/commit.c
  (get_activity_collection): Update call to
    svn_ra_neon__get_activity_collection().

* subversion/libsvn_ra_neon/options.c
  (svn_ra_neon__exchange_capabilities): Essentially merge in the
    body-sending and response-body-handling bits of
    svn_ra_neon__get_activity_collection() so this thing can be a
    one-stop OPTIONS shop.
  (svn_ra_neon__get_activity_collection): Rework as a thin wrapper
    around svn_ra_neon__exchange_capabilities(), and one that can use
    refer to the session's cache of the path of interest.

------------------------------------------------------------------------
r35617 | cmpilato | 2009-01-31 05:56:42 +0100 (Sat, 31 Jan 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/build/generator/ezt.py
   M /branches/http-protocol-v2/build/generator/gen_base.py
   M /branches/http-protocol-v2/build/generator/gen_make.py
   M /branches/http-protocol-v2/build/generator/gen_msvc_dsp.py
   M /branches/http-protocol-v2/build/generator/gen_vcnet_vcproj.py
   M /branches/http-protocol-v2/build/generator/gen_win.py
   M /branches/http-protocol-v2/build/win32/make_dist.py
   M /branches/http-protocol-v2/doc/tools/bin/find-xsl.py
   M /branches/http-protocol-v2/gen-make.py
   M /branches/http-protocol-v2/subversion/bindings/ctypes-python/README
   M /branches/http-protocol-v2/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/http-protocol-v2/subversion/bindings/swig/python/tests/ra.py
   M /branches/http-protocol-v2/subversion/include/private/svn_utf_private.h
   M /branches/http-protocol-v2/subversion/include/svn_checksum.h
   M /branches/http-protocol-v2/subversion/include/svn_props.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/http-protocol-v2/subversion/libsvn_diff/diff_file.c
   M /branches/http-protocol-v2/subversion/libsvn_ra/ra_loader.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/commit.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/options.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/session.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/checksum.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/svn_base64.c
   M /branches/http-protocol-v2/subversion/po/pl.po
   M /branches/http-protocol-v2/subversion/svn/log-cmd.c
   M /branches/http-protocol-v2/subversion/svn/schema/log.rnc
   M /branches/http-protocol-v2/subversion/tests/cmdline/changelist_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/info_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svnlook_tests.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/actions.py
   M /branches/http-protocol-v2/subversion/tests/cmdline/svntest/tree.py
   M /branches/http-protocol-v2/subversion/tests/libsvn_delta/window-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/path-test.c
   M /branches/http-protocol-v2/tools/bdb/svn-bdb-view.py
   M /branches/http-protocol-v2/tools/client-side/server-version.py
   M /branches/http-protocol-v2/tools/dev/contribulyze.py
   M /branches/http-protocol-v2/tools/dev/gen-javahl-errors.py
   M /branches/http-protocol-v2/tools/dev/graph-dav-servers.py
   M /branches/http-protocol-v2/tools/dev/normalize-dump.py
   M /branches/http-protocol-v2/tools/dev/trails.py
   M /branches/http-protocol-v2/tools/dev/which-error.py
   M /branches/http-protocol-v2/tools/examples/svnshell.py
   M /branches/http-protocol-v2/tools/hook-scripts/mailer/mailer.py
   M /branches/http-protocol-v2/tools/po/l10n-report.py

Bring up to date with trunk (Merged /trunk:r35589-35616)
------------------------------------------------------------------------
r35618 | arfrever | 2009-01-31 22:50:18 +0100 (Sat, 31 Jan 2009) | 7 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_subr/path-test.c

Follow-up to r35614:

* subversion/tests/libsvn_subr/path-test.c
  (test_path_join): Simplify code.

Suggested by: gstein

------------------------------------------------------------------------
r35619 | lgo | 2009-01-31 23:30:28 +0100 (Sat, 31 Jan 2009) | 2 lines
Changed paths:
   A /branches/ra_serf-digest-authn (from /trunk:35618)

* branches/ra_serf-digest-authn: created new branch from trunk@35618.

------------------------------------------------------------------------
r35620 | lgo | 2009-02-01 01:07:34 +0100 (Sun, 01 Feb 2009) | 17 lines
Changed paths:
   M /branches/ra_serf-digest-authn/subversion/libsvn_ra_serf/auth.c
   M /branches/ra_serf-digest-authn/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/ra_serf-digest-authn/subversion/libsvn_ra_serf/util.c
   M /branches/ra_serf-digest-authn/subversion/libsvn_ra_serf/win32_auth_sspi.c

* subversion/libsvn_ra_serf/ra_serf.h
  (svn_serf__auth_handler_func_t): change the prototype to take the
   serf handler context - we'll need its info for the digest authn.
  (svn_ra_serf__handle_auth): same change.

* subversion/libsvn_ra_serf/auth.c
  (handle_basic_auth,
   handle_proxy_basic_auth,
   svn_ra_serf__handle_auth): update declarations and implementation 
   to take and use the serf handler context.

* subversion/libsvn_ra_serf/win32_auth_sspi.c
  (handle_sspi_auth): idem.

* subversion/libsvn_ra_serf/util.c
  (handle_response): idem.

------------------------------------------------------------------------
r35621 | rhuijben | 2009-02-01 22:01:35 +0100 (Sun, 01 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/deprecated.c
   M /trunk/subversion/libsvn_subr/dso.c

* subversion/libsvn_subr/dso.c
  (svn_dso_initialize): Move deprecated function to ...
* subversion/libsvn_subr/deprecated.c
  (svn_dso_initialize): ... this file.

------------------------------------------------------------------------
r35622 | rhuijben | 2009-02-01 22:02:49 +0100 (Sun, 01 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/deprecated.c
  (global): Following up on r35621, add missing header.

------------------------------------------------------------------------
r35623 | rhuijben | 2009-02-01 22:07:49 +0100 (Sun, 01 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/deprecated.c
   M /trunk/subversion/libsvn_subr/prompt.c

* subversion/libsvn_subr/prompt.c
  (svn_cmdline_prompt_user): Move deprecated function to ...
* subversion/libsvn_subr/deprecated.c
  (svn_cmdline_prompt_user): ... this file.

------------------------------------------------------------------------
r35624 | rhuijben | 2009-02-01 22:13:35 +0100 (Sun, 01 Feb 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/deprecated.c
   M /trunk/subversion/libsvn_subr/simple_providers.c
   M /trunk/subversion/libsvn_subr/ssl_client_cert_pw_providers.c

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c
  (svn_auth_get_ssl_client_cert_pw_file_provider): Move this and ...
* subversion/libsvn_subr/simple_providers.c
  (svn_auth_get_simple_provider): ... this function ...
* subversion/libsvn_subr/deprecated.c
  (svn_auth_get_ssl_client_cert_pw_file_provider,
   svn_auth_get_simple_provider): To this file.

------------------------------------------------------------------------
r35625 | rhuijben | 2009-02-01 22:55:39 +0100 (Sun, 01 Feb 2009) | 7 lines
Changed paths:
   M /trunk/subversion/include/svn_wc.h

* subversion/include/svn_wc.h
  (svn_wc_conflict_reason_t): Following up on r33082, move new in 1.6
    enum value to the end of the list to remove ABI breakage. Update
    comment syntax to doxygen format to make this visible.
    
Found by: SharpSvn tests

------------------------------------------------------------------------
r35626 | stylesen | 2009-02-02 14:17:27 +0100 (Mon, 02 Feb 2009) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_client/merge.c

Follow up to r35578.

* subversion/libsvn_client/merge.c
  (merge_cousins_and_supplement_mergeinfo, svn_client_merge3,
   svn_client_merge_peg3): Do uuid comparison iff the repository roots do not
   match.

Suggested by: rhuijben
Review by: rhuijben

------------------------------------------------------------------------
r35627 | julianfoad | 2009-02-02 14:51:15 +0100 (Mon, 02 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_repos/dump.c

* subversion/libsvn_repos/dump.c:
  (ARE_VALID_COPY_ARGS): Properly protect a macro argument with parentheses.

------------------------------------------------------------------------
r35628 | rhuijben | 2009-02-02 16:25:41 +0100 (Mon, 02 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/deprecated.c
   M /trunk/subversion/libsvn_wc/lock.c

* subversion/libsvn_wc/lock.c
  (svn_wc_adm_open, svn_wc_adm_open2, svn_wc_adm_probe_open,
   svn_wc_adm_probe_open2, svn_wc_adm_probe_try, svn_wc_adm_close):
     Move these deprecated functions..
* subversion/libsvn_wc/deprecated.c
  (svn_wc_adm_open, svn_wc_adm_open2, svn_wc_adm_probe_open,
   svn_wc_adm_probe_open2, svn_wc_adm_probe_try, svn_wc_adm_close):
     ... to deprecated.c.

------------------------------------------------------------------------
r35629 | rhuijben | 2009-02-02 16:31:19 +0100 (Mon, 02 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/deprecated.c

* libsvn_wc/deprecated.c
  (svn_wc_adm_close): Get a pool reference via the public api.

------------------------------------------------------------------------
r35630 | hwright | 2009-02-02 16:55:51 +0100 (Mon, 02 Feb 2009) | 5 lines
Changed paths:
   M /trunk/doc/doxygen.conf

Update doxygen configuration file.

* doc/doxygen.conf:
  Run 'doxygen -u'.

------------------------------------------------------------------------
r35631 | julianfoad | 2009-02-02 16:56:44 +0100 (Mon, 02 Feb 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_client/copy.c
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/merge.c
   M /trunk/subversion/libsvn_client/ra.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/id.c
   M /trunk/subversion/libsvn_fs_base/key-gen.c
   M /trunk/subversion/libsvn_fs_base/tree.c
   M /trunk/subversion/libsvn_fs_base/util/fs_skels.c
   M /trunk/subversion/libsvn_fs_fs/id.c
   M /trunk/subversion/libsvn_fs_fs/lock.c
   M /trunk/subversion/libsvn_fs_fs/tree.c
   M /trunk/subversion/libsvn_ra_local/ra_plugin.c
   M /trunk/subversion/libsvn_ra_neon/fetch.c
   M /trunk/subversion/libsvn_ra_serf/update.c
   M /trunk/subversion/libsvn_ra_svn/client.c
   M /trunk/subversion/libsvn_repos/commit.c
   M /trunk/subversion/libsvn_repos/dump.c
   M /trunk/subversion/libsvn_repos/log.c
   M /trunk/subversion/libsvn_subr/mergeinfo.c
   M /trunk/subversion/libsvn_subr/path.c
   M /trunk/subversion/libsvn_subr/properties.c
   M /trunk/subversion/libsvn_subr/skel.c
   M /trunk/subversion/libsvn_subr/sqlite.c
   M /trunk/subversion/libsvn_subr/utf_validate.c
   M /trunk/subversion/libsvn_wc/adm_ops.c
   M /trunk/subversion/libsvn_wc/copy.c
   M /trunk/subversion/libsvn_wc/relocate.c
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/mod_dav_svn/merge.c
   M /trunk/subversion/mod_dav_svn/repos.c
   M /trunk/subversion/mod_dav_svn/util.c
   M /trunk/subversion/svn/diff-cmd.c
   M /trunk/subversion/svnlook/main.c
   M /trunk/subversion/svnserve/serve.c
   M /trunk/subversion/tests/libsvn_subr/mergeinfo-test.c

Replace the expressions "? TRUE : FALSE" and "? FALSE : TRUE", which are ugly
and redundant or almost redundant, with more direct ways to express the
boolean test that is meant, throughout the C code base. No functional change.

The changes are similar to these:
  boolean ? TRUE : FALSE   =>   boolean
  boolean ? FALSE : TRUE   =>   ! (boolean)
  x == y  ? FALSE : TRUE   =>   x != y
  pointer ? TRUE : FALSE   =>   pointer != NULL
  integer ? FALSE : TRUE   =>   integer != 0
etc.

------------------------------------------------------------------------
r35632 | cmpilato | 2009-02-02 17:06:34 +0100 (Mon, 02 Feb 2009) | 29 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/fetch.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/get_dated_rev.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/options.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/ra_neon.h

Dear Greg S.,

On the 'http-protocol-v2' branch:  Grab some low-hanging fruit,
teaching ra-neon to do some of the HTTP v2 stuff.

* subversion/libsvn_ra_neon/ra_neon.h
  (svn_ra_neon__session_t): Add 'me_resource', 'pegrev_stub', and
    'rev_stub' members.
  (SVN_RA_NEON__HAVE_HTTPV2_SUPPORT): New macro.

* subversion/libsvn_ra_neon/options.c
  (parse_capabilities): Notice and cache some of the new HTTP v2
    OPTIONS response header values.

* subversion/libsvn_ra_neon/fetch.c
  (reporter_finish_report): Report against the "me resource" if we can.
  (svn_ra_neon__rev_proplist): Use new "rev stub" if we can.

* subversion/libsvn_ra_neon/get_dated_rev.c
  (svn_ra_neon__get_dated_revision): Report against the "me resource"
    if we can.

* BRANCH-README
  Update status.

Love,

C-Mike

------------------------------------------------------------------------
r35633 | hwright | 2009-02-02 17:29:29 +0100 (Mon, 02 Feb 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/CHANGES
   M /branches/explore-wc/TODO-1.6
   M /branches/explore-wc/build/generator/ezt.py
   M /branches/explore-wc/build/generator/gen_base.py
   M /branches/explore-wc/build/generator/gen_make.py
   M /branches/explore-wc/build/generator/gen_msvc_dsp.py
   M /branches/explore-wc/build/generator/gen_vcnet_vcproj.py
   M /branches/explore-wc/build/generator/gen_win.py
   M /branches/explore-wc/build/run_tests.py
   M /branches/explore-wc/build/win32/make_dist.py
   M /branches/explore-wc/doc/doxygen.conf
   M /branches/explore-wc/doc/tools/bin/find-xsl.py
   M /branches/explore-wc/gen-make.py
   M /branches/explore-wc/subversion/bindings/ctypes-python/README
   M /branches/explore-wc/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /branches/explore-wc/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/explore-wc/subversion/bindings/swig/python/tests/ra.py
   M /branches/explore-wc/subversion/include/private/svn_utf_private.h
   M /branches/explore-wc/subversion/include/svn_checksum.h
   M /branches/explore-wc/subversion/include/svn_props.h
   M /branches/explore-wc/subversion/include/svn_wc.h
   M /branches/explore-wc/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/explore-wc/subversion/libsvn_client/copy.c
   M /branches/explore-wc/subversion/libsvn_client/deprecated.c
   M /branches/explore-wc/subversion/libsvn_client/log.c
   M /branches/explore-wc/subversion/libsvn_client/merge.c
   M /branches/explore-wc/subversion/libsvn_client/ra.c
   M /branches/explore-wc/subversion/libsvn_diff/diff_file.c
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/explore-wc/subversion/libsvn_fs_base/dag.c
   M /branches/explore-wc/subversion/libsvn_fs_base/id.c
   M /branches/explore-wc/subversion/libsvn_fs_base/key-gen.c
   M /branches/explore-wc/subversion/libsvn_fs_base/tree.c
   M /branches/explore-wc/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/explore-wc/subversion/libsvn_fs_fs/id.c
   M /branches/explore-wc/subversion/libsvn_fs_fs/lock.c
   M /branches/explore-wc/subversion/libsvn_fs_fs/tree.c
   M /branches/explore-wc/subversion/libsvn_ra/ra_loader.c
   M /branches/explore-wc/subversion/libsvn_ra_local/ra_plugin.c
   M /branches/explore-wc/subversion/libsvn_ra_neon/commit.c
   M /branches/explore-wc/subversion/libsvn_ra_neon/fetch.c
   M /branches/explore-wc/subversion/libsvn_ra_neon/options.c
   M /branches/explore-wc/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/explore-wc/subversion/libsvn_ra_neon/session.c
   M /branches/explore-wc/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/explore-wc/subversion/libsvn_ra_serf/serf.c
   M /branches/explore-wc/subversion/libsvn_ra_serf/update.c
   M /branches/explore-wc/subversion/libsvn_ra_serf/util.c
   M /branches/explore-wc/subversion/libsvn_ra_svn/client.c
   M /branches/explore-wc/subversion/libsvn_repos/commit.c
   M /branches/explore-wc/subversion/libsvn_repos/dump.c
   M /branches/explore-wc/subversion/libsvn_repos/log.c
   M /branches/explore-wc/subversion/libsvn_subr/checksum.c
   M /branches/explore-wc/subversion/libsvn_subr/deprecated.c
   M /branches/explore-wc/subversion/libsvn_subr/dso.c
   M /branches/explore-wc/subversion/libsvn_subr/mergeinfo.c
   M /branches/explore-wc/subversion/libsvn_subr/path.c
   M /branches/explore-wc/subversion/libsvn_subr/prompt.c
   M /branches/explore-wc/subversion/libsvn_subr/properties.c
   M /branches/explore-wc/subversion/libsvn_subr/simple_providers.c
   M /branches/explore-wc/subversion/libsvn_subr/skel.c
   M /branches/explore-wc/subversion/libsvn_subr/sqlite.c
   M /branches/explore-wc/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/explore-wc/subversion/libsvn_subr/stream.c
   M /branches/explore-wc/subversion/libsvn_subr/svn_base64.c
   M /branches/explore-wc/subversion/libsvn_subr/utf_validate.c
   M /branches/explore-wc/subversion/libsvn_wc/adm_ops.c
   M /branches/explore-wc/subversion/libsvn_wc/copy.c
   M /branches/explore-wc/subversion/libsvn_wc/deprecated.c
   M /branches/explore-wc/subversion/libsvn_wc/lock.c
   M /branches/explore-wc/subversion/libsvn_wc/relocate.c
   M /branches/explore-wc/subversion/libsvn_wc/update_editor.c
   M /branches/explore-wc/subversion/mod_dav_svn/merge.c
   M /branches/explore-wc/subversion/mod_dav_svn/repos.c
   M /branches/explore-wc/subversion/mod_dav_svn/util.c
   M /branches/explore-wc/subversion/po/pl.po
   M /branches/explore-wc/subversion/svn/diff-cmd.c
   M /branches/explore-wc/subversion/svn/log-cmd.c
   M /branches/explore-wc/subversion/svn/schema/log.rnc
   M /branches/explore-wc/subversion/svnlook/main.c
   M /branches/explore-wc/subversion/svnserve/serve.c
   M /branches/explore-wc/subversion/tests/cmdline/changelist_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/info_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/svnlook_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/svntest/actions.py
   M /branches/explore-wc/subversion/tests/cmdline/svntest/tree.py
   M /branches/explore-wc/subversion/tests/libsvn_delta/window-test.c
   M /branches/explore-wc/subversion/tests/libsvn_fs/fs-test.c
   M /branches/explore-wc/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/explore-wc/subversion/tests/libsvn_subr/path-test.c
   M /branches/explore-wc/tools/bdb/svn-bdb-view.py
   M /branches/explore-wc/tools/client-side/server-version.py
   M /branches/explore-wc/tools/dev/contribulyze.py
   M /branches/explore-wc/tools/dev/find-bad-style.py
   M /branches/explore-wc/tools/dev/gen-javahl-errors.py
   M /branches/explore-wc/tools/dev/graph-dav-servers.py
   M /branches/explore-wc/tools/dev/normalize-dump.py
   M /branches/explore-wc/tools/dev/trails.py
   M /branches/explore-wc/tools/dev/which-error.py
   M /branches/explore-wc/tools/dist/construct-rolling-environment.sh
   M /branches/explore-wc/tools/examples/svnshell.py
   M /branches/explore-wc/tools/hook-scripts/mailer/mailer.py
   M /branches/explore-wc/tools/po/l10n-report.py
   M /branches/explore-wc/www/images/svn-dav-securityspace-survey.png
   M /branches/explore-wc/www/svn-dav-securityspace-survey.html

On the explore-wc branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r35634 | cmpilato | 2009-02-02 17:48:31 +0100 (Mon, 02 Feb 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Mark some tasks complete.
------------------------------------------------------------------------
r35635 | cmpilato | 2009-02-02 17:56:58 +0100 (Mon, 02 Feb 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Add another todo item.
------------------------------------------------------------------------
r35636 | cmpilato | 2009-02-02 17:58:10 +0100 (Mon, 02 Feb 2009) | 9 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/commit.c

On the http-protocol-v2 branch:  Make revprop changes use the
rev-stubbish URIs.

* subversion/libsvn_ra_serf/commit.c
  (svn_ra_serf__change_rev_prop): Use the rev stub URI if available.

* BRANCH-README
  Mark the related task complete.

------------------------------------------------------------------------
r35637 | hwright | 2009-02-02 19:41:23 +0100 (Mon, 02 Feb 2009) | 12 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Don't insert a bogus working copy id into the sqlite database, but get it
the value from the database instead.

Note:  This introduces test failures, because we haven't yet determined a
way to track working copy moves in the filesystem.  The absolute path of the
working copy changes, and BOOM, things break.

* subversion/libsvn_wc/entries.c
  (statement_keys, statements): Add another statement.
  (svn_wc__entries_write): Fetch the wc_id for use when inserted entries.

------------------------------------------------------------------------
r35638 | hwright | 2009-02-02 20:37:19 +0100 (Mon, 02 Feb 2009) | 16 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c
   M /branches/explore-wc/subversion/libsvn_wc/wc-metadata.sql

On the explore-wc branch:
Fix the test errors introduced in r35637.  Since the metadata is all being stored
locally, we can relax the requirement that we store the wc root path, so all the
tests which create secondary WCs and move things around now pass.

* subversion/libsvn_wc/wc-metadata.sql
  (WCROOT): Allow local_abspath to be null in the case where we are storing the
    WC metadata locally.

* subversion/libsvn_wc/entries.c
  (statement_keys, statements): Rename statement to indicate the lack of
    parameters.
  (svn_wc__entries_write): Just select whatever WCROOT we have (there should only
    be one per database right now.)
  (svn_wc__entries_init): Don't insert the local ABS path.

------------------------------------------------------------------------
r35639 | arfrever | 2009-02-03 01:52:24 +0100 (Tue, 03 Feb 2009) | 9 lines
Changed paths:
   M /trunk/Makefile.in
   M /trunk/build/generator/gen_make.py

Fix value of __FILE__ in some files of mod_authz_svn, mod_dav_svn and JavaHL,
when $(abs_builddir) == $(abs_srcdir).

* Makefile.in
  (srcpath): Define when $(abs_builddir) != $(abs_srcdir).

* build/generator/gen_make.py
  (Generator.write): Use '$(srcpath)' instead of '$(abs_srcdir)/'.

------------------------------------------------------------------------
r35640 | arfrever | 2009-02-03 02:27:09 +0100 (Tue, 03 Feb 2009) | 3 lines
Changed paths:
   M /trunk/build/ac-macros/kwallet.m4

* build/ac-macros/kwallet.m4
  (SVN_LIB_KWALLET): Simplify use of pkg-config.

------------------------------------------------------------------------
r35641 | cmpilato | 2009-02-03 14:56:33 +0100 (Tue, 03 Feb 2009) | 3 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/include/svn_dav.h

* subversion/include/svn_dav.h
  Reordering some stuff, with minor comment tweaks.

------------------------------------------------------------------------
r35642 | hwright | 2009-02-03 15:39:06 +0100 (Tue, 03 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/include/svn_repos.h

* subversion/include/svn_repos.h:
  Doxygenify a few comments.

------------------------------------------------------------------------
r35643 | cmpilato | 2009-02-03 17:05:32 +0100 (Tue, 03 Feb 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Mark a task complete.
------------------------------------------------------------------------
r35644 | pburba | 2009-02-03 17:17:18 +0100 (Tue, 03 Feb 2009) | 1 line
Changed paths:
   M /branches/issue-3334-dirs
   M /branches/issue-3334-dirs/CHANGES
   M /branches/issue-3334-dirs/Makefile.in
   M /branches/issue-3334-dirs/TODO-1.6
   M /branches/issue-3334-dirs/autogen.sh
   M /branches/issue-3334-dirs/build/ac-macros/kwallet.m4
   M /branches/issue-3334-dirs/build/generator/ezt.py
   M /branches/issue-3334-dirs/build/generator/gen_base.py
   M /branches/issue-3334-dirs/build/generator/gen_make.py
   M /branches/issue-3334-dirs/build/generator/gen_msvc_dsp.py
   M /branches/issue-3334-dirs/build/generator/gen_vcnet_vcproj.py
   M /branches/issue-3334-dirs/build/generator/gen_win.py
   M /branches/issue-3334-dirs/build/generator/util/executable.py
   M /branches/issue-3334-dirs/build/run_tests.py
   M /branches/issue-3334-dirs/build/transform_sql.py
   M /branches/issue-3334-dirs/build/win32/make_dist.py
   M /branches/issue-3334-dirs/contrib/client-side/svn-push/svn-push.c
   M /branches/issue-3334-dirs/contrib/client-side/svnmerge/svnmerge-migrate-history.py
   M /branches/issue-3334-dirs/doc/doxygen.conf
   M /branches/issue-3334-dirs/doc/tools/bin/find-xsl.py
   M /branches/issue-3334-dirs/gen-make.py
   M /branches/issue-3334-dirs/notes/http-protocol-v2.txt
   M /branches/issue-3334-dirs/subversion/bindings/ctypes-python/README
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/ConflictResolverCallback.h
   A /branches/issue-3334-dirs/subversion/bindings/javahl/native/CreateJ.cpp (from /trunk/subversion/bindings/javahl/native/CreateJ.cpp:35642)
   A /branches/issue-3334-dirs/subversion/bindings/javahl/native/CreateJ.h (from /trunk/subversion/bindings/javahl/native/CreateJ.h:35642)
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/EnumMapper.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/InfoCallback.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/ListCallback.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/Notify2.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/RevpropTable.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/SVNAdmin.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/SVNClient.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/SVNClient.h
   M /branches/issue-3334-dirs/subversion/bindings/javahl/native/StatusCallback.cpp
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
   A /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java (from /trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java:35642)
   M /branches/issue-3334-dirs/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java
   M /branches/issue-3334-dirs/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   M /branches/issue-3334-dirs/subversion/bindings/swig/core.i
   M /branches/issue-3334-dirs/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   M /branches/issue-3334-dirs/subversion/bindings/swig/python/svn/fs.py
   M /branches/issue-3334-dirs/subversion/bindings/swig/python/svn/repos.py
   M /branches/issue-3334-dirs/subversion/bindings/swig/python/tests/mergeinfo.py
   M /branches/issue-3334-dirs/subversion/bindings/swig/python/tests/ra.py
   M /branches/issue-3334-dirs/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/issue-3334-dirs/subversion/bindings/swig/svn_delta.i
   M /branches/issue-3334-dirs/subversion/bindings/swig/svn_fs.i
   M /branches/issue-3334-dirs/subversion/bindings/swig/svn_wc.i
   M /branches/issue-3334-dirs/subversion/include/private/ra_svn_sasl.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_auth_private.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_cmdline_private.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_fs_util.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_log.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_mergeinfo_private.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_opt_private.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_skel.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_sqlite.h
   M /branches/issue-3334-dirs/subversion/include/private/svn_utf_private.h
   M /branches/issue-3334-dirs/subversion/include/svn_auth.h
   M /branches/issue-3334-dirs/subversion/include/svn_base64.h
   M /branches/issue-3334-dirs/subversion/include/svn_checksum.h
   M /branches/issue-3334-dirs/subversion/include/svn_client.h
   M /branches/issue-3334-dirs/subversion/include/svn_cmdline.h
   M /branches/issue-3334-dirs/subversion/include/svn_config.h
   M /branches/issue-3334-dirs/subversion/include/svn_delta.h
   M /branches/issue-3334-dirs/subversion/include/svn_diff.h
   M /branches/issue-3334-dirs/subversion/include/svn_dirent_uri.h
   M /branches/issue-3334-dirs/subversion/include/svn_dso.h
   M /branches/issue-3334-dirs/subversion/include/svn_error.h
   M /branches/issue-3334-dirs/subversion/include/svn_error_codes.h
   M /branches/issue-3334-dirs/subversion/include/svn_fs.h
   M /branches/issue-3334-dirs/subversion/include/svn_hash.h
   M /branches/issue-3334-dirs/subversion/include/svn_io.h
   M /branches/issue-3334-dirs/subversion/include/svn_iter.h
   M /branches/issue-3334-dirs/subversion/include/svn_md5.h
   M /branches/issue-3334-dirs/subversion/include/svn_mergeinfo.h
   M /branches/issue-3334-dirs/subversion/include/svn_opt.h
   M /branches/issue-3334-dirs/subversion/include/svn_path.h
   M /branches/issue-3334-dirs/subversion/include/svn_pools.h
   M /branches/issue-3334-dirs/subversion/include/svn_props.h
   M /branches/issue-3334-dirs/subversion/include/svn_quoprint.h
   M /branches/issue-3334-dirs/subversion/include/svn_ra.h
   M /branches/issue-3334-dirs/subversion/include/svn_ra_svn.h
   M /branches/issue-3334-dirs/subversion/include/svn_repos.h
   M /branches/issue-3334-dirs/subversion/include/svn_sorts.h
   M /branches/issue-3334-dirs/subversion/include/svn_string.h
   M /branches/issue-3334-dirs/subversion/include/svn_subst.h
   M /branches/issue-3334-dirs/subversion/include/svn_time.h
   M /branches/issue-3334-dirs/subversion/include/svn_types.h
   M /branches/issue-3334-dirs/subversion/include/svn_user.h
   M /branches/issue-3334-dirs/subversion/include/svn_utf.h
   M /branches/issue-3334-dirs/subversion/include/svn_wc.h
   M /branches/issue-3334-dirs/subversion/include/svn_xml.h
   M /branches/issue-3334-dirs/subversion/libsvn_auth_kwallet/kwallet.cpp
   M /branches/issue-3334-dirs/subversion/libsvn_client/client.h
   M /branches/issue-3334-dirs/subversion/libsvn_client/commit.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/copy.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/export.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/info.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/list.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/merge.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/mergeinfo.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/prop_commands.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/ra.c
   M /branches/issue-3334-dirs/subversion/libsvn_client/update.c
   M /branches/issue-3334-dirs/subversion/libsvn_diff/diff_file.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs/fs-loader.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/dag.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/id.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/key-gen.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/tree.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/fs_fs.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/id.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/lock.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/tree.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra/compat.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra/ra_loader.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra/wrapper_template.h
   M /branches/issue-3334-dirs/subversion/libsvn_ra_local/ra_plugin.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_neon/commit.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_neon/fetch.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_neon/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_neon/options.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/issue-3334-dirs/subversion/libsvn_ra_neon/session.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_neon/util.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/blame.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/commit.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/merge.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/property.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/replay.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/serf.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/update.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_serf/util.c
   M /branches/issue-3334-dirs/subversion/libsvn_ra_svn/client.c
   M /branches/issue-3334-dirs/subversion/libsvn_repos/commit.c
   M /branches/issue-3334-dirs/subversion/libsvn_repos/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_repos/dump.c
   M /branches/issue-3334-dirs/subversion/libsvn_repos/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_repos/rev_hunt.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/auth.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/checksum.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/cmdline.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/compat.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/config_impl.h
   M /branches/issue-3334-dirs/subversion/libsvn_subr/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/dso.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/error.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/iter.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/mergeinfo.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/opt.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/path.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/prompt.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/properties.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/quoprint.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/sha1.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/simple_providers.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/skel.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/sqlite.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/ssl_server_trust_providers.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/stream.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/subst.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/svn_base64.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/utf.c
   D /branches/issue-3334-dirs/subversion/libsvn_subr/utf_impl.h
   M /branches/issue-3334-dirs/subversion/libsvn_subr/utf_validate.c
   M /branches/issue-3334-dirs/subversion/libsvn_subr/xml.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/adm_ops.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/copy.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/deprecated.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/entries.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/entries.h
   M /branches/issue-3334-dirs/subversion/libsvn_wc/lock.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/log.h
   M /branches/issue-3334-dirs/subversion/libsvn_wc/merge.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/props.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/questions.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/questions.h
   M /branches/issue-3334-dirs/subversion/libsvn_wc/relocate.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/translate.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/tree_conflicts.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/util.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/wc-metadata.sql
   M /branches/issue-3334-dirs/subversion/libsvn_wc/wc_db.h
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/activity.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/merge.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/reports/log.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/repos.c
   M /branches/issue-3334-dirs/subversion/mod_dav_svn/util.c
   M /branches/issue-3334-dirs/subversion/po/pl.po
   M /branches/issue-3334-dirs/subversion/svn/changelist-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/conflict-callbacks.c
   M /branches/issue-3334-dirs/subversion/svn/copy-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/diff-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/info-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/list-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/log-cmd.c
   M /branches/issue-3334-dirs/subversion/svn/main.c
   M /branches/issue-3334-dirs/subversion/svn/schema/log.rnc
   M /branches/issue-3334-dirs/subversion/svn/util.c
   M /branches/issue-3334-dirs/subversion/svnlook/main.c
   M /branches/issue-3334-dirs/subversion/svnserve/serve.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/autoprop_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/changelist_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/info_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/prop_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/stat_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svnadmin_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svnlook_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/__init__.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/actions.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/main.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/tree.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/svntest/verify.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/trans_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py
   M /branches/issue-3334-dirs/subversion/tests/libsvn_delta/window-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_fs/fs-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_repos/repos-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_subr/path-test.c
   M /branches/issue-3334-dirs/subversion/tests/libsvn_subr/utf-test.c
   M /branches/issue-3334-dirs/tools/backup/hot-backup.py.in
   M /branches/issue-3334-dirs/tools/bdb/svn-bdb-view.py
   M /branches/issue-3334-dirs/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
   M /branches/issue-3334-dirs/tools/client-side/bash_completion
   M /branches/issue-3334-dirs/tools/client-side/change-svn-wc-format.py
   M /branches/issue-3334-dirs/tools/client-side/server-version.py
   M /branches/issue-3334-dirs/tools/client-side/svnmucc/svnmucc.c
   M /branches/issue-3334-dirs/tools/dev/contribulyze.py
   A /branches/issue-3334-dirs/tools/dev/find-bad-style.py (from /trunk/tools/dev/find-bad-style.py:35642)
   M /branches/issue-3334-dirs/tools/dev/gen-javahl-errors.py
   M /branches/issue-3334-dirs/tools/dev/graph-dav-servers.py
   A /branches/issue-3334-dirs/tools/dev/min-includes.sh (from /trunk/tools/dev/min-includes.sh:35642)
   M /branches/issue-3334-dirs/tools/dev/normalize-dump.py
   M /branches/issue-3334-dirs/tools/dev/trails.py
   M /branches/issue-3334-dirs/tools/dev/which-error.py
   M /branches/issue-3334-dirs/tools/dist/construct-rolling-environment.sh
   M /branches/issue-3334-dirs/tools/examples/svnshell.py
   M /branches/issue-3334-dirs/tools/hook-scripts/log-police.py
   M /branches/issue-3334-dirs/tools/hook-scripts/mailer/mailer.py
   M /branches/issue-3334-dirs/tools/hook-scripts/verify-po.py
   M /branches/issue-3334-dirs/tools/po/l10n-report.py
   M /branches/issue-3334-dirs/tools/server-side/svn-backup-dumps.py
   M /branches/issue-3334-dirs/tools/server-side/svn-populate-node-origins-index.c
   M /branches/issue-3334-dirs/www/commercial-support.html
   M /branches/issue-3334-dirs/www/getting.html
   M /branches/issue-3334-dirs/www/images/svn-dav-securityspace-survey.png
   M /branches/issue-3334-dirs/www/links.html
   M /branches/issue-3334-dirs/www/svn-dav-securityspace-survey.html
   M /branches/issue-3334-dirs/www/svn_1.6_releasenotes.html

On the issue-3334-dirs branch: Merge changes from trunk up to r35642.
------------------------------------------------------------------------
r35645 | hwright | 2009-02-03 17:28:17 +0100 (Tue, 03 Feb 2009) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Note the failing ruby bindings test.

------------------------------------------------------------------------
r35646 | cmpilato | 2009-02-03 17:55:16 +0100 (Tue, 03 Feb 2009) | 14 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/include/svn_dav.h
   M /branches/http-protocol-v2/subversion/mod_dav_svn/repos.c

On the 'http-protocol-v2' branch:  Finish (more-or-less) making
mod_dav_svn able to handle POSTs against the 'me' resource.

* subversion/include/svn_dav.h
  (SVN_DAV_TXNPROPS_HEADER, SVN_DAV_TXN_HEADER): New.

* subversion/mod_dav_svn/repos.c
  (dav_svn__method_post): Get the custom POST handler creating
    transactions, mapping an activity UUID to the transaction, and
    returning the new transaction-related headers.

* BRANCH-README
  Update status.

------------------------------------------------------------------------
r35647 | stsp | 2009-02-03 18:00:31 +0100 (Tue, 03 Feb 2009) | 15 lines
Changed paths:
   M /trunk/build/ac-macros/swig.m4

* build/ac-macros/swig.m4
  (SVN_FIND_SWIG): Do not quote $rbconfig_sitedir inside a quoted
   and backtick'ed invocation of sed.

   This does not work on OpenBSD, where neither m4 nor /bin/sh
   swallow the extra quotes around $rbconfig_sitedir, causing
   sed to see " instead of s as the command character.
   As a result of this problem, ruby bindings where installing
   stuff in wacky places.

   If this breaks things on other platforms, we need a better fix.
   The only problem I could imagine is people using spaces in their
   ruby install path, which is a silly thing to do given that these
   paths are often used by configure scripts written in /bin/sh.

------------------------------------------------------------------------
r35648 | arfrever | 2009-02-03 18:36:22 +0100 (Tue, 03 Feb 2009) | 7 lines
Changed paths:
   M /trunk/build/ac-macros/swig.m4

Follow-up to r35647:

* build/ac-macros/swig.m4
  (SVN_FIND_SWIG): Fix quoting so that it works on all platforms.

Tested by: stsp

------------------------------------------------------------------------
r35649 | stsp | 2009-02-03 19:03:30 +0100 (Tue, 03 Feb 2009) | 11 lines
Changed paths:
   M /trunk/Makefile.in
   M /trunk/configure.ac

The configure script was blindly assuming that the make program the
users runs is called 'make'. This is not a given on all systems.
On *BSD, for example, GNU make is installed as 'gmake'.

* configure.ac: Don't run 'make mkdir-init' from here.

* Makefile.in: Add the 'mkdir-init' target as a dependency of the
   'all' target.

Tested by: arfrever

------------------------------------------------------------------------
r35650 | arfrever | 2009-02-03 19:34:07 +0100 (Tue, 03 Feb 2009) | 7 lines
Changed paths:
   M /trunk/Makefile.in

Follow-up to r35639:
Improve value of __FILE__ in some files of mod_authz_svn, mod_dav_svn and
JavaHL, when $(abs_builddir) != $(abs_srcdir).

* Makefile.in
  (srcpath): Improve definition.

------------------------------------------------------------------------
r35651 | cmpilato | 2009-02-03 19:55:51 +0100 (Tue, 03 Feb 2009) | 2 lines
Changed paths:
   M /trunk/notes/http-protocol-v2.txt

Make it clear that we aren't preserving activities, and we are exposing
Subversion txn names.
------------------------------------------------------------------------
r35652 | cmpilato | 2009-02-03 20:04:51 +0100 (Tue, 03 Feb 2009) | 14 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/mod_dav_svn/activity.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/dav_svn.h
   M /branches/http-protocol-v2/subversion/mod_dav_svn/repos.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/version.c

On the 'http-protocol-v2' branch:  Tweak the custom POST handler to
trade in the currency of transaction names, not activity UUIDs.

* subversion/mod_dav_svn/dav_svn.h,
* subversion/mod_dav_svn/activity.c
  (dav_svn__create_txn): Was dav_svn__create_activity().  Callers updated.

* subversion/mod_dav_svn/version.c
  Track function rename.

* subversion/mod_dav_svn/repos.c
  (dav_svn__method_post): No longer think in terms of activities, but
    just build URIs that expose the Subversion transaction name explicitly.

------------------------------------------------------------------------
r35653 | cmpilato | 2009-02-03 20:30:36 +0100 (Tue, 03 Feb 2009) | 12 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/commit.c

On the 'http-protocol-v2' branch, teach the ra-serf commit editor to
POST to the 'me' resource (when available) in order to begin a
transaction.  (Code is disabled for now, though.)

* subversion/libsvn_ra_serf/commit.c
  (commit_context_t): Reorder some members, and add 'txn_url' and
    'txnprops_url' members.
  (post_response_ctx_t): New baton structure.
  (post_headers_iterator_callback, post_response_handler): New functions.
  (open_root): If HTTP v2 support is found, use a POST against the
    'me' resource instead of all the old activity creation logic.

------------------------------------------------------------------------
r35654 | xsteve | 2009-02-03 20:54:31 +0100 (Tue, 03 Feb 2009) | 5 lines
Changed paths:
   M /trunk/contrib/client-side/emacs/psvn.el

Mark entries with modified properties in svn-status-mark-changed

* trunk/contrib/client-side/emacs/psvn.el:
  (svn-status-mark-changed): Call also svn-status-mark-modified-properties

------------------------------------------------------------------------
r35655 | cmpilato | 2009-02-03 21:11:20 +0100 (Tue, 03 Feb 2009) | 2 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/mod_dav_svn/dav_svn.h

* mod_dav_svn/dav_svn.h: Comment and formatting tweaks only.

------------------------------------------------------------------------
r35656 | cmpilato | 2009-02-03 22:05:16 +0100 (Tue, 03 Feb 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2
   M /branches/http-protocol-v2/Makefile.in
   M /branches/http-protocol-v2/TODO-1.6
   M /branches/http-protocol-v2/build/ac-macros/kwallet.m4
   M /branches/http-protocol-v2/build/ac-macros/swig.m4
   M /branches/http-protocol-v2/build/generator/gen_make.py
   M /branches/http-protocol-v2/configure.ac
   M /branches/http-protocol-v2/contrib/client-side/emacs/psvn.el
   M /branches/http-protocol-v2/doc/doxygen.conf
   M /branches/http-protocol-v2/notes/http-protocol-v2.txt
   M /branches/http-protocol-v2/subversion/include/svn_repos.h
   M /branches/http-protocol-v2/subversion/include/svn_wc.h
   M /branches/http-protocol-v2/subversion/libsvn_client/copy.c
   M /branches/http-protocol-v2/subversion/libsvn_client/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_client/merge.c
   M /branches/http-protocol-v2/subversion/libsvn_client/ra.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/bdb/txn-table.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/dag.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/id.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/key-gen.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/tree.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_base/util/fs_skels.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/id.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/lock.c
   M /branches/http-protocol-v2/subversion/libsvn_fs_fs/tree.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_local/ra_plugin.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/fetch.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/update.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_svn/client.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/commit.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/dump.c
   M /branches/http-protocol-v2/subversion/libsvn_repos/log.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/dso.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/mergeinfo.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/path.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/prompt.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/properties.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/simple_providers.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/skel.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/sqlite.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
   M /branches/http-protocol-v2/subversion/libsvn_subr/utf_validate.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/adm_ops.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/copy.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/deprecated.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/lock.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/relocate.c
   M /branches/http-protocol-v2/subversion/libsvn_wc/update_editor.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/merge.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/repos.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/util.c
   M /branches/http-protocol-v2/subversion/svn/diff-cmd.c
   M /branches/http-protocol-v2/subversion/svnlook/main.c
   M /branches/http-protocol-v2/subversion/svnserve/serve.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/mergeinfo-test.c
   M /branches/http-protocol-v2/subversion/tests/libsvn_subr/path-test.c

Bring up to date with trunk changes. (Merged /trunk:r35617-35655)
------------------------------------------------------------------------
r35657 | cmpilato | 2009-02-03 22:34:00 +0100 (Tue, 03 Feb 2009) | 7 lines
Changed paths:
   M /trunk/notes/http-protocol-v2.txt

* notes/http-protocol-v2.txt
  Update with latest developments.  We want to use terminology and
  concepts that mirrors the FS API a little more closely.  And rather
  than have the POST return two URI stubs, we'll return the base
  versions of those in the OPTIONS response and have POST simply
  return the name of the new transaction.

------------------------------------------------------------------------
r35658 | hwright | 2009-02-03 22:49:08 +0100 (Tue, 03 Feb 2009) | 6 lines
Changed paths:
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_subr/sqlite.c

Add a new sqlite API, for retrieving blob columns in a row.

* subversion/libsvn_subr/sqlite.c
* subversion/include/private/svn_sqlite.h
  (svn_sqlite__column_blob): New.

------------------------------------------------------------------------
r35659 | hwright | 2009-02-03 22:55:59 +0100 (Tue, 03 Feb 2009) | 7 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
When writing entries, if the entry's URL is the same as the repos_root, store
an empty repos_relpath.

* subversion/libsvn_wc/entries.c
  (write_entry): Make it so.

------------------------------------------------------------------------
r35660 | hwright | 2009-02-03 23:04:52 +0100 (Tue, 03 Feb 2009) | 6 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:

* subversion/libsvn_wc/entries.c
  (insert_base_node): Encode the type of checksum being written stored
    in the base_node table.

------------------------------------------------------------------------
r35661 | hwright | 2009-02-03 23:08:36 +0100 (Tue, 03 Feb 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/Makefile.in
   M /branches/explore-wc/TODO-1.6
   M /branches/explore-wc/build/ac-macros/kwallet.m4
   M /branches/explore-wc/build/ac-macros/swig.m4
   M /branches/explore-wc/build/generator/gen_make.py
   M /branches/explore-wc/configure.ac
   M /branches/explore-wc/contrib/client-side/emacs/psvn.el
   M /branches/explore-wc/notes/http-protocol-v2.txt
   M /branches/explore-wc/subversion/include/private/svn_sqlite.h
   M /branches/explore-wc/subversion/include/svn_repos.h
   M /branches/explore-wc/subversion/libsvn_subr/sqlite.c

On the explore-wc branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r35662 | hwright | 2009-02-03 23:46:27 +0100 (Tue, 03 Feb 2009) | 12 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Checkpoint commit for reading entries from the wc-ng database.  Something is
still amiss, in that on checkout the initial entry is created but update does
not yet recurse down into the directory.

[ Note: even though this is a checkpoint, review still welcomed. ]

* subversion/libsvn_wc/entries.c
  (statement_keys, statements): New statements.
  (read_entries_old): Renamed from the original read_entries().
  (fetch_base_nodes, get_repos_root, read_entries): New.

------------------------------------------------------------------------
r35663 | cmpilato | 2009-02-04 00:02:56 +0100 (Wed, 04 Feb 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Update the TODO list.
------------------------------------------------------------------------
r35664 | cmpilato | 2009-02-04 02:10:10 +0100 (Wed, 04 Feb 2009) | 66 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/include/svn_dav.h
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/options.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_neon/ra_neon.h
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/commit.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/options.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/property.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/ra_serf.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/repos.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/version.c

On the 'http-protocol-v2' branch: Track some of the recent header and
nomenclature shifts of HTTP v2 protocol design, and start sending
transaction-related stubs in the OPTIONS response.

* BRANCH-README
  Mark some stuff done.

* subversion/include/svn_dav.h
  (SVN_DAV_PEGREV_STUB_HEADER): Replace with ...
  (SVN_DAV_REV_ROOT_STUB_HEADER): ... this.
  (SVN_DAV_TXNPROPS_HEADER): Replace with ...
  (SVN_DAV_TXN_STUB_HEADER): ... this.
  (SVN_DAV_TXN_HEADER): Replace with ...
  (SVN_DAV_TXN_ROOT_STUB_HEADER): ... this.
  (SVN_DAV_TXN_NAME_HEADER): New.

* subversion/mod_dav_svn/dav_svn.h
  (dav_svn__get_rev_root_stub): Was dav_svn__get_pegrev_stub().
  (dav_svn__get_txn_root_stub): Was dav_svn__get_txnprop_stub().
  (DAV_SVN_RESTYPE_REV_COLLECTION): Was DAV_SVN_RESTYPE_REVSTUB_COLLECTION.
  (DAV_SVN_RESTYPE_REVROOT_COLLECTION): New.
  (DAV_SVN_RESTYPE_TXN_COLLECTION): Was DAV_SVN_RESTYPE_TXNPROP_STUB.
  (DAV_SVN_RESTYPE_TXNROOT_COLLECTION): Was DAV_SVN_RESTYPE_TXNSTUB_COLLECTION;

* subversion/mod_dav_svn/mod_dav_svn.c
  (dav_svn__get_rev_root_stub): Was dav_svn__get_pegrev_stub(), now
    returns a !svn/rvr path.
  (dav_svn__get_txn_root_stub): Was dav_svn__get_txnprop_stub().

* subversion/libsvn_ra_neon/options.c
  (parse_capabilities): Track #define and variable name shifts.  Also,
    find and store in the session the transaction stub and transaction
    root stub in the v2 OPTIONS response.  (Also, rename a temporary
    variable for shorter line lengths.)

* subversion/libsvn_ra_serf/commit.c
  (commit_context_t): Add 'txn_name' member.  Rename 'txnprops_url' to
    'txn_root_url'.
  (open_root): Raise an error if our special POST didn't return the
    information we need.

* subversion/mod_dav_svn/repos.c
  (special_subdirs): Add 'rvr' alias for 'bc'.
  (dav_svn__method_post): Only return the SVN-Txn-Name header now.

* subversion/mod_dav_svn/version.c
  (get_option): Track renamed stuff, and now also include the
    transaction stub and transaction root stub.  Use a convenience
    variable, too, to avoid long lines.

* subversion/libsvn_ra_neon/ra_neon.h
  (svn_ra_neon__session_t): Rename 'pegrev_stub' to 'rev_root_stub'.
    Add 'txn_stub' and 'txn_root_stub' members.

* subversion/libsvn_ra_serf/ra_serf.h
  (struct svn_ra_serf__session_t): Rename 'pegrev_stub' to
    'rev_root_stub'.  Add 'txn_stub' and 'txn_root_stub' members.

* subversion/libsvn_ra_serf/options.c
  (capabilities_headers_iterator_callback): Track renamed headers and
    variable names.  Also, find and store in the session the
    transaction stub and transaction root stub in the v2 OPTIONS response.

* subversion/libsvn_ra_serf/property.c
  (svn_ra_serf__get_baseline_info): Track renamed variable.

------------------------------------------------------------------------
r35665 | arfrever | 2009-02-04 02:34:36 +0100 (Wed, 04 Feb 2009) | 39 lines
Changed paths:
   M /trunk/build/ac-macros/berkeley-db.m4
   M /trunk/configure.ac
   M /trunk/subversion/libsvn_fs_base/bdb/bdb-err.c
   M /trunk/subversion/libsvn_fs_base/bdb/bdb_compat.h
   M /trunk/subversion/libsvn_fs_base/bdb/changes-table.h
   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/env.h
   M /trunk/subversion/libsvn_fs_base/bdb/nodes-table.h
   M /trunk/subversion/libsvn_fs_base/bdb/reps-table.h
   M /trunk/subversion/libsvn_fs_base/bdb/rev-table.h
   M /trunk/subversion/libsvn_fs_base/bdb/strings-table.h
   M /trunk/subversion/libsvn_fs_base/bdb/uuids-table.h
   M /trunk/subversion/libsvn_fs_base/fs.c
   M /trunk/subversion/libsvn_fs_base/fs.h
   M /trunk/subversion/libsvn_fs_base/node-rev.c
   M /trunk/subversion/libsvn_fs_base/node-rev.h
   M /trunk/subversion/libsvn_fs_base/reps-strings.c
   M /trunk/subversion/libsvn_fs_base/reps-strings.h
   M /trunk/subversion/libsvn_fs_base/revs-txns.h
   M /trunk/subversion/libsvn_fs_base/trail.c
   M /trunk/subversion/libsvn_fs_base/trail.h
   M /trunk/subversion/libsvn_fs_base/util/fs_skels.h
   M /trunk/subversion/svn_private_config.hw

Follow-up to r35017:
Allow to specify Berkeley DB header.
(It allows to build libsvn_fs_base when APR-Util isn't built with support for Berkeley DB.)

* build/ac-macros/berkeley-db.m4
  (SVN_LIB_BERKELEY_DB, SVN_LIB_BERKELEY_DB_TRY): Allow to specify Berkeley DB
   header in argument of the '--with-berkeley-db' option. Add conditional
   inclusion of Berkeley DB header to 'subversion/svn_private_config.h'.

* configure.ac: Substitute '@SVN_DB_HEADER@' with appropriate value
   in 'subversion/svn_private_config.h'.

* subversion/svn_private_config.hw: Include Berkeley DB header when
   SVN_WANT_BDB is defined.

* subversion/libsvn_fs_base/bdb/bdb_compat.h:
* subversion/libsvn_fs_base/bdb/bdb-err.c:
* subversion/libsvn_fs_base/bdb/changes-table.h:
* subversion/libsvn_fs_base/bdb/dbt.c:
* subversion/libsvn_fs_base/bdb/dbt.h:
* subversion/libsvn_fs_base/bdb/env.h:
* subversion/libsvn_fs_base/bdb/nodes-table.h:
* subversion/libsvn_fs_base/bdb/reps-table.h:
* subversion/libsvn_fs_base/bdb/rev-table.h:
* subversion/libsvn_fs_base/bdb/strings-table.h:
* subversion/libsvn_fs_base/bdb/uuids-table.h:
* subversion/libsvn_fs_base/fs.c:
* subversion/libsvn_fs_base/fs.h:
* subversion/libsvn_fs_base/node-rev.c:
* subversion/libsvn_fs_base/node-rev.h:
* subversion/libsvn_fs_base/reps-strings.c:
* subversion/libsvn_fs_base/reps-strings.h:
* subversion/libsvn_fs_base/revs-txns.h:
* subversion/libsvn_fs_base/trail.c:
* subversion/libsvn_fs_base/trail.h:
* subversion/libsvn_fs_base/util/fs_skels.h: Define SVN_WANT_BDB and
   include "svn_private_config.h" instead of defining APU_WANT_DB and
   including <apu_want.h>.

------------------------------------------------------------------------
r35666 | sussman | 2009-02-04 06:06:23 +0100 (Wed, 04 Feb 2009) | 17 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/mod_dav_svn/dav_svn.h
   M /branches/http-protocol-v2/subversion/mod_dav_svn/repos.c

On the 'http-protocol-v2' branch:  Teach mod_dav_svn to parse and prep
our new 'txn' and 'txr' objects.

Next up:  make sure methods like PROPPATCH/PROPFIND work against 'txn'
and methods like PUT work against 'txr'.

* subversion/mod_dav_svn/repos.c 
  (special_subdirs): Add 'txn' and 'txr' parse patterns.
  (parse_txnstub_uri): New function to parse 'txn/txn_name'.
  (parse_txnroot_uri): New function to parse 'txr/txn_name/path'.
  (prep_working): Make this func to handle both DeltaV 'wrk' and
    new-style 'txr' objects... they're basically the same.
  (prep_private): Make this func prep our new private 'txn' objects. 

* subversion/mod_dav_svn/dav_svn.h 
  (dav_svn_root): Tweak docstring.

------------------------------------------------------------------------
r35667 | pburba | 2009-02-04 06:51:43 +0100 (Wed, 04 Feb 2009) | 44 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c
   M /branches/issue-3334-dirs/subversion/tests/cmdline/switch_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py

On the issue-3334-dirs branch: When a delete lands on a tree with local edits
reschedule the tree for addition as a copy of its pre-delete self along with
the local mods.

* subversion/libsvn_wc/update_editor.c
  (struct modcheck_baton_t): Add all_edits_are_deletes member.
  (modcheck_found_entry): Set new modcheck_baton_t member.
  (tree_has_local_mods): Add reference arg to signal case where all local
  modifications are deletions.
  (check_tree_conflict): If a conflict is found because a delete is incoming
  on a tree with edits, but these "edits" are *all* deletions to subtrees
  of the three, then set the return conflict reason to
  svn_wc_conflict_reason_deleted rather than svn_wc_conflict_reason_edited.
  (set_copied_baton_t): Add member to track the root of the tree we are
  re-adding.
  (set_copied_callback): Get more restrictive on what we re-add.
  (schedule_existing_item_for_re_add): Don't change the base revision of the
  re-added item to the target rev, it doesn't exist at that rev.
  If we are re-adding a directory, also note in the directory's parent entry
  that we are doing so.   

* subversion/tests/cmdline/switch_tests.py
  (tree_conflicts_on_switch_1_2, tree_conflicts_on_switch_2_2,
  tree_conflicts_on_switch_3): Expect incoming deletes that land on local
  deletes to *really* remove the deleted paths; that is, they should be
  status '!' not scheduled for deletion (they were already deleted!).
  (tree_conflicts_on_switch_2_1): Oddly this test was not set to XFail even
  though it leaves the WC in a broken state with switched paths that are not
  really switched.  We actually expect incorrect output, get it, and consider
  this a passing test!  Ok, end of rant :-D
  Change test expectations so an incoming tree delete on a leaf
  edit is a tree conflict (as always) but the "deleted" tree is re-
  scheduled as a copy with history along with the local edits.

* subversion/tests/cmdline/update_tests.py
  (update_delete_modified_files, tree_conflicts_on_update_2_1):   Change test
  expectations so an incoming tree delete on a leaf edits is a tree
  conflict (as always) but the "deleted" tree is rescheduled as a copy with
  history along with the local edits.
  (tree_conflicts_on_update_1_2, tree_conflicts_on_update_2_2,
  tree_conflicts_on_update_3): As per tree_conflicts_on_switch_1_2 above.
  (tree_conflict_uc2_schedule_re_add): Make set of local mods upon which
  a delete lands a bit more varied.  Check that the two scenarios result in
  the same WC.
------------------------------------------------------------------------
r35668 | arfrever | 2009-02-04 15:51:51 +0100 (Wed, 04 Feb 2009) | 12 lines
Changed paths:
   M /trunk/build/ac-macros/berkeley-db.m4
   M /trunk/configure.ac

Follow-up to r35665:
Don't use very useful features supported only by GNU sed.

* build/ac-macros/berkeley-db.m4
  (SVN_LIB_BERKELEY_DB_TRY): Don't use '\n' in the replacement argument
   of the 's' command of sed.

* configure.ac: Don't pass the '-i' option to sed.

Found by: hwright
          stsp

------------------------------------------------------------------------
r35669 | hwright | 2009-02-04 15:55:28 +0100 (Wed, 04 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_client/commit_util.c

Rename a couple of pool variables to match our conventions.

* subversion/libsvn_client/commit_util.c
  (harvest_committables): pool -> scratch_pool, loop_pool -> iterpool

------------------------------------------------------------------------
r35670 | hwright | 2009-02-04 16:06:48 +0100 (Wed, 04 Feb 2009) | 7 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Fix an off-by-one error.

* subversion/libsvn_wc/entries.c
  (read_entries): entry->incomplete should be set if the number of incomplete
    children in the base_node table is greater than 0, not 1.

------------------------------------------------------------------------
r35671 | hwright | 2009-02-04 16:28:54 +0100 (Wed, 04 Feb 2009) | 7 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Easy out: don't look for the repos id if we don't have the uuid to begin with.

* subversion/libsvn_wc/entries.c
  (svn_wc__entries_write): If the uuid is null, don't even try to get the repos
    id, and error if we do have a uuid, but it is not in the db.

------------------------------------------------------------------------
r35672 | hwright | 2009-02-04 18:06:41 +0100 (Wed, 04 Feb 2009) | 8 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
More improvements on reading entries from the wc db.

* subversion/libsvn_wc/entries.c
  (get_repos_info): Rename from get_repos_root(), and store the repos uuid.
  (read_entries): Put the repos uuid into the entry, and resolve any implied
    defaults in fetched entries.

------------------------------------------------------------------------
r35673 | hwright | 2009-02-04 18:13:39 +0100 (Wed, 04 Feb 2009) | 5 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:

* subversion/libsvn_wc/entries.c
  (read_entries): Add docstring.

------------------------------------------------------------------------
r35674 | hwright | 2009-02-04 19:29:45 +0100 (Wed, 04 Feb 2009) | 13 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c
   M /branches/explore-wc/subversion/libsvn_wc/update_editor.c

On the explore-wc branch:
Ensure we have the repos uuid when creating the initial entries file in a
directory.  With this change, a simple checkout now works.

* subversion/libsvn_wc/update_editor.c
  (edit_baton): Add uuid member.
  (prep_directory): Send the uuid down the stack.
  (make_editor): Populate the uuid member of the edit baton.

* subversion/libsvn_wc/entries.c
  (svn_wc__entries_init): Remove a TODO and unconditionally, insert the real
    uuid.

------------------------------------------------------------------------
r35675 | julianfoad | 2009-02-04 19:32:47 +0100 (Wed, 04 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite.c

Fix a bug introduced by me in r35631.

* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__column_boolean): Reverse the boolean sense of the result.

------------------------------------------------------------------------
r35676 | stsp | 2009-02-04 19:36:56 +0100 (Wed, 04 Feb 2009) | 13 lines
Changed paths:
   M /trunk/autogen.sh
   D /trunk/build/transform_sql.py
   A /trunk/build/transform_sql.sh

Replace transform_sql.py with a shell script, so we don't require
people who build Subversion to have python installed.

* build/transform_sql.py: Remove.

* build/transform_sql.sh: New file.

* autogen.sh: Use the shell script to generate rep-cache-db.sql.h.

With help from: mf
                arfrever
Also tested by: hwright

------------------------------------------------------------------------
r35677 | hwright | 2009-02-04 19:42:04 +0100 (Wed, 04 Feb 2009) | 13 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Remove all the old code for reading and writing of entries files.  The reading
code still exists in old-and-busted.c, but this not being used, and just
cluttering entries.c at this poin.

* subversion/libsvn_wc/entries.c
  (read_escaped, read_str, read_path, read_url, read_val, read_bool,
   read_revnum, read_time, read_entry, read_entries_old, write_str,
   write_val, write_bool, write_revnum, write_time, write_entry_old):
    Remove.

  (write_entry): Don't write the old-style entries file.

------------------------------------------------------------------------
r35678 | stsp | 2009-02-04 19:46:14 +0100 (Wed, 04 Feb 2009) | 4 lines
Changed paths:
   A /trunk/build/transform_sql.py (from /trunk/build/transform_sql.py:35675)

* build/transform_sql.py: Restore, this is still needed for Windows builds.

Found by: arfrever

------------------------------------------------------------------------
r35679 | arfrever | 2009-02-04 19:58:20 +0100 (Wed, 04 Feb 2009) | 4 lines
Changed paths:
   M /trunk/build/transform_sql.sh

Follow-up to r35676:

* build/transform_sql.sh: Fix indentation in the generated file.

------------------------------------------------------------------------
r35680 | cmpilato | 2009-02-04 19:59:14 +0100 (Wed, 04 Feb 2009) | 52 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/commit.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/getdate.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/property.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/ra_serf.h
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/replay.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/serf.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/update.c
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/util.c

On the 'http-protocol-v2' branch: Cleanup some overloaded APIs,
separating tasks logically without sacrificing performance (thanks to
the caching promises of the APIs, some of which are now explicitly
called out).

* subversion/libsvn_ra_serf/ra_serf.h
  (svn_ra_serf__get_relative_path): New.
  (svn_ra_serf__discover_vcc): New prototype.
  (svn_ra_serf__report_resource): Was 'svn_ra_serf__discover_root()'.
    Now focused solely on the primary task, not also on relative-path
    calculation.

* subversion/libsvn_ra_serf/util.c
  (svn_ra_serf__get_relative_path): New, cored from discover_vcc().
  (svn_ra_serf__discover_vcc): Was discover_vcc(), but a little more
    focused (doesn't do relative-path calculation any more).
  (svn_ra_serf__report_resource): Was 'svn_ra_serf__discover_root()'.
    Now focused solely on the primary task, not also on relative-path
    calculation.

* subversion/libsvn_ra_serf/commit.c
  (open_root): Use svn_ra_serf__discover_vcc() instead of
    svn_ra_serf__discover_root(vcc_only=TRUE)
  (add_directory, close_file): Use svn_ra_serf__discover_vcc() and
    svn_ra_serf__get_relative_path() instead of
    svn_ra_serf__discover_root(vcc_only=TRUE).
  (svn_ra_serf__change_rev_prop): Use svn_ra_serf__discover_vcc()
    instead of svn_ra_serf__discover_root().

* subversion/libsvn_ra_serf/getdate.c
  (svn_ra_serf__get_dated_revision): Track svn_ra_serf__discover_root() rename.

* subversion/libsvn_ra_serf/property.c
  (svn_ra_serf__get_baseline_info): Rework this in light of the
    various function changes made.

* subversion/libsvn_ra_serf/replay.c
  (replay_context_t): Rename 'vcc_url' to 'report_target'.  (Consumers tweaked.)
  (svn_ra_serf__replay, svn_ra_serf__replay_range): Use
    svn_ra_serf__report_resource() instead of svn_ra_serf__discover_root().

* subversion/libsvn_ra_serf/serf.c
  (svn_ra_serf__rev_proplist, svn_ra_serf__get_repos_root,
   svn_ra_serf__get_uuid): Use svn_ra_serf__discover_vcc() instead of
    svn_ra_serf__discover_root().

* subversion/libsvn_ra_serf/update.c
  (link_path):  Use svn_ra_serf__report_resource() and
    svn_ra_serf__get_relative_path() instead of svn_ra_serf__discover_root().
  (finish_report): Use svn_ra_serf__report_resource() instead of
    svn_ra_serf__discover_root().

------------------------------------------------------------------------
r35681 | cmpilato | 2009-02-04 20:16:11 +0100 (Wed, 04 Feb 2009) | 15 lines
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README
   M /branches/http-protocol-v2/subversion/mod_dav_svn/dav_svn.h
   M /branches/http-protocol-v2/subversion/mod_dav_svn/repos.c

On the 'http-protocol-v2' branch: Make the 'rvr' form a little more
official.

* BRANCH-README
  Update status.

* subversion/mod_dav_svn/dav_svn.h
  (DAV_SVN_RESTYPE_REVROOT_COLLECTION): Remove comment about being unused.

* subversion/mod_dav_svn/repos.c
  (parse_revroot_uri): New.  Currently just a wrapper around
    parse_baseline_coll_uri() with explanatory comments.
  (parse_txnroot_uri): Comment tweak.
  (special_subdirs): Parse 'rvr' URIs with parse_revroot_uri().

------------------------------------------------------------------------
r35682 | arfrever | 2009-02-04 20:22:02 +0100 (Wed, 04 Feb 2009) | 10 lines
Changed paths:
   M /trunk/Makefile.in
   M /trunk/autogen.sh
   M /trunk/build.conf

Generate 'subversion/libsvn_fs_fs/rep-cache-db.sql.h' when running make instead of autogen.sh.

* Makefile.in
  (subversion/libsvn_fs_fs/rep-cache-db.sql.h): Define.

* autogen.sh: Don't generate 'subversion/libsvn_fs_fs/rep-cache-db.sql.h'.

* build.conf
  (private-built-includes): Add 'subversion/libsvn_fs_fs/rep-cache-db.sql.h'.

------------------------------------------------------------------------
r35683 | sbutler | 2009-02-04 20:58:05 +0100 (Wed, 04 Feb 2009) | 31 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

More descriptive docstrings for tree conflict test functions, so that
we don't have to memorize what "2.2" means in this context.

* subversion/tests/cmdline/switch_tests.py
  (tree_conflicts_on_switch_1_1,
   tree_conflicts_on_switch_1_2,
   tree_conflicts_on_switch_2_1,
   tree_conflicts_on_switch_2_2,
   tree_conflicts_on_switch_3): Tweak docstrings.

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_1_1,
   tree_conflicts_on_update_1_2,
   tree_conflicts_on_update_2_1,
   tree_conflicts_on_update_2_2,
   tree_conflicts_on_update_2_3,
   tree_conflicts_on_update_3): Tweak docstrings.

* subversion/tests/cmdline/merge_tests.py
  (tree_conflicts_on_merge_local_ci_4_1,
   tree_conflicts_on_merge_local_ci_4_2,
   tree_conflicts_on_merge_local_ci_5_1,
   tree_conflicts_on_merge_local_ci_5_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_5_1,
   tree_conflicts_on_merge_no_local_ci_5_2,
   tree_conflicts_on_merge_no_local_ci_6): Tweak docstrings.


------------------------------------------------------------------------
r35684 | hwright | 2009-02-04 21:22:15 +0100 (Wed, 04 Feb 2009) | 9 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Don't even bother creating the entries file.  This has the happy consequence of
breaking the wc format check, since we overload the entries file for that.

* subversion/libsvn_wc/entries.c
  (write_entry): Remove unused parameter, and update docstring.
  (svn_wc__entries_write, svn_wc__entries_init): Don't open a stream or write
    to the entries file.

------------------------------------------------------------------------
r35685 | arfrever | 2009-02-04 21:26:33 +0100 (Wed, 04 Feb 2009) | 11 lines
Changed paths:
   M /trunk/Makefile.in

Follow-up to r35682:

* Makefile.in
  (subversion/libsvn_fs_fs/rep-cache-db.sql.h): Delete.
  (fast-clean): Delete *.sql.h files.
  (local-extraclean): Don't delete 'subversion/libsvn_fs_fs/rep-cache-db.sql.h'.
  (%.sql.h): Define.

Found by: hwright
          me

------------------------------------------------------------------------
r35686 | sbutler | 2009-02-04 21:32:52 +0100 (Wed, 04 Feb 2009) | 11 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py

On the issue-3334-dirs branch: A new test for issue 3334, based on the
existing test tree_conflict_uc2_schedule_re_add(), but for use case 1
(local tree delete, incoming leaf edit on update).

Currently XFAIL because our update editor still skips over tree
conflict victims.

* subversion/tests/cmdline/update_tests.py
  (tree_conflict_uc1_update_deleted_tree): New test.
  (test_list) Add new test with XFail.

------------------------------------------------------------------------
r35687 | hwright | 2009-02-04 21:42:48 +0100 (Wed, 04 Feb 2009) | 8 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/questions.c

On the explore-wc branch:
Simplify wc format checking: if you attempt to use a wc-ng client with an
earlier version of the working copy, Subversion will bail and tell you how
to upgrade.

* subversion/libsvn_wc/questions.c
  (svn_wc__check_format): Bail on any format earlier than wc-ng.

------------------------------------------------------------------------
r35688 | arfrever | 2009-02-04 22:18:44 +0100 (Wed, 04 Feb 2009) | 15 lines
Changed paths:
   M /trunk/Makefile.in
   M /trunk/build/generator/gen_make.py
   M /trunk/configure.ac

Follow-up to r35639:
Fix support for BSD make.

Found by: stsp

* configure.ac
  (canonicalized_srcdir): Define and mark for substitution.

* Makefile.in
  (canonicalized_srcdir): Define.
  (srcpath): Delete.

* build/generator/gen_make.py
  (Generator.write): Use '$(canonicalized_srcdir)' instead of '$(srcpath)'.

------------------------------------------------------------------------
r35689 | hwright | 2009-02-04 22:36:32 +0100 (Wed, 04 Feb 2009) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_files.c
   M /trunk/subversion/libsvn_wc/questions.c

Fold a function into it's only call site, and remove a bit of code duplication.

* subversion/libsvn_wc/adm_files.c
  (check_adm_exists): Remove, folding some funcationality into...
  (svn_wc_ensure_adm3): ...this.  Also, use the existing format check to
    determine if a working copy exists or is new enough.

* subversion/libsvn_wc/questions.c
  (svn_wc_check_wc): Remove a comment referencing a nonexistent function.

------------------------------------------------------------------------
r35690 | hwright | 2009-02-05 00:15:08 +0100 (Thu, 05 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/lock.c
   M /trunk/subversion/libsvn_wc/questions.c

Remove more code duplication in libsvn_wc.

* subversion/libsvn_wc/lock.c
  (do_open): Instead of checking the format file manually, just call
    svn_wc_check_wc(), wrapping it with the appropriate error.

* subversion/libsvn_wc/questions.c
  (svn_wc_check_wc): Remove comment about duplicated code.

------------------------------------------------------------------------
r35691 | cmpilato | 2009-02-05 15:46:29 +0100 (Thu, 05 Feb 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Update TODO list.
------------------------------------------------------------------------
r35692 | cmpilato | 2009-02-05 15:50:52 +0100 (Thu, 05 Feb 2009) | 14 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/mod_dav_svn/activity.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/dav_svn.h
   M /branches/http-protocol-v2/subversion/mod_dav_svn/repos.c

On the 'http-protocol-v2' branch: Teach mod_dav_svn to handle DELETEs
on a transaction resource.  [UNTESTED]

* subversion/mod_dav_svn/dav_svn.h
  (dav_svn__abort_txn): New.
  
* subversion/mod_dav_svn/activity.c
  (dav_svn__abort_txn): New, cored from ...
  (dav_svn__delete_activity): ... this, which now uses svn_dav__abort_txn().

* subversion/mod_dav_svn/repos.c
  (remove_resource): If the DELETE is against a transaction resource,
    use dav_svn__abort_txn() to remove it.

------------------------------------------------------------------------
r35693 | cmpilato | 2009-02-05 15:54:44 +0100 (Thu, 05 Feb 2009) | 7 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/libsvn_ra_serf/commit.c

On the 'http-protocol-v2' branch: Perform post-commit and abort-commit
cleanups HTTP-v2-style, now, too.

* subversion/libsvn_ra_serf/commit.c
  (close_edit): Only DELETE the activity if we used one (non-v2).
  (abort_edit): DELETE the transaction in HTTP v2, the activity otherwise.

------------------------------------------------------------------------
r35694 | hwright | 2009-02-05 16:48:29 +0100 (Thu, 05 Feb 2009) | 3 lines
Changed paths:
   M /trunk/build/transform_sql.sh

* build/transform_sql.sh:
  Parameterize the generated variable name based upon the input file.

------------------------------------------------------------------------
r35695 | hwright | 2009-02-05 16:51:45 +0100 (Thu, 05 Feb 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/Makefile.in
   M /branches/explore-wc/autogen.sh
   M /branches/explore-wc/build/ac-macros/berkeley-db.m4
   M /branches/explore-wc/build/generator/gen_make.py
   A /branches/explore-wc/build/transform_sql.sh (from /trunk/build/transform_sql.sh:35693)
   M /branches/explore-wc/build.conf
   M /branches/explore-wc/configure.ac
   M /branches/explore-wc/subversion/libsvn_client/commit_util.c
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/bdb-err.c
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/bdb_compat.h
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/changes-table.h
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/env.h
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/nodes-table.h
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/reps-table.h
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/rev-table.h
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/strings-table.h
   M /branches/explore-wc/subversion/libsvn_fs_base/bdb/uuids-table.h
   M /branches/explore-wc/subversion/libsvn_fs_base/fs.c
   M /branches/explore-wc/subversion/libsvn_fs_base/fs.h
   M /branches/explore-wc/subversion/libsvn_fs_base/node-rev.c
   M /branches/explore-wc/subversion/libsvn_fs_base/node-rev.h
   M /branches/explore-wc/subversion/libsvn_fs_base/reps-strings.c
   M /branches/explore-wc/subversion/libsvn_fs_base/reps-strings.h
   M /branches/explore-wc/subversion/libsvn_fs_base/revs-txns.h
   M /branches/explore-wc/subversion/libsvn_fs_base/trail.c
   M /branches/explore-wc/subversion/libsvn_fs_base/trail.h
   M /branches/explore-wc/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/explore-wc/subversion/libsvn_subr/sqlite.c
   M /branches/explore-wc/subversion/libsvn_wc/adm_files.c
   M /branches/explore-wc/subversion/libsvn_wc/lock.c
   M /branches/explore-wc/subversion/libsvn_wc/questions.c
   M /branches/explore-wc/subversion/svn_private_config.hw
   M /branches/explore-wc/subversion/tests/cmdline/merge_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/switch_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/update_tests.py

On the explore-wc branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r35696 | hwright | 2009-02-05 17:36:07 +0100 (Thu, 05 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_subr/sqlite.c

Add an sqlite API to fetch the current schema version of the database.

* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__get_schema_version): New.
  (check_format): Use the new API.

* subversion/include/private/svn_sqlite.h
  (svn_sqlite__get_schema_version): New.

------------------------------------------------------------------------
r35697 | hwright | 2009-02-05 17:56:33 +0100 (Thu, 05 Feb 2009) | 10 lines
Changed paths:
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_subr/sqlite.c

Don't force a consumer to provide upgrade SQL when opening an sqlite database.
We may have circumstances where we want to open the database, query the 
schema version, and quit, without bothering to upgrade the schema.

* subversion/libsvn_subr/sqlite.c
  (check_format): Open upgrade if we've got sql to execute.
 
* subversion/include/private/svn_sqlite.h
  (svn_sqlite__open): Update docstring.

------------------------------------------------------------------------
r35698 | hwright | 2009-02-05 18:41:09 +0100 (Thu, 05 Feb 2009) | 14 lines
Changed paths:
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_subr/sqlite.c

More bumbling about in the sqlite API.  This implements a simpler schema
version check, rather than bumbling about with existing APIs.  This change
also reverts r35697, because it makes it unneeded.

* subversion/libsvn_subr/sqlite.c
  (get_schema): Largely copied from the old svn_sqlite__get_schema_version().
  (check_format): Require upgrade sql, and update call to the format
    fetching function.
  (svn_sqlite__get_schema_version): New implementation.

* subversion/include/private/svn_sqlite.h
  (svn_sqlite__get_schema_version): Update arguments and docstring.
  (svn_sqlite__open): Update docstring.

------------------------------------------------------------------------
r35699 | pburba | 2009-02-05 18:45:50 +0100 (Thu, 05 Feb 2009) | 10 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py

On the issue-3334-dirs branch: Tweak an update test's expectations to
reflect the fact that issue #3334 is not completely addressed.

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_1_2): Update test expectations such that a 
  modify-on-deleted tree conflict leaves the target updated to the 
  target revision and still scheduled for deletion.
  (test_list): Set tree_conflicts_on_update_1_2 to XFail till issue #3334 is
  completely addressed.

------------------------------------------------------------------------
r35700 | sussman | 2009-02-05 20:25:42 +0100 (Thu, 05 Feb 2009) | 14 lines
Changed paths:
   M /branches/http-protocol-v2/subversion/mod_dav_svn/deadprops.c
   M /branches/http-protocol-v2/subversion/mod_dav_svn/repos.c

Teach mod_dav_svn to handle propchanges on our new 'txn','txr', 'rev' objects.

...in theory.  :-)   Not tested, but at least it doesn't break the test suite.

* subversion/mod_dav_svn/deadprops.c 
  (save_value):  refactor logic to understand both protocol v1 and v2 resources.

* subversion/mod_dav_svn/repos.c 
  (prep_private):  set exists flag, so that dav_method_proppatch won't
                   reject new 'txn' objects.




------------------------------------------------------------------------
r35701 | hwright | 2009-02-05 20:41:42 +0100 (Thu, 05 Feb 2009) | 14 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/README
   M /trunk/subversion/libsvn_wc/adm_files.c
   M /trunk/subversion/libsvn_wc/log.c

Don't create the format file in the the WC administrative area.  This file
has been deprecated since 1.4, and only existed as a nicety for ancient working
copies.

* subversion/libsvn_wc/adm_files.c
  (init_adm): Don't create the format file.

* subversion/libsvn_wc/README:
  Update documentation regarding the format file.

* subversion/libsvn_wc/log.c
  (log_do_upgrade_format): In place of rewriting the format file, just remove
    it.

------------------------------------------------------------------------
r35702 | stsp | 2009-02-05 21:08:51 +0100 (Thu, 05 Feb 2009) | 2 lines
Changed paths:
   M /branches/issue-3334-dirs
   M /branches/issue-3334-dirs/Makefile.in
   M /branches/issue-3334-dirs/TODO-1.6
   M /branches/issue-3334-dirs/autogen.sh
   M /branches/issue-3334-dirs/build/ac-macros/berkeley-db.m4
   M /branches/issue-3334-dirs/build/ac-macros/swig.m4
   M /branches/issue-3334-dirs/build/generator/gen_make.py
   A /branches/issue-3334-dirs/build/transform_sql.sh (from /trunk/build/transform_sql.sh:35701)
   M /branches/issue-3334-dirs/build.conf
   M /branches/issue-3334-dirs/configure.ac
   M /branches/issue-3334-dirs/contrib/client-side/emacs/psvn.el
   M /branches/issue-3334-dirs/notes/http-protocol-v2.txt
   M /branches/issue-3334-dirs/subversion/include/private/svn_sqlite.h
   M /branches/issue-3334-dirs/subversion/libsvn_client/commit_util.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/bdb-err.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/bdb_compat.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/changes-table.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/dbt.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/dbt.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/env.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/nodes-table.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/reps-table.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/rev-table.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/strings-table.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/bdb/uuids-table.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/fs.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/fs.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/node-rev.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/node-rev.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/reps-strings.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/reps-strings.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/revs-txns.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/trail.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/trail.h
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/util/fs_skels.h
   M /branches/issue-3334-dirs/subversion/libsvn_subr/sqlite.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/README
   M /branches/issue-3334-dirs/subversion/libsvn_wc/adm_files.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/lock.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/log.c
   M /branches/issue-3334-dirs/subversion/libsvn_wc/questions.c
   M /branches/issue-3334-dirs/subversion/svn_private_config.hw
   M /branches/issue-3334-dirs/subversion/tests/cmdline/merge_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/switch_tests.py
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py

Sync the issue-3334-dirs branch with trunk.

------------------------------------------------------------------------
r35703 | rhuijben | 2009-02-05 22:22:18 +0100 (Thu, 05 Feb 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast vote on r35297 group
------------------------------------------------------------------------
r35704 | hwright | 2009-02-05 22:28:29 +0100 (Thu, 05 Feb 2009) | 8 lines
Changed paths:
   M /trunk/build/transform_sql.sh

Fix transform_sql.sh so that comments are allowed on the same line as
column definitions (see lock.lock_date in wc-metadata.sql for an example).
Also, trim empty lines from the output file.

* build/transform_sql.sh:
  Strip C-style comments and empty lines from the output file.  Ensure that
  each final line ends with a space.

------------------------------------------------------------------------
r35705 | hwright | 2009-02-05 22:30:29 +0100 (Thu, 05 Feb 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/build/transform_sql.sh
   M /branches/explore-wc/subversion/include/private/svn_sqlite.h
   M /branches/explore-wc/subversion/libsvn_subr/sqlite.c
   M /branches/explore-wc/subversion/libsvn_wc/README
   M /branches/explore-wc/subversion/libsvn_wc/adm_files.c
   M /branches/explore-wc/subversion/libsvn_wc/log.c

On the explore-wc branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r35706 | stsp | 2009-02-05 22:35:06 +0100 (Thu, 05 Feb 2009) | 12 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c

On the issue-3334-dirs branch, sprinkle small fixes. No functional change.

* subversion/libsvn_wc/update_editor.c
  (entry_has_local_mods, do_entry_deletion): Fix indentation changes
   which crept in in r35667.
  (set_copied_callback): Give the reader a hint about the nature of
   the return value of svn_path_compare_paths().  Improve a comment
   that seemed to talk about notifications at the UI level at first
   glance, but actually meant to talk about flags in entries files.

Review by: pburba

------------------------------------------------------------------------
r35707 | rhuijben | 2009-02-05 23:14:46 +0100 (Thu, 05 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_base/lock.c
   M /trunk/subversion/libsvn_fs_base/tree.c

* subversion/libsvn_fs_base/lock.c
* subversion/libsvn_fs_base/tree.c
  (global): Following up on r35665, #define SVN_WANT_BDB before including
    svn_private_config.h.

------------------------------------------------------------------------
r35708 | hwright | 2009-02-05 23:16:49 +0100 (Thu, 05 Feb 2009) | 7 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/questions.c

On the explore-wc branch:
When checking the format of the working copy, first check the database version.

* subversion/libsvn_wc/questions.c
  (svn_wc_check_wc): Check the sqlite database version before checking for
    older working copy formats and versions.

------------------------------------------------------------------------
r35709 | stsp | 2009-02-05 23:51:43 +0100 (Thu, 05 Feb 2009) | 14 lines
Changed paths:
   M /trunk/Makefile.in
   M /trunk/build/generator/gen_win.py
   M /trunk/build.conf
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c

Fix build with BSD make.

* Makefile.in: Don't use GNU-specific static pattern ("%.o: %c"-style
   syntax) to build a header file from an sql file. Use suffix rules
   instead, like the rest of the Makefile already does.

* build.conf,
  subversion/libsvn_fs_fs/rep-cache.c: For suffix rules to work, the target
   filename may contain only a single dot. So rename rep-cache-db.sql.h to
   just rep-cache-db.h.

* build/generator/gen_win.py: Try not to break the Windows build and track
   the rename made in build.conf and rep-cache.c.

------------------------------------------------------------------------
r35710 | rhuijben | 2009-02-05 23:59:32 +0100 (Thu, 05 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs

* subversion/libsvn_fs_fs
  (svn:ignore): replace rep-cache-db.sql.h with rep-cache-db.h.

------------------------------------------------------------------------
r35711 | pburba | 2009-02-06 00:13:38 +0100 (Fri, 06 Feb 2009) | 1 line
Changed paths:
   M /branches/issue-3334-dirs
   M /branches/issue-3334-dirs/Makefile.in
   M /branches/issue-3334-dirs/build/generator/gen_win.py
   M /branches/issue-3334-dirs/build/transform_sql.sh
   M /branches/issue-3334-dirs/build.conf
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/lock.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_base/tree.c
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs
   M /branches/issue-3334-dirs/subversion/libsvn_fs_fs/rep-cache.c

On the issue-3334-dirs branch: Merge changes from trunk up to r35710.
------------------------------------------------------------------------
r35712 | rhuijben | 2009-02-06 01:02:54 +0100 (Fri, 06 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/tests/libsvn_subr/mergeinfo-test.c

* subversion/tests/libsvn_subr/mergeinfo-test.c
  (NBR_MERGEINFO_VALS, mergeinfo_vals, mergeinfo_paths):
    Following up on r35466, issue #3302, show that a range completely
    inside another range shrinks the largest range to end at the end of the
    shorter range. (1-77,12-44 => 1-44).

Found by: me
(While reviewing r35466 for backport)

------------------------------------------------------------------------
r35713 | rhuijben | 2009-02-06 01:06:31 +0100 (Fri, 06 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/mergeinfo.c
  (parse_revision_line): Following up on r35466, fix the overlapping
    calculation issue shown in r35712 by making sure we only extend
    the range, and never shrink it.

------------------------------------------------------------------------
r35714 | rhuijben | 2009-02-06 01:10:49 +0100 (Fri, 06 Feb 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Add r35712,r35713 to the r35466 group and cast a vote on the group
------------------------------------------------------------------------
r35715 | rhuijben | 2009-02-06 01:24:16 +0100 (Fri, 06 Feb 2009) | 1 line
Changed paths:
   M /branches/1.5.x/STATUS

* STATUS: Cast vote on r35516.
------------------------------------------------------------------------
r35716 | pburba | 2009-02-06 02:09:45 +0100 (Fri, 06 Feb 2009) | 10 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/libsvn_wc/update_editor.c

On the issue-3334-dirs branch: Follow-up to r35667, remove some uneccessary
code and clarify a comment.

* subversion/libsvn_wc/update_editor.c
  (schedule_existing_item_for_re_add): Clarify a comment that really
  needed it.  Don't set the 'deleted' entry field of the parent of a
  re-added tree.  Why I did this in the first place is a complete mystery.
  Was it a cut-and-paste error?  Too much glue sniffing?  TC brain rot?
  Let that be a lesson to you kids: Write the comment when you write the
  code.  If they don't match, be worried.
------------------------------------------------------------------------
r35717 | cauchy | 2009-02-06 03:22:40 +0100 (Fri, 06 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/po/zh_CN.po

Simplified chinese translation update.

* subversion/po/zh_CN.po: Update to r35713, and trim file location.
------------------------------------------------------------------------
r35718 | cauchy | 2009-02-06 03:44:11 +0100 (Fri, 06 Feb 2009) | 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: Backport from trunk.

------------------------------------------------------------------------
r35719 | hwright | 2009-02-06 14:34:05 +0100 (Fri, 06 Feb 2009) | 8 lines
Changed paths:
   M /trunk/build/generator/gen_win.py

A few cleanups for generating the sql headers on windows.  I do not have a
Windows build, and thus have no way of testing this.

* build/generator/gen_win.py
  (__init__): Update caller.
  (_create_sqlite_headers): Renamed from _create_sqlite_header(), and made
    a bit more extensible for adding future derived files.

------------------------------------------------------------------------
r35720 | hwright | 2009-02-06 14:46:01 +0100 (Fri, 06 Feb 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/Makefile.in
   M /branches/explore-wc/build/generator/gen_win.py
   M /branches/explore-wc/build.conf
   M /branches/explore-wc/subversion/libsvn_fs_base/lock.c
   M /branches/explore-wc/subversion/libsvn_fs_base/tree.c
   M /branches/explore-wc/subversion/libsvn_fs_fs
   M /branches/explore-wc/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/explore-wc/subversion/libsvn_subr/mergeinfo.c
   M /branches/explore-wc/subversion/po/zh_CN.po
   M /branches/explore-wc/subversion/tests/libsvn_subr/mergeinfo-test.c

On the explore-wc branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r35721 | hwright | 2009-02-06 14:59:43 +0100 (Fri, 06 Feb 2009) | 13 lines
Changed paths:
   M /branches/explore-wc/build.conf
   M /branches/explore-wc/subversion/libsvn_wc
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Rename the generated wc-metadata sql header file for consistency with the
other generated sql header file.

* build.conf
  (private-built-includes): Rename the wc-metadata header.

* subversion/libsvn_wc:
  Change the ignored header name.

* subversion/libsvn_wc/entries.c:
  Include the right header name.

------------------------------------------------------------------------
r35722 | hwright | 2009-02-06 15:31:57 +0100 (Fri, 06 Feb 2009) | 16 lines
Changed paths:
   M /branches/explore-wc/subversion/include/svn_error_codes.h
   M /branches/explore-wc/subversion/libsvn_wc/questions.c
   M /branches/explore-wc/subversion/libsvn_wc/wc_db.c
   M /branches/explore-wc/subversion/libsvn_wc/wc_db.h

On the explore-wc branch:
Move the metadata version detecting logic to wc_db.

* subversion/include/svn_error_codes.h
  (SVN_ERR_WC_MISSING): New.

* subversion/libsvn_wc/questions.c
  (svn_wc_check_wc): Remove most of the logic, which moved into wc_db.  Wrap
    the wc_db version of the function to ensure the proper errors are returned.
 
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_version): New.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_version): New.

------------------------------------------------------------------------
r35723 | julianfoad | 2009-02-06 15:50:45 +0100 (Fri, 06 Feb 2009) | 14 lines
Changed paths:
   M /trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
   M /trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
   M /trunk/subversion/bindings/swig/perl/native/Client.pm
   M /trunk/subversion/bindings/swig/svn_client.i

Make diff_summarize callable from Perl binding.

Patch by: James Fang <june.fang{_AT_}gmail.com>

[in subversion/bindings/swig]
* svn_client.i
    Add a typemap for (svn_client_diff_summarize_func_t, void*) arguments sequence.
* perl/libsvn_swig_perl/swigutil_pl.h,
* perl/libsvn_swig_perl/swigutil_pl.c
    (svn_swig_pl_thunk_client_diff_summarize_func): New callback thunk function.
* perl/native/Client.pm
    Document the diff_summarize method.
    Expose svn_client_diff_summarize_kind_t as SVN::Client::Summarize::*.

------------------------------------------------------------------------
r35724 | cmpilato | 2009-02-06 16:07:35 +0100 (Fri, 06 Feb 2009) | 1 line
Changed paths:
   M /branches/http-protocol-v2/BRANCH-README

Update status.
------------------------------------------------------------------------
r35725 | rhuijben | 2009-02-06 16:23:51 +0100 (Fri, 06 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
  (global): Move the APR includes before the perl includes to fix
    Windows build issues around IPv6 support.

------------------------------------------------------------------------
r35726 | pburba | 2009-02-06 19:35:27 +0100 (Fri, 06 Feb 2009) | 9 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/tests/cmdline/update_tests.py

On the issue-3334-dirs branch: Tweak an update test's expectations.

Follow-up to r35699.

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_1_2): When a leaf delete lands on a local tree
  delete, the former should be removed from the expected disk *and* the
  expected status.

------------------------------------------------------------------------
r35727 | pburba | 2009-02-06 19:40:05 +0100 (Fri, 06 Feb 2009) | 10 lines
Changed paths:
   M /branches/issue-3334-dirs/subversion/tests/cmdline/switch_tests.py

On the issue-3334-dirs branch: Tweak a switch test's expectations to
reflect the fact that issue #3334 is not completely addressed.

* subversion/tests/cmdline/switch_tests.py
  (tree_conflicts_on_switch_1_2): When a leaf delete lands on a local tree
  delete, the former should be removed from expected disk and
  expected status and the working revision of the locally deleted tree
  should be updated to the target revision.
  (test_list): Set tree_conflicts_on_switch_1_2 to XFail till issue #3334 is
  completely addressed.
------------------------------------------------------------------------
r35728 | rhuijben | 2009-02-06 23:48:51 +0100 (Fri, 06 Feb 2009) | 14 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove the svn_dirent_*/svn_uri_* from the 1.6 blocker list
  
I reviewed the public api to make sure it is in a state that we can support
for 1.6+. 

This new API cleans up a lot of the old unified path code by separating code
paths for different path types and it already resolves several path 
normalization issues of previous releases. Most importantly it allows future
improvements of the separate codepaths which was almost impossible via the
one path api for all approach previously used.

See also
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1106748

------------------------------------------------------------------------
r35729 | hwright | 2009-02-07 00:32:01 +0100 (Sat, 07 Feb 2009) | 10 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite.c

Instead of guarding against multiple invocations of init_sqlite() externally,
move the static variable and the checking of it's value internal.  This also
allows svn_sqlite__get_schema_version() to initialize the library.

* subversion/libsvn_subr/sqlite.c
  (init_sqlite): Return immediately if the library has been initialized.
  (svn_sqlite__get_schema_version): Initialize the sqlite library.
  (svn_sqlite__open): Unconditionally initialize the sqlite library, since it
    now does internal invocation checking.

------------------------------------------------------------------------
r35730 | rhuijben | 2009-02-07 03:02:14 +0100 (Sat, 07 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/include/svn_dirent_uri.h

* subversion/include/svn_dirent_uri.h
  (global): Add top level comment that explicitly declares that all arguments
    passed to the uri and dirent functions are expected to be canonical.

------------------------------------------------------------------------
r35731 | rhuijben | 2009-02-07 03:40:51 +0100 (Sat, 07 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/dirent_uri.c

Use a locale insensitive tolower and toupper when canonicalizing urls.
Canonicalization should not depend on the active locale.
(And profiling showed that this was actually the most heavy part of
 the whole canonicalize function)

* subversion/libsvn_subr/dirent_uri.c
  (dirent_to_lower, dirent_to_upper): New functions.
  (canonicalize): Use locale insensitive variants.

[[[[ jonb ]]]]
------------------------------------------------------------------------
r35840 | sbutler | 2009-02-13 13:00:57 +0100 (Fri, 13 Feb 2009) | 63 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/cmdline/checkout_tests.py
   M /trunk/subversion/tests/cmdline/switch_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

For issue 3209, fix the "local add, incoming add" and "local
obstruction, incoming add" use cases for update/switch/checkout.
Adjust the tests to cover my tracks. ;-)  

Here's what add_{directory,file}() now check (in order):

1. True obstruction: "non-{dir,file} object of the same name" error.

2. Unversioned obstruction: "unversioned {dir,file} of the same name"
   error (unless the operation has the --force option).

3. UUID mismatch: "checked out from a different repo" error.

4. URL mismatch: "does not match expected URL" error.

5. Local dir is a working copy but is missing from parent entry:
   "independent working copy" error.  I invented this one to avoid a
   strange "unversioned working copy" situation:

   $ svn st svn-test-work/working_copies/switch_tests-21/A/D/G
   ?     C svn-test-work/working_copies/switch_tests-21/A/D/G/I
         >   local add, incoming add upon switch

   ### If I understood our working copy locking better, I'd hack
   add_directory() to incorporate the pre-existing working copy into
   its new parent.

6. Added with history: tree conflict.  The victim tree is skipped.
   
Currently, a local add *without* history is *not* a tree conflict.
The update/sw/co continues, possibly raising text or prop conflicts.
Is this OK?


* subversion/libsvn_wc/update_editor.c
  (add_directory): Add a test for the "independent working copy"
   error.  Simplify the condition for a tree conflict.  Update the
   summary comment.
  (add_file): Simplify the condition for a tree conflict.  Update the
   summary comment.

* subversion/tests/cmdline/switch_tests.py
  (forced_switch_failures): Expect "independent wc" error instead of a
   tree conflict on an "unversioned working copy".
  (test_list): Remove XFail from forced_switch_failures.

* subversion/tests/cmdline/update_tests.py
  (forced_update_failures): Expect "independent wc" error instead of an
   "already exists" error on an "unversioned working copy".  We had
   raised a tree conflict here.
  (update_with_obstructing_additions): Expect an add-add tree conflict
   instead of an error.  Resolve and expect the same conflict when
   updating with --force.  Repeat with a file victim.
  (test_list): Remove XFail from forced_update_failures and
   update_with_obstructing_additions.

* subversion/tests/cmdline/checkout_tests.py
  (forced_checkout_with_versioned_obstruction): Expect "independent
   wc" error instead of a tree conflict in "unversioned working copy".
  (co_with_obstructing_local_adds): Expect add-add tree conflicts
   instead of errors for local adds-with-history.  Skip the victims.
  (test_list): Remove XFail from co_with_obstructing_local_adds.

------------------------------------------------------------------------
r35841 | fabien | 2009-02-13 13:27:21 +0100 (Fri, 13 Feb 2009) | 5 lines
Changed paths:
   M /trunk/tools/client-side/bash_completion

Add "Header" keyword completion (available since r35386).

* tools/client-side/bash_completion
  (_svn) "Header" keyword added to completion.

------------------------------------------------------------------------
r35842 | sbutler | 2009-02-13 14:33:51 +0100 (Fri, 13 Feb 2009) | 19 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/update_editor.c
   M /trunk/subversion/tests/cmdline/checkout_tests.py
   M /trunk/subversion/tests/cmdline/switch_tests.py
   M /trunk/subversion/tests/cmdline/update_tests.py

For issue 3209, change an error message back to what it was in 1.5 and
print error-message paths in local style.  (Corrections for r35840.)

* subversion/libsvn_wc/update_editor.c
  (add_directory): Replace the "independent working copy" error
   message, which is a bit vague, with the old "already exists"
   message.  Print local-style paths.
  (add_file): Print local-style paths.

* subversion/tests/cmdline/switch_tests.py
  (forced_switch_failures): Tweak an error expectation.

* subversion/tests/cmdline/update_tests.py
  (forced_update_failures): Tweak an error expectation.

* subversion/tests/cmdline/checkout_tests.py
  (forced_checkout_with_versioned_obstruction): Tweak error
   expectations.

------------------------------------------------------------------------
r35843 | rhuijben | 2009-02-13 15:11:19 +0100 (Fri, 13 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/crop.c

* subversion/libsvn_wc/crop.c
  (svn_wc_crop_tree): Return an actual error on unsupported conditions
    instead of just returning OK.

------------------------------------------------------------------------
r35844 | rhuijben | 2009-02-13 15:14:37 +0100 (Fri, 13 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/crop.c

* subversion/libsvn_wc/crop.c
  (svn_wc_crop_tree): Following up on r35843, pass the right number of
    arguments to svn_error_create (and test the right workingcopy).

------------------------------------------------------------------------
r35845 | rhuijben | 2009-02-13 16:32:52 +0100 (Fri, 13 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_client/commit.c

Fix one of the TODOs in issue #3366: allow non recursive commits of
directories that don't have child nodes.
(NB: This also allows deleting directories checked out with depth empty
 and no checked out children)

* subversion/libsvn_client/commit.c
  (check_nonrecursive_dir_delete): Only return an error if there are
    more than one working copy entries for this directory.

------------------------------------------------------------------------
r35846 | hwright | 2009-02-13 16:34:40 +0100 (Fri, 13 Feb 2009) | 7 lines
Changed paths:
   M /trunk/Makefile.in
   M /trunk/build/generator/gen_win.py
   M /trunk/build.conf
   M /trunk/subversion/libsvn_fs_fs
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c
   M /trunk/subversion/tests/cmdline/commit_tests.py

Revert r35748, in accordance with the sentiment described in this thread:
http://svn.haxx.se/dev/archive-2009-02/0151.shtml

[ There were accidental changes to subversion/tests/cmdline/commit_tess.py
  committed with the revert.  Those changes were themselves reverted in
  r35848. ]

------------------------------------------------------------------------
r35847 | pburba | 2009-02-13 17:02:20 +0100 (Fri, 13 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.py

Follow-up to r35836 and r35840, remove conditional XFail on
tree_conflict_tests 4.

* subversion/tests/cmdline/tree_conflict_tests.py
  (up_sw_file_add_onto_add): Expect up_sw_file_add_onto_add to pass over
  all RA layers and with all http libraries.  Since r35840 this test no
  longer triggers issue #1736.
  

------------------------------------------------------------------------
r35848 | hwright | 2009-02-13 17:04:17 +0100 (Fri, 13 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/commit_tests.py

Revert accidental changes committed in r35846.  That'll teach me to triple 
check my working copy before committing!

------------------------------------------------------------------------
r35849 | arfrever | 2009-02-13 17:09:10 +0100 (Fri, 13 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/include/svn_auth.h

* subversion/include/svn_auth.h
  (svn_auth_get_ssl_client_cert_pw_file_provider2,
   svn_auth_get_ssl_client_cert_pw_file_provider): Fix doc strings.

------------------------------------------------------------------------
r35850 | arfrever | 2009-02-13 17:22:26 +0100 (Fri, 13 Feb 2009) | 12 lines
Changed paths:
   M /trunk/subversion/bindings/ctypes-python/test/remoterepos.py
   M /trunk/subversion/bindings/swig/python/svn/core.py
   M /trunk/tools/dev/contribulyze.py
   M /trunk/tools/hook-scripts/svn2feed.py

Use decorators to simplify some definitions.

* subversion/bindings/ctypes-python/test/remoterepos.py
  (RemoteRepositoryTestCase._log_func):
* subversion/bindings/swig/python/svn/core.py
  (SubversionException._new_from_err_list):
* tools/dev/contribulyze.py
  (Contributor.get, Contributor.parse):
* tools/hook-scripts/svn2feed.py
  (Svn2RSS.get_default_file_extension,
   Svn2Atom.get_default_file_extension): Use decorators.

------------------------------------------------------------------------
r35851 | arfrever | 2009-02-13 17:28:37 +0100 (Fri, 13 Feb 2009) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_client/copy.c
   M /trunk/subversion/libsvn_client/diff.c
   M /trunk/subversion/libsvn_client/externals.c
   M /trunk/subversion/libsvn_subr/path.c
   M /trunk/subversion/svn/util.c

* subversion/libsvn_client/copy.c
  (repos_to_wc_copy_single): Update comments.

* subversion/libsvn_client/diff.c
  (do_diff_summarize): Update comment.

* subversion/libsvn_client/externals.c
  (handle_externals_desc_change): Fix indentation.

* subversion/libsvn_subr/path.c
  (svn_path_url_add_component2): Fix indentation.

* subversion/svn/util.c
  (svn_cl__node_description): Fix indentation.

------------------------------------------------------------------------
r35852 | arfrever | 2009-02-13 17:48:08 +0100 (Fri, 13 Feb 2009) | 33 lines
Changed paths:
   M /trunk/build/ac-macros/swig.m4
   M /trunk/subversion/bindings/swig/core.i
   M /trunk/subversion/bindings/swig/include/svn_string.swg
   M /trunk/subversion/bindings/swig/include/svn_types.swg
   M /trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /trunk/subversion/bindings/swig/svn_delta.i
   M /trunk/subversion/bindings/swig/svn_fs.i
   M /trunk/subversion/bindings/swig/svn_wc.i

Fix building Ruby bindings with Ruby 1.9.

* build/ac-macros/swig.m4
  (SVN_FIND_SWIG): Use appropriate -I options.

* subversion/bindings/swig/core.i: Use RSTRING_LEN().

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
  (): Include <version.h>.
  (rb_holder_pop, svn_swig_rb_set_pool, svn_swig_rb_to_apr_array_row_prop,
   svn_swig_rb_to_apr_array_prop, svn_swig_rb_array_to_apr_array_revision_range,
   name, read_handler_rbio): Use RARRAY_LEN(), RARRAY_PTR() and RSTRING_LEN().
  (callback_rescue): Use rb_errinfo() instead of ruby_errinfo when Ruby >=1.9 is used.

* subversion/bindings/swig/include/svn_types.swg
  (_swig_rb_closed): Use RSTRING_LEN().

* subversion/bindings/swig/include/svn_string.swg
  (%typemap(in) svn_stringbuf_t *, %typemap(in) svn_stringbuf_t *node_name,
   %typemap(in) const svn_string_t * (svn_string_t value)): Use RSTRING_LEN().


Unrelated changes which fix 'implicit declarations of svn_md5_digest_to_cstring()'
and some 'casts to pointer from integer of different size' accidentally discovered
when building Ruby bindings with Ruby 1.9:

* subversion/bindings/swig/core.i: Include svn_md5_h.swg.
* subversion/bindings/swig/svn_fs.i:
* subversion/bindings/swig/svn_wc.i:
* subversion/bindings/swig/svn_delta.i: Include "svn_md5.h" to get the
    prototype for svn_md5_digest_to_cstring() (used in some typemaps in
    svn_types.swg).

------------------------------------------------------------------------
r35853 | hwright | 2009-02-13 17:48:30 +0100 (Fri, 13 Feb 2009) | 9 lines
Changed paths:
   M /trunk/build/transform_sql.py

Make the python sql transformer easier to use for third-party consumers.

Patch by: steveking
          me

* build/transform_sql.py
  (usage_and_exit): Update usage.
  (main): Use the second arg as the output name.

------------------------------------------------------------------------
r35854 | rhuijben | 2009-02-13 17:52:04 +0100 (Fri, 13 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_client/update.c

* subversion/libsvn_client/update.c
  (svn_client__update_internal): Following up on r35843,r35844 don't try to
    crop files while updating

------------------------------------------------------------------------
r35855 | rhuijben | 2009-02-13 18:05:35 +0100 (Fri, 13 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_client/update.c

* subversion/libsvn_client/update.c
  (global): Following up on r35854, include svn_dirent_uri.h.

------------------------------------------------------------------------
r35856 | rhuijben | 2009-02-13 18:24:45 +0100 (Fri, 13 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_client/update.c

* subversion/libsvn_client/update.c
  (global): Include svn_dirent_uri.h before svn_path.h to remove
    duplicate declaration warning.
  (svn_client__update_internal): Add missing const.

------------------------------------------------------------------------
r35857 | rhuijben | 2009-02-13 18:33:19 +0100 (Fri, 13 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/update.c

* subversion/libsvn_client/deprecated.c
  (svn_client_update,svn_client_update2): Move these functions ...
* subversion/libsvn_client/update.c
  (svn_client_update,svn_client_update2): ... to this file.

------------------------------------------------------------------------
r35858 | rhuijben | 2009-02-13 18:43:46 +0100 (Fri, 13 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_client/update.c

* subversion/libsvn_client/update.c
  (svn_client__update_internal): Following up on r35843,r35844,
    another attempt to fix the crop bug on the buildbot.

------------------------------------------------------------------------
r35859 | hwright | 2009-02-13 19:18:46 +0100 (Fri, 13 Feb 2009) | 3 lines
Changed paths:
   M /branches/explore-wc
   M /branches/explore-wc/Makefile.in
   M /branches/explore-wc/TODO-1.6
   M /branches/explore-wc/build/ac-macros/swig.m4
   M /branches/explore-wc/build/generator/gen_win.py
   M /branches/explore-wc/build/transform_sql.py
   M /branches/explore-wc/build.conf
   M /branches/explore-wc/contrib/client-side/emacs/psvn.el
   M /branches/explore-wc/subversion/bindings/ctypes-python/test/remoterepos.py
   M /branches/explore-wc/subversion/bindings/swig/core.i
   M /branches/explore-wc/subversion/bindings/swig/include/svn_string.swg
   M /branches/explore-wc/subversion/bindings/swig/include/svn_types.swg
   M /branches/explore-wc/subversion/bindings/swig/python/svn/core.py
   M /branches/explore-wc/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
   M /branches/explore-wc/subversion/bindings/swig/svn_delta.i
   M /branches/explore-wc/subversion/bindings/swig/svn_fs.i
   M /branches/explore-wc/subversion/bindings/swig/svn_wc.i
   M /branches/explore-wc/subversion/include/svn_auth.h
   M /branches/explore-wc/subversion/include/svn_wc.h
   M /branches/explore-wc/subversion/libsvn_client/commit.c
   M /branches/explore-wc/subversion/libsvn_client/copy.c
   M /branches/explore-wc/subversion/libsvn_client/deprecated.c
   M /branches/explore-wc/subversion/libsvn_client/diff.c
   M /branches/explore-wc/subversion/libsvn_client/externals.c
   M /branches/explore-wc/subversion/libsvn_client/locking_commands.c
   M /branches/explore-wc/subversion/libsvn_client/update.c
   M /branches/explore-wc/subversion/libsvn_fs_fs
   M /branches/explore-wc/subversion/libsvn_fs_fs/rep-cache.c
   M /branches/explore-wc/subversion/libsvn_subr/io.c
   M /branches/explore-wc/subversion/libsvn_subr/path.c
   M /branches/explore-wc/subversion/libsvn_subr/sqlite.c
   M /branches/explore-wc/subversion/libsvn_wc
   M /branches/explore-wc/subversion/libsvn_wc/crop.c
   M /branches/explore-wc/subversion/libsvn_wc/entries.c
   M /branches/explore-wc/subversion/libsvn_wc/update_editor.c
   M /branches/explore-wc/subversion/po/fr.po
   M /branches/explore-wc/subversion/svn/util.c
   M /branches/explore-wc/subversion/tests/cmdline/checkout_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/svntest/main.py
   M /branches/explore-wc/subversion/tests/cmdline/switch_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/tree_conflict_tests.py
   M /branches/explore-wc/subversion/tests/cmdline/update_tests.py
   M /branches/explore-wc/tools/client-side/bash_completion
   M /branches/explore-wc/tools/dev/contribulyze.py
   M /branches/explore-wc/tools/hook-scripts/svn2feed.py

On the explore-wc branch:
Bring up-to-date with trunk.

------------------------------------------------------------------------
r35860 | rhuijben | 2009-02-13 19:39:32 +0100 (Fri, 13 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_client/update.c

* subversion/libsvn_client/update.c
  (svn_client__update_internal): Following up on r35843,r35844,
    don't crop items that are not in the working copy yet.

------------------------------------------------------------------------
r35861 | hwright | 2009-02-13 19:59:58 +0100 (Fri, 13 Feb 2009) | 8 lines
Changed paths:
   M /branches/explore-wc/Makefile.in

On the explore-wc branch:
Followup to r35859: fix 'make clean'.

Found by: arfrever

* Makefile.in:
  (fast-clean): Don't double clean CLEAN_FILES.

------------------------------------------------------------------------
r35862 | pburba | 2009-02-13 20:11:41 +0100 (Fri, 13 Feb 2009) | 12 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/switch_tests.py

Ajdust switch_tests.py 21 so it avoids spurious failure on Serf.

* subversion/tests/cmdline/switch_tests.py
  (forced_switch_failures): Wrap some text over 80 chars.  For the final
  update of the test, update the whole WC, rather than targeting a subtree.
  This avoids a spurious failure on Serf, which earlier in the test fails
  on a switch attempt (which this test expects to happen and is correct).
  The problem was that when using Serf, the switch added some addition files
  that neon (and ra_local and ra_serf) don't, before the error occurs.  The
  test was written in such a way as to expect the non-Serf WC state.  By
  updating the whole WC we avoid this assumption.

------------------------------------------------------------------------
r35863 | rhuijben | 2009-02-13 21:24:55 +0100 (Fri, 13 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_client/switch.c

* subversion/libsvn_client/switch.c
  (svn_client__switch_internal): Following up on r35854-r35858,r35860,
    fix the same issue that the buildbots found on update, but now
    for svn_client_switch2().

------------------------------------------------------------------------
r35864 | rhuijben | 2009-02-13 21:26:19 +0100 (Fri, 13 Feb 2009) | 5 lines
Changed paths:
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/switch.c

* subversion/libsvn_client/switch.c
  (svn_client_switch): Move from this file to ...
* subversion/libsvn_client/deprecated.c
  (svn_client_switch): ... this file.

------------------------------------------------------------------------
r35865 | rhuijben | 2009-02-13 21:37:02 +0100 (Fri, 13 Feb 2009) | 15 lines
Changed paths:
   M /trunk/subversion/libsvn_client/cat.c
   M /trunk/subversion/libsvn_client/checkout.c
   M /trunk/subversion/libsvn_client/deprecated.c
   M /trunk/subversion/libsvn_client/info.c
   M /trunk/subversion/libsvn_client/resolved.c
   M /trunk/subversion/libsvn_client/revert.c

* subversion/libsvn_client/cat.c
  (svn_client_cat)
* subversion/libsvn_client/checkout.c
  (svn_client_checkout3, svn_client_checkout2, svn_client_checkout)
* subversion/libsvn_client/info.c
  (svn_client_info)
* subversion/libsvn_client/resolved.c
  (svn_client_resolved)
* subversion/libsvn_client/revert.c
  (svn_client_revert): Move all these functions
* subversion/libsvn_client/deprecated.c
  (svn_client_cat, svn_client_checkout3, svn_client_checkout2,
   svn_client_checkout, svn_client_info, svn_client_resolved,
   svn_client_revert): To deprecated.c

------------------------------------------------------------------------
r35866 | gstein | 2009-02-14 02:43:02 +0100 (Sat, 14 Feb 2009) | 22 lines
Changed paths:
   M /trunk/build/generator/gen_win.py
   M /trunk/build/transform_sql.py
   M /trunk/build/transform_sql.sh

Clean up the Python used in transform_sql.py, and make it even easier to
use than r35853 (ie. not forced to provide an output file).

* build/transform_sql.py:
  (): use consistent string quoting throughout the file (single quotes)
  (usage_and_exit): use a more conventional output form, signifying the
    variable values, and that brackets mean "optional". detail the option.
    remove a useless backslash.
  (main): revise args to take file handles rather than names. use a single
    re.sub() rather than a couple replace() calls to turn the filename
    into a variable name. in the output, note the user should be running
    gen-make.py (on Windows, where this script is used). remove an unused
    replace() of newlines (the're all gone after the split()), and
    simplify the hell out of the "got non-whitespace?" test.
  (): adjust the sys.argv handling.

* build/transform_sql.sh: add a comment to fix emacs syntax coloring

* build/generator/gen_win.py:
  (WinGeneratorBase._create_sqlite_headers): adjust parameters for
    transform_sql.main()

------------------------------------------------------------------------
r35867 | gstein | 2009-02-14 03:50:24 +0100 (Sat, 14 Feb 2009) | 2 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Tweak comments about a few columns.

------------------------------------------------------------------------
r35868 | gstein | 2009-02-14 04:03:13 +0100 (Sat, 14 Feb 2009) | 26 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/log.c
   M /trunk/subversion/libsvn_wc/props.c

Remove most of the handling of the cachable_props field in svn_wc_entry_t.
It was completely ignored in the end anyways (see build_present_props), so
this will not affect the prop caching behavior.

* subversion/libsvn_wc/entries.c:
  (read_entry): ignore whatever may be in the entries file and set
    cachable_props to SVN_WC__CACHABLE_PROPS.
  (svn_wc__atts_to_entry): ignore any "cachable-props" attribute
  (take_from_entry): don't bother to propagate cachable_props
  (write_entry): write nothing for cachable_props
  (write_entry_xml): don't bother writing cachable_props; this function is
    only used during log handling on an old wc-format. when the wc is
    upgraded, we'll read from 'entries' and a good value will be set for
    cachable_props.
  (fold_entry): ignore requests to change cachable_props
  (svn_wc_entry_dup): just initialize, rather than copy, the field
  (svn_wc__entries_init): don't bother initializing cachable_props

* subversion/libsvn_wc/props.c:
  (svn_wc__install_props): don't bother logging a change to set the
    cachable_props field. it'll be correct at read-time.

* subversion/libsvn_wc/log.c:
  (svn_wc__loggy_entry_modify): don't attempt to create a loggy record for
    modifying cachable_props.

------------------------------------------------------------------------
r35869 | hwright | 2009-02-14 04:33:07 +0100 (Sat, 14 Feb 2009) | 8 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
Treat the incomplete_children column in the wc db as a boolean.

* subversion/libsvn_wc/entries.c
  (db_base_node_t): Change variable type.
  (fetch_base_nodes): Parse the value as a boolean.
  (read_entries, write_entry): Treat the column as a boolean.

------------------------------------------------------------------------
r35870 | hwright | 2009-02-14 04:39:26 +0100 (Sat, 14 Feb 2009) | 8 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
* subversion/libsvn_wc/entries.c
  (insert_base_node): const-ify a variable.

[ From here on out, any little changes like this on this branch we can just
  tack an implicit "Suggested by: gstein" on to.  He doesn't care, and
  neither do I. :P ]

------------------------------------------------------------------------
r35871 | gstein | 2009-02-14 05:12:06 +0100 (Sat, 14 Feb 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/props.c

Simplify build_present_props(). It was parsing a constant string, so we
may as well unwind that to clarify the code.

* subversion/libsvn_wc/props.c:
  (build_present_props): unwind parsing and looping, and just figure out
    which of the three cachable props are present.

------------------------------------------------------------------------
r35872 | hwright | 2009-02-14 05:30:33 +0100 (Sat, 14 Feb 2009) | 5 lines
Changed paths:
   M /branches/explore-wc/subversion/libsvn_wc/entries.c

On the explore-wc branch:
* subversion/libsvn_wc/entries.c
  (read_entries, insert_base_node, insert_working_node, insert_actual_node):
    More const-ification.

------------------------------------------------------------------------
r35873 | hwright | 2009-02-14 05:55:17 +0100 (Sat, 14 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Cherry pick r35637 from the explore-wc branch to trunk for wc-metadata.sql.

*sigh* this creates subtree mergeinfo.

------------------------------------------------------------------------
r35874 | hwright | 2009-02-14 15:33:06 +0100 (Sat, 14 Feb 2009) | 2 lines
Changed paths:
   M /trunk/TODO-1.6

* TODO-1.6: Remove ruby bindings test failure item.

------------------------------------------------------------------------
r35875 | gstein | 2009-02-16 07:25:05 +0100 (Mon, 16 Feb 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_files.c
   M /trunk/subversion/libsvn_wc/deprecated.c
   M /trunk/subversion/libsvn_wc/translate.c

Move a couple deprecated functions.

* subversion/libsvn_wc/adm_files.c:
  (svn_wc_create_tmp_file): move from here to deprecated.c

* subversion/libsvn_wc/translate.c:
  (svn_wc_translated_file): move from here to deprecated.c

* subversion/libsvn_wc/deprecated.c:
  (svn_wc_create_tmp_file): moved from adm_files.c
  (svn_wc_translated_file): moved from translated.c

------------------------------------------------------------------------
r35876 | gstein | 2009-02-16 07:32:53 +0100 (Mon, 16 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/adm_crawler.c

Remove a use of svn_wc__text_base_path() in favor of a stream of the
file's pristine contents.

A good chunk of svn_wc_translated_file2() was unraveled into place since
that function takes pathnames rather than streams.

* subversion/libsvn_wc/adm_crawler.c:
  (restore_file): rejigger to use a pristine stream rather than a path.

------------------------------------------------------------------------
r35877 | sbutler | 2009-02-16 13:53:32 +0100 (Mon, 16 Feb 2009) | 19 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py
   M /trunk/subversion/tests/cmdline/svntest/actions.py

Tackle the last holdout from issue #3209: merge encounters missing
files and dirs.  Create tests that try to merge changes into missing
trees.  Make them pass, given the current behavior.

The current behavior is inconsistent.  A missing file is not treated
as a merge tree conflict.  A missing dir, that the merge wants to
delete, is also not treated as a tree conflict.

The next steps are to determine the desired behavior, adjust the test
expectations, and set the tests to XFAIL.  Then fix it!

* subversion/tests/cmdline/svntest/actions.py
  (deep_trees_rmtree): New helper function.

* subversion/tests/cmdline/merge_tests.py
  (tree_conflicts_merge_edit_onto_missing,
   tree_conflicts_merge_del_onto_missing): New tests.
  (test_list): Add new tests.

------------------------------------------------------------------------
r35878 | sbutler | 2009-02-16 14:12:59 +0100 (Mon, 16 Feb 2009) | 10 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/merge_tests.py

Issue #3209: Remove tree conflicts from a merge test's expectations.
Tree conflicts aren't relevant for this particular test, anyway.  It
merely ensures that the working copy isn't locked or broken.

* subversion/tests/cmdline/merge_tests.py
  (merge_into_missing): Remove 'C ' (way out of date!) from expected
   merge output and status.
  (test_list): Remove XFail from merge_into_missing.


------------------------------------------------------------------------
r35879 | arfrever | 2009-02-16 17:10:48 +0100 (Mon, 16 Feb 2009) | 15 lines
Changed paths:
   M /trunk/Makefile.in
   M /trunk/build/ac-macros/swig.m4
   M /trunk/build/get-py-info.py
   M /trunk/subversion/bindings/swig/perl/native/Makefile.PL.in

Respect CFLAGS in SWIG bindings.

* build/ac-macros/swig.m4
  (SVN_FIND_SWIG): Include $CFLAGS in SWIG_PY_COMPILE and SWIG_RB_COMPILE.

* build/get-py-info.py: Don't print BASECFLAGS and OPT.

* Makefile.in
  (COMPILE_SWIG_PY): Delete $(CFLAGS) which is now in $(SWIG_PY_COMPILE).
  (COMPILE_SWIG_RB): Delete $(CFLAGS) which is now in $(SWIG_RB_COMPILE).
  (swig-pl): Appropriately set OPTIMIZE when calling $(MAKE) in
   subversion/bindings/swig/perl/native directory.

* subversion/bindings/swig/perl/native/Makefile.PL.in: Respect CFLAGS.

------------------------------------------------------------------------
r35880 | arfrever | 2009-02-16 18:50:49 +0100 (Mon, 16 Feb 2009) | 7 lines
Changed paths:
   M /trunk/subversion/bindings/javahl/native/SVNClient.cpp
   M /trunk/subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp

* bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
  (Java_org_tigris_subversion_javahl_SVNClient_logMessages,
   Java_org_tigris_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_tigris_subversion_javahl_Revision_2_3Lorg_tigris_subversion_javahl_RevisionRange_2Ljava_lang_String_2ZIZZZ): Delete unused variables.

* bindings/javahl/native/SVNClient.cpp
  (SVNClient::getMergeinfoLog): Delete unused variable.

------------------------------------------------------------------------
r35881 | gstein | 2009-02-16 19:18:53 +0100 (Mon, 16 Feb 2009) | 8 lines
Changed paths:
   M /trunk/build/generator/gen_win.py

When transforming sql files, for the filename parameter, add '.sql' so
that the guard symbols have the proper extension.

* build/generator/gen_win.py:
  (WinGeneratorBase._create_sqlite_headers): add .sql to the filename

Found by: Chris Foote <cafoote@yahoo.com>

------------------------------------------------------------------------
r35882 | gstein | 2009-02-16 19:31:32 +0100 (Mon, 16 Feb 2009) | 5 lines
Changed paths:
   M /trunk/build/generator/gen_win.py

Oops. Added a paren too many.

* build/generator/gen_win.py:
  (WinGeneratorBase._create_sqlite_headers): remove paren.

------------------------------------------------------------------------
r35883 | arfrever | 2009-02-16 20:01:03 +0100 (Mon, 16 Feb 2009) | 9 lines
Changed paths:
   M /trunk/build/ac-macros/swig.m4
   M /trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c

Follow-up to r35852:
Improve check for rb_errinfo().

* build/ac-macros/swig.m4
  (SVN_FIND_SWIG): Define HAVE_RB_ERRINFO if rb_errinfo() is available.

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
  (callback_rescue): Use rb_errinfo() if HAVE_RB_ERRINFO is defined.

------------------------------------------------------------------------
r35884 | arfrever | 2009-02-16 20:10:37 +0100 (Mon, 16 Feb 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Follow-up to r35873:

* subversion/libsvn_wc/wc-metadata.sql: Delete svn:mergeinfo.

Suggested by: gstein
              me

------------------------------------------------------------------------
r35885 | arfrever | 2009-02-16 20:37:26 +0100 (Mon, 16 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/po/pl.po

Polish translation update.

* subversion/po/pl.po: Polish translation update.

------------------------------------------------------------------------
r35886 | arfrever | 2009-02-16 20:49:25 +0100 (Mon, 16 Feb 2009) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/svntest/tree.py
   M /trunk/subversion/tests/cmdline/tree_conflict_tests.py

Python 2.6 compatibility:
Don't raise strings.

* subversion/tests/cmdline/svntest/tree.py:
* subversion/tests/cmdline/tree_conflict_tests.py: Don't raise strings.

------------------------------------------------------------------------
r36004 | hwright | 2009-02-19 17:53:36 +0100 (Thu, 19 Feb 2009) | 9 lines
Changed paths:
   M /branches/1.6.x/STATUS

Merge r35967 from trunk:

 * r35967
   Add support to build and use SQLite amalgamation version on Windows.
   This change implements the same behavior as *nix build system does.
   Votes:
     +1: rhuijben, pburba, zhakov
     +1: gstein (for 1.6.1)

------------------------------------------------------------------------
r36005 | hwright | 2009-02-19 17:54:53 +0100 (Thu, 19 Feb 2009) | 2 lines
Changed paths:
   M /branches/1.6.x
   M /branches/1.6.x/build/generator/gen_win.py

Actually do the merge of r35967 purported to have been done in r36004.

------------------------------------------------------------------------
r36006 | hwright | 2009-02-19 17:59:32 +0100 (Thu, 19 Feb 2009) | 11 lines
Changed paths:
   M /branches/1.6.x
   M /branches/1.6.x/STATUS
   M /branches/1.6.x/subversion/include/svn_string.h
   M /branches/1.6.x/subversion/libsvn_subr/svn_string.c

Merge r35968, r35974 from trunk

 * r35968, r35974
   Buffer overflow on ensuring a 0 byte string buffer
   Justification:
     This bug aborts our client if the OS catches it (bad) or overwrites
     arbitrary ram (worse). r35974 fixes the exact allocating behavior tested
     from the string tests.
   Votes:
     +1: rhuijben, gstein, pburba

------------------------------------------------------------------------
r36007 | hwright | 2009-02-19 18:01:42 +0100 (Thu, 19 Feb 2009) | 12 lines
Changed paths:
   M /branches/1.6.x
   M /branches/1.6.x/STATUS
   M /branches/1.6.x/subversion/libsvn_subr/path.c

Merge r35977 from trunk:

 * r35977
   Remove the implicit recanonicalize in svn_path_url_add_component2 that
   should have been part of r35732 that started asserting its behavior.
   Justification:
     Stops recanonicalizing +- everywhere. (Is by far the most CPU intensive
     part of svn update before the ra session is opened). All inputs are
     guaranteed to be pre-canonicalized.
   Votes:
     +1: rhuijben, gstein, pburba

------------------------------------------------------------------------
r36008 | cmpilato | 2009-02-19 18:01:45 +0100 (Thu, 19 Feb 2009) | 5 lines
Changed paths:
   M /trunk/notes/http-protocol-v2.txt

* notes/http-protocol-v2.txt
  Rewrite this for consistent formatting and layered concept
  introduction.  Also, copy in the TODO list from the http-protocol-v2
  BRANCH-README file.

------------------------------------------------------------------------
r36009 | hwright | 2009-02-19 18:12:26 +0100 (Thu, 19 Feb 2009) | 8 lines
Changed paths:
   M /trunk/configure.ac
   M /trunk/tools/dist/construct-rolling-environment.sh

Recommend sqlite 3.6.11, and include it in the deps tarball.

* tools/dist/construct-rolling-environment.sh:
  Bump included sqlite version.

* configure.ac:
  Bump recommended sqlite version.

------------------------------------------------------------------------
r36010 | hwright | 2009-02-19 18:19:25 +0100 (Thu, 19 Feb 2009) | 2 lines
Changed paths:
   M /branches/1.6.x/STATUS

* STATUS: Nominate r35945 and r35948, including pburba's votes from IRC.

------------------------------------------------------------------------
r36011 | hwright | 2009-02-19 18:21:46 +0100 (Thu, 19 Feb 2009) | 2 lines
Changed paths:
   M /branches/1.6.x/STATUS

* STATUS: Nominate r36009.

------------------------------------------------------------------------
r36012 | pburba | 2009-02-19 18:27:07 +0100 (Thu, 19 Feb 2009) | 2 lines
Changed paths:
   M /branches/1.6.x/STATUS

* STATUS: Vote and approve r35981.

------------------------------------------------------------------------
r36013 | hwright | 2009-02-19 18:35:45 +0100 (Thu, 19 Feb 2009) | 11 lines
Changed paths:
   M /branches/1.6.x
   M /branches/1.6.x/STATUS
   M /branches/1.6.x/subversion/libsvn_ra_serf/auth.c

Merge r35981 from trunk:

 * r35981
   libsvn_ra_serf: Following RFC2617, verify authentication header tokens
   case insensitive.
   Justification:
     Enables using serf from behind Microsoft ISA proxy servers.
     See http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1191733
   Votes:
     +1: rhuijben, gstein, pburba

------------------------------------------------------------------------
r36014 | cmpilato | 2009-02-19 18:41:05 +0100 (Thu, 19 Feb 2009) | 1 line
Changed paths:
   M /branches/1.6.x/STATUS

Vote for the r35945 group, approving.
------------------------------------------------------------------------
r36015 | hwright | 2009-02-19 18:42:17 +0100 (Thu, 19 Feb 2009) | 10 lines
Changed paths:
   M /branches/1.6.x
   M /branches/1.6.x/STATUS
   M /branches/1.6.x/subversion/tests/libsvn_fs/fs-test.c

Merge r35945, r35948 from trunk:

 * r35945, r35948
   Mark fs-tests 18 as XFAIL.
   Justification:
     The test as been XFAIL for a long time, and returning it to be so isn't
     a problem.  A passing test suite is always Good.
   Votes:
     +1: hwright, pburba, cmpilato

------------------------------------------------------------------------
r36016 | dustin | 2009-02-19 19:15:39 +0100 (Thu, 19 Feb 2009) | 2 lines
Changed paths:
   M /trunk/contrib/client-side/svnmerge/svnmerge.py

 * svnmerge.py: re-add _cache_svninfo, which was accidentally removed

------------------------------------------------------------------------
r36017 | cmpilato | 2009-02-19 19:38:21 +0100 (Thu, 19 Feb 2009) | 6 lines
Changed paths:
   M /trunk/subversion/tests/cmdline/switch_tests.py

Make switch_tests.py 10 stop XPASSing over ra_serf.

* subversion/tests/cmdline/switch_tests.py
  (file_dir_file): Add some checks that the switches which succeed
    actually make the dirent kind changes they were supposed to.

------------------------------------------------------------------------
r36018 | gstein | 2009-02-19 19:45:45 +0100 (Thu, 19 Feb 2009) | 22 lines
Changed paths:
   M /trunk/subversion/include/svn_error_codes.h
   M /trunk/subversion/libsvn_wc/wc_db.c
   M /trunk/subversion/libsvn_wc/wc_db.h

Continued documentation and slight evolution of wc_db.

* subversion/libsvn_wc/wc_db.h:
  (svn_wc__db_kind_t): document values. add UNKNOWN value.
  (svn_wc__db_status_t): add INCOMPLETE value
  (svn_wc__db_base_add_directory, svn_wc__db_base_add_file,
      svn_wc__db_base_add_symlink, svn_wc__db_base_get_prop,
      svn_wc__db_base_get_props, svn_wc__db_base_get_children,
      svn_wc__db_base_get_symlink_target): add docstrings
  (svn_wc__db_base_delete): renamed to ...
  (svn_wc__db_base_remove): ... this. added docstring.
  (svn_wc__db_base_get_info): added docstring. added STATUS parameter.
    removed SWITCHED parameter (let caller make a second API call).

* subversion/libsvn_wc/wc_db.c:
  (svn_wc__db_base_delete): renamed to ...
  (svn_wc__db_base_remove): ... this.
  (svn_wc__db_base_get_info): updated parameters.

* subversion/include/svn_error_codes.h:
  (SVN_ERR_WC_NOT_SYMLINK): new error code

------------------------------------------------------------------------
r36019 | hwright | 2009-02-19 20:13:00 +0100 (Thu, 19 Feb 2009) | 1 line
Changed paths:
   A /tags/1.6.0-rc2 (from /branches/1.6.x:36015)
   M /tags/1.6.0-rc2/subversion/include/svn_version.h

Tagging release 1.6.0-rc2 with svn_version.h matching tarball.
------------------------------------------------------------------------
r36020 | hwright | 2009-02-19 22:14:30 +0100 (Thu, 19 Feb 2009) | 12 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c

Before writing a directory full of entries to the wc database, remove all
existing WORKING and BASE nodes.  These nodes will be overwritten by any
entries to be written, and this allows us to remove any additional orphan
nodes (such as schedule-add -> schedule-delete).

Current number of WC-NG test failures: 330

* subversion/libsvn_wc/entries.c
  (statement_keys, statements): New statements.
  (entries_write_body): Remove all WORKING and BASE nodes before adding
    the nodes for this directory.

------------------------------------------------------------------------
r36021 | gstein | 2009-02-19 22:17:52 +0100 (Thu, 19 Feb 2009) | 45 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Update the WC schema based on recent learnings.

- remove "absent" notion in favor of a general "presence" which can be
  "normal", "absent", "excluded", or "incomplete"
- move changelist and tree_conflict_data to the ACTUAL table, and fold the
  changelist name into the table (rather than a separate table to map
  names to/from IDs)
- make some columns of BASE_NODE null-able for cases where we don't know
  the information (i.e. non-present nodes)
- add a "text_mod" to the ACTUAL table
- change the LOCK table to use a repos_id/repos_relpath pair rather than
  just a simple url

* subversion/libsvn_wc/wc-metadata.sql:
  (BASE_NODE): add PRESENCE column. make REVNUM, CHANGED_*, and
    PROPERTIES null-able.
  (WORKING_NODE): remove CHANGELIST_ID and TREE_CONFLICT_DATA columns
  (ACTUAL_NODE): renamed CHANGELIST_ID to CHANGELIST, accepting the actual
    changelist name rather than a mapped id. add TEXT_MOD and
    TREE_CONFLICT_DATA columns.
  (CHANGELIST): remove
  (LOCK): switch from URL to <REPOS_ID, REPOS_RELPATH> for the key

* subversion/libsvn_wc/entries.c:
  (statement_keys, statements): remove INSERT_CHANGELIST, adjust the sql
    for the new/removed columns.
  (db_working_node_t): remove changelist_id and tree_conflict_data
  (db_actual_node_t): switch changelist_id to just changelist. add
    tree_conflict_data.
  (db_changelist_t): remove
  (db_lock_t): switch url to (repos_id, repos_relpath) fields.
  (fetch_base_nodes): renumber SELECT result column indices.
  (fetch_working_nodes): don't fetch changelist or tree conflict data
  (fetch_catual_nodes): switch to changelist name, and fetch tree conflict
    data.
  (read_entries): pull conflict data from ACTUAL. set the changelist field
    based on what we find in ACTUAL.
  (insert_base_node): renumber insert fields. bind "normal" to the
    PRESENCE column.
  (insert_working_node): do not insert changelist or conflict data
  (insert_actual_node): insert changelist name rather than an ID.
  (insert_changelist): removed
  (write_entry): simplify changelist handling. put the tree conflict data
    into ACTUAL.

------------------------------------------------------------------------
r36022 | hwright | 2009-02-19 22:56:05 +0100 (Thu, 19 Feb 2009) | 8 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite.c

From the SQLite docs: "Contrary to the intuition of many, sqlite3_reset() does
not reset the bindings on a prepared statement."  Let's make the interface
a bit more intuitive by also clearing the bound values on a reset of a
prepared statement.

* subversion/libsvn_subr/sqlite.c
  (svn_sqlite__reset): Also clear previously bound values.

------------------------------------------------------------------------
r36023 | glasser | 2009-02-19 23:48:14 +0100 (Thu, 19 Feb 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/config_file.c

If ~/.subversion is a symlink to a directory, it's OK to try to generate the
files inside it.  (This lets people whose ~/.subversions are symlinks to use the
move-file-aside-and-run-a-command-to-regenerate-config trick.)

* subversion/libsvn_subr/config_file.c
  (svn_config_ensure): Resolve symlinks when checking ~/.subversion.

------------------------------------------------------------------------
r36024 | gstein | 2009-02-20 13:41:58 +0100 (Fri, 20 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/sqlite.c

* subversion/libsvn_subr/sqlite.c:
  (svn_sqlite__column_revnum): if the column is NULL, then return
    SVN_INVALID_REVNUM (rather than 0)

------------------------------------------------------------------------
r36025 | gstein | 2009-02-20 14:43:55 +0100 (Fri, 20 Feb 2009) | 35 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c
   M /trunk/subversion/libsvn_wc/wc-metadata.sql

Add a 'presence' column to WORKING_NODE and 'parent_relpath' to
ACTUAL_NODE. Then throw in lots of comments about how to interpret the
various bits of data.

Note: I reordered some columns in BASE_NODE and WORKING_NODE which makes
the diff look larger than it is.

Something in this change appears to have made basic_tests 14 pass. (!)

* subversion/libsvn_wc/wc-metadata.sql:
  (*.kind): no longer allow "none"
  (*.presence): add "not-present" value. document values a bit better
  (BASE_NODE): reordered revnum column
  (WORKING_NODE): added 'presence' column. reordered 'copyfrom_*' and
    'moved_*' columns. 'properties' can now be NULL.
  (I_WORKING_PARENT): should have 'wc_id' column as part of index
  (ACTUAL_NODE): add 'parent_relpath' column.

* subversion/libsvn_wc/entries.c:
  (statements): add 'presence' and 'parent_relpath' columns to the
    appropriate sql statements.
  (db_base_node_t): add PRESENCE member
  (db_working_node_t): add PRESENCE member
  (db_actual_node_t): add PARENT_RELPATH member
  (fetch_working_nodes): parse the 'presence' column. renumber result
    column indices.
  (fetch_actual_nodes): return the 'parent_relpath' column. renumber
    result column indices.
  (read_entries): alter test on how to detect schedule_delete.
  (insert_working_node): store a value into 'presence'. renumber the
    binding indices.
  (insert_actual_node): store a value into 'parent_relpath'. renumber the
    binding indices.
  (write_entry): set PRESENCE and PARENT_RELPATH fields appropriately

------------------------------------------------------------------------
r36026 | rhuijben | 2009-02-20 15:39:43 +0100 (Fri, 20 Feb 2009) | 1 line
Changed paths:
   M /branches/1.6.x/STATUS

* STATUS: Vote on r36009 and nominate r35985, r36017 and r35982.
------------------------------------------------------------------------
r36027 | gstein | 2009-02-20 17:16:50 +0100 (Fri, 20 Feb 2009) | 10 lines
Changed paths:
   M /trunk/subversion/include/private/svn_sqlite.h
   M /trunk/subversion/libsvn_subr/sqlite.c

Fix skew in interface: we could bind 64-bit numbers but NOT retrieve them
(properly, at least). Similarly, we could retrieve plain integers, but not
bind them.

* subversion/include/private/svn_sqlite.h:
  (svn_sqlite__bind_int, svn_sqlite__column_int64): new declarations

* subversion/libsvn_subr/sqlite.c:
  (svn_sqlite__bind_int, svn_sqlite__column_int64): new implementations

------------------------------------------------------------------------
r36028 | hwright | 2009-02-20 18:40:19 +0100 (Fri, 20 Feb 2009) | 7 lines
Changed paths:
   M /trunk/subversion/libsvn_wc/entries.c

WC-NG: Selectively bind the properties columns in BASE and ACTUAL nodes, since
these are allowed to be null.

* subversion/libsvn_wc/entries.c
  (fetch_base_nodes): Check nullity before parsing property list.
  (insert_base_node, insert_actual_node): Only insert a non-null property list.

------------------------------------------------------------------------
r36029 | cmpilato | 2009-02-20 22:20:55 +0100 (Fri, 20 Feb 2009) | 1 line
Changed paths:
   M /trunk/notes/http-protocol-v2.txt

Add some whitespace.
------------------------------------------------------------------------
r36030 | rhuijben | 2009-02-20 22:22:48 +0100 (Fri, 20 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_subr/win32_crashrpt.c

* subversion/libsvn_subr/win32_crashrpt.c
  (global): Following up on r35958, include Windows headers using the <>
    syntax to make sure the makefile generator ignores this include.

------------------------------------------------------------------------
r36031 | pburba | 2009-02-20 22:24:00 +0100 (Fri, 20 Feb 2009) | 6 lines
Changed paths:
   D /branches/reduce-wc-walks-for-mergeinfo

Delete the reduce-wc-walks-for-mergeinfo branch.

Not only is this branch of limited utility (multiple walks for mergeinfo
are a lot less common than I though when I started this branch) but also,
with the ongoing next gen WC work, the solution will likely be quite
different.
------------------------------------------------------------------------
r36032 | rhuijben | 2009-02-20 22:39:29 +0100 (Fri, 20 Feb 2009) | 4 lines
Changed paths:
   M /trunk/subversion/libsvn_repos/reporter.c

* subversion/libsvn_repos/reporter.c
  (read_string): Resolve two warnings by checking whether the string
    length fits in a apr_size_t.

------------------------------------------------------------------------
r36033 | rhuijben | 2009-02-20 22:41:40 +0100 (Fri, 20 Feb 2009) | 3 lines
Changed paths:
   M /trunk/subversion/libsvn_repos/reporter.c

* subversion/libsvn_repos/reporter.c
  (read_string): Fix the off by one error I just introduced in r36032.

------------------------------------------------------------------------
r36034 | hwright | 2009-02-20 23:13:09 +0100 (Fri, 20 Feb 2009) | 4 lines
Changed paths:
   M /trunk/www/index.html

* www/index.html:
  Add I nice box mentioning 1.6.0-rc2, with the standard RC disclaimers.
  Against my better judgement, I have omitted the use of the "marquee" tag.

------------------------------------------------------------------------
r36035 | hwright | 2009-02-20 23:46:41 +0100 (Fri, 20 Feb 2009) | 9 lines
Changed paths:
   M /trunk/subversion/libsvn_fs_fs/rep-cache.c

Fix a FSFS rep-cache bug: make sure we get 64-bit offsets and sizes from
the rep-cache.  If these offsets are very large (>2GB) this could lead to
confusion on the part of the rep sharing code.

Found by: gstein

* subversion/libsvn_fs_fs/rep-cache.c
  (svn_fs_fs__get_rep_reference): Use the 64-bit sqlite getter function.

------------------------------------------------------------------------
r36036 | hwright | 2009-02-21 00:08:54 +0100 (Sat, 21 Feb 2009) | 10 lines
Changed paths:
   M /branches/1.6.x/STATUS

Merge r35945, r35948 from trunk:

 * r35945, r35948
   Mark fs-tests 18 as XFAIL.
   Justification:
     The test as been XFAIL for a long time, and returning it to be so isn't
     a problem.  A passing test suite is always Good.
   Votes:
     +1: hwright, pburba, cmpilato

------------------------------------------------------------------------