Fix some bits missed in the verfiy change r1439210.

* subversion/libsvn_fs/fs-loader.c
  (svn_fs_verify): Redorder parameters in vtable call.

* subversion/tests/cmdline/svnadmin_tests.py
  (verify_windows_paths_in_repos): Adjust expected text.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439305 13f79535-47bb-0310-9956-ffa450edef68
Add an XFail test for move-update with incoming property changes.

* subversion/tests/cmdline/update_tests.py
  (move_update_props): New test.
  (test_funcs): Add new test.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439399 13f79535-47bb-0310-9956-ffa450edef68
Fix a move-update property XFail.

* subversion/libsvn_wc/wc_db_update_move.c
  (update_working_props): Handle the delay setting pristine properties.

* subversion/tests/cmdline/update_tests.py
  (move_update_props): Tweak status before testing, remove XFail.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439432 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/update_tests.py
  (move_update_props): Extend to test move-update property conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439446 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/old-and-busted.c
  (svn_wc__read_entries_old): Add missing svn_error_trace() call.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439464 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_bump_format): Don't forget to close sdb in case the
   svn_wc__upgrade_sdb() function returns an error.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439477 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/upgrade.c
  (bump_to_30): Reduce the scope of 'stmt_store', preventing the statement
   from being prepared without also being used and reset.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439479 13f79535-47bb-0310-9956-ffa450edef68
Fix a UI niggle:  don't print an update summary header with no content
when excluding WC items:

   $ svn update --set-depth exclude wc/A/*
   D    wc/A/B
   D    wc/A/C
   D    wc/A/D
   D    wc/A/mu
   Summary of updates:    <<< This line removed by this commit
   $

* subversion/svn/update-cmd.c
  (print_update_summary): Delay the printing of the update summary
    header until we're sure there's a summary item to report.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439480 13f79535-47bb-0310-9956-ffa450edef68
* tools/server-side
  (svn:ignore): Re-add 'svnauthz-validate' to the pattern list.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439483 13f79535-47bb-0310-9956-ffa450edef68
Add a test for issue #4307, 'upgrade from 1.7 crashes if WC contains conflict'.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_from_1_7, test_list): New test. Currently upgrades a WC that
   contains a text conflict, but can later be extended to cover more cases
   once issue #4307 is fixed.

* subversion/tests/cmdline/upgrade_tests_data/upgrade_from_1_7_wc.tar.bz2: New.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439502 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/conflicts.h,
  subversion/libsvn_wc/conflicts.c
  (svn_wc__resolve_text_conflict): Rename to 'mark_resolved_text_conflict'
    for clarity, since we have a bunch of other functions that actually
    resolve conflicts and this is not one of them.

* subversion/libsvn_wc/adm_crawler.c
  (restore_file): Update caller, and rename the 'resolve_text_conflict'
    parameter to 'mark_resolved_text_conflict' similarly.
  (svn_wc_restore, restore_node): Annotate the calls to restore_file().


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439523 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/update_tests.py
  (update_moved_dir_edited_leaf_del): Do non-recursive resolution, adjust
   expectations, remove XFail.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439540 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/update_tests.py
  (update_moved_dir_file_move): Resolve conflixt, adjust expectations,
   remove XFail.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439551 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/update_tests.py
  (update_nested_move_text_mod): Resolve conflict, adjust expectations,
   remove XFail.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439555 13f79535-47bb-0310-9956-ffa450edef68
mailer.py: provide a "repos_dir basename" substitution variable.

Patch by: Janos Gyerik <janos.gyerik@gmail.com>
(log message by me)
Review by: breser, cmpilato, danielsh

* tools/hook-scripts/mailer/mailer.py
  (main): Define 'repos_basename' for substitution.

* tools/hook-scripts/mailer/mailer.conf.example
  (SUBSTITUTIONS): Document "%(repos_basename)s".


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1439592 13f79535-47bb-0310-9956-ffa450edef68
Merging r1439433 through r1439754 from trunk to verify-keep-going branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1439765 13f79535-47bb-0310-9956-ffa450edef68