Report repository merge tracking capability using HTTPv2 like header 
'SVN-Repository-MergeInfo'.

* subversion/include/svn_dav.h
  (SVN_DAV_REPOSITORY_MERGEINFO): New.

* subversion/libsvn_ra_serf/options.c
  (capabilities_headers_iterator_callback): Set SVN_RA_CAPABILITY_MERGEINFO
   to CAPABILITY_SERVER_YES only if didn't receive explicit repository merge
   tracking capability. Handle new SVN_DAV_REPOSITORY_MERGEINFO header.
  (options_response_handler): Reset SVN_RA_CAPABILITY_MERGEINFO to NULL 
   before iterating headers. 

* subversion/mod_dav_svn/version.c
  (get_option): Report repository merge tracking capability using 
   SVN_DAV_REPOSITORY_MERGEINFO header.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445083 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/diff_tests.py
  (local_tree_replace): Add new test verifying the ordering constraints of a
    notice ancestry diff against a revision. Currently marked XFail
  (test_list): Add local_tree_replace.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445105 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/diff_editor.c (close_file): Remove unused variable.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445110 13f79535-47bb-0310-9956-ffa450edef68
Make blame only check for binary mime-type on the final revision instead
of every revision.  If the final file is not binary, but was binary in the
past, blame will now run without requiring --force.

* subversion/libsvn_client/blame.c
  (struct file_rev_baton): Remove unused member.
  (check_mimetype): Remove unused function.
  (file_rev_handler): Don't check mime-type.
  (svn_client_blame5): Check final mime-type.

* subversion/svn/blame-cmd.c
  (svn_cl__blame): Add another non-existant file error.

* subversion/tests/cmdline/blame_tests.py
  (blame_binary): Adapt to test new behaviour.
  (blame_file_not_in_head, blame_multiple_targets): Tweak expected errors.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445164 13f79535-47bb-0310-9956-ffa450edef68
Fix intermittent failure of merge_tests.py 137: 'single editor drive
notifications'.  This is the test for issue #4317 "redundant notifications
in single editor drive merge".

* subversion/tests/cmdline/merge_tests.py
  (single_editor_drive_merge_notifications): Use UnorderedOutput so
   variations in merge 'U 'pdate notifications don't cause the test to fail.
   Also tweak the doc string for the test to something a bit more
   descriptive.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445171 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/blame_tests.py
  (blame_multiple_targets): Verify output, don't make spurious commit.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445172 13f79535-47bb-0310-9956-ffa450edef68
* subversion/include/svn_dav.h
  Comment tweaks only (for grammar sanity, mostly).


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445176 13f79535-47bb-0310-9956-ffa450edef68
Fix the typemap for svn_opt_revision_t. Followup to r1443811.

r1443811 moved the guts of the typemap into a function, but didn't account for
accepting a _p_svn_opt_revision_t object from Perl and the need to change
the pointer.

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
  (svn_swig_pl_set_revision): Take a svn_opt_revision_t **rev instead of
    just a svn_opt_revision_t *rev.

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
  (svn_swig_pl_set_revision): Update declaration to match changed function.

* subversion/bindings/swig/include/svn_types.swg
  (svn_opt_revision_t): Update call to svn_swig_pl_set_revision().

* subversion/bindings/swig/perl/native/t/9wc.t
  Enable the kind tests that were failing due to the problem with the typemap. 


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445267 13f79535-47bb-0310-9956-ffa450edef68
Remove an unintentional change committed in r1443783.

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
  (#undef _): Remove.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445277 13f79535-47bb-0310-9956-ffa450edef68
Notify when resolving a delete-edit conflict raises a move-edit conflict.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_resolve_delete_raise_moved_away): Add notify parameters.

* subversion/libsvn_wc/wc_db_update_move.c
  (update_move_list_notify): Only notify if func is not NULL.
  (mark_tree_conflict): Add notification to list.
  (check_tree_conflict, tc_editor_add_file, tc_editor_delete): Don't
   add notification to list.
  (tc_editor_complete): Add comment.
  (resolve_delete_raise_moved_away): Add notify parameters, create list.
  (svn_wc__db_resolve_delete_raise_moved_away): Add notify parameters, notify.

* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Pass notify parameters.

* subversion/libsvn_wc/wc_db.c
  (op_revert_txn): Pass NULL notify parameters.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445301 13f79535-47bb-0310-9956-ffa450edef68
Make 'svn patch' handle locally deleted directories as non existing
directories by properly adding them when necessary.

* subversion/libsvn_client/patch.c
  (create_missing_parents): Separate the deleted from the missing handling.
  (install_patched_target): Allow replacements to re-add parent directories.
    Detect missing directories before trying to add files into them.

* subversion/tests/cmdline/patch_tests.py
  (patch_add_new_dir): Create real missing directories instead of just
    calling deleted directories missing.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445333 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/patch.c
  (install_patched_target): Whitespace tweaks. Put blank lines
   after variable declarations.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445351 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/diff_editor.c
  (wrap_dir_closed,
   wrap_dir_changed): Use constant instead of the availability of
     left_src to say that the node was not added. Do this to cover
     for a current bug in the repos-wc driver.
     (The difference is visible in svn diff --summarize)


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445360 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_delta/cancel.c
  (svn_delta_get_cancellation_editor): Revert accidental commit in r1445360.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445361 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/merge.c
  (merge_locked): Clean up the clean-up code after a 2-URL merge so that we
    always sleep for time stamps if needed and always clear the session pool.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445417 13f79535-47bb-0310-9956-ffa450edef68
In the repos-wc diff: use a single code path for reporting locally added files.

* subversion/libsvn_wc/diff_editor.c
  (report_local_only_file): Stop delegating cases to file_diff(). Properly look
    through deletes when needed. Provide copyfrom information. Check for
    modifications.

* subversion/tests/cmdline/diff_tests.py
  (diff_repos_working_added_dir): Update expected revision: a locally changed
    file shouldn't be reported with an explicit revision.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445421 13f79535-47bb-0310-9956-ffa450edef68
Use SVN_TEST_ASSERT_ERROR macro rather than coding the error comparison.

* subversion/tests/libsvn_subr/subst_translate-test.c
  (test_svn_subst_translate_string2): Use macro.

* subversion/tests/libsvn_wc/db-test.c
  (test_getting_info): Use macro.

* subversion/tests/libsvn_wc/op-depth-test.c
  (test_op_revert, copy_wc_wc_server_excluded, layered_moved_to,
   update_within_move): Use macro.

* subversion/tests/libsvn_wc/pristine-store-test.c
  (pristine_write_read, reject_mismatching_text): Use macro.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445516 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/commit.c
  (svn_client_commit6): Commit items might have both the ITEM_COPY and
   ITEM_DELETE flags set. Check these flags independently in order to
   catch the case where a moved-from path is comitted which has been
   replaced (i.e. the path has a copy shadowing the delete).


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445614 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/merge_authz_tests.py
  (mergeinfo_and_skipped_paths,
   merge_fails_if_subtree_is_deleted_on_src,
   reintegrate_fails_if_no_root_access): Use sbox.ospath() rather than
   more cumbersome os.path.join() where possible.



git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445694 13f79535-47bb-0310-9956-ffa450edef68
Cleaner solution to the problem fixed in r1445267.

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
  (svn_swig_pl_set_revision): Return a svn_opt_revision_t instead of using a
    pointer to a pointer.

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
  (svn_swig_pl_set_revision): Update declaration.

* subversion/bindings/swig/include/svn_types.swg
  (svn_opt_revision_t): Update typemap to match changes to
    svn_swig_pl_set_revision().

Patch by: Roderich Schupp <roderich.schupp{_AT_}gmail.com>



git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1445705 13f79535-47bb-0310-9956-ffa450edef68