Create a backport branch for issue #4306 fix.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4306@1438872 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4306 branch, merge r1438602 and r1438683, resolving conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4306@1438873 13f79535-47bb-0310-9956-ffa450edef68
Merge r1441810 from ^/subversion/trunk.

* src-branch-1.7.x: Mergeinfo changes only

* subversion/libsvn_client/merge.c: Clean merge of r1441810.

* subversion/tests/cmdline/merge_tests.py
  (conflict_aborted_mergeinfo_described_partial_merge): r1441810 replaced
   the earlier version of this test, which used text conflicts, with an
   expanded version that used property conflicts to resolve the issue
   raised here: http://svn.haxx.se/dev/archive-2013-02/0001.shtml
   Unfortunately, 1.7.x has unrelated problems with property conflicts: It 
   doesn't abort the merge if it encounters them!  It merrily plugs along
   sans any "One or more conflicts were produced while merging...resolve
   all conflicts and rerun the merge to apply the remaining unmerged
   revisions" error.  So while r1441810 is a valid fix (IMO) its test fails
   for unrelated reasons.  So I reworked the earlier version of test to
   demonstrate the problem r1441810 fixes, but using file conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4306@1442367 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4306 branch: Follow-up to r1442367.

* subversion/tests/cmdline/merge_tests.py
  (conflict_aborted_mergeinfo_described_partial_merge): Revert the 1.7
   version of this test I added in r1442367 and replace it with a new one
   that more closely mimics the trunk version of the test. See
   http://svn.haxx.se/dev/archive-2013-02/0062.shtml


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4306@1445454 13f79535-47bb-0310-9956-ffa450edef68
Create a branch for issue #4408.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4408@1512143 13f79535-47bb-0310-9956-ffa450edef68
Fix Issue #4408: diff --summarize includes duplicate path elements.

The path provided to the summarize_function needs to be relative to the target.
Most of the time the target is "" but if a path doesn't exist on one side
of the diff (add or delete) then the root of the editor drive is moved outside
the target and the target gets duplicated in the output.

This issue is fixed on 1.8.x and newer as diff --summarize has a new and
different implementation.  That implementation is not appropriate to backport
as it adds new features.  Also note that 1.8.x+ already has tests for these
cases.

* subversion/libsvn_client/repos_diff_summarize.c
  (create_item_baton): Use svn_relpath_skip_ancestor instead of the hack added
    to fix Issue #2765.
  (diff_deleted_dir, delete_entry): Skip the target.

* subversion/tests/cmdline/diff_tests.py
  (basic_diff_summarize): Add tests for a newly added file and dir.
  


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4408@1512154 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4408 branch.

* subversion/libsvn_client/repos_diff_summarize.c
  (open_root): Pass full relpath so that svn_relpath_skip_ancestor
   doesn't return NULL, rename variable to avoid clash with type.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4408@1514841 13f79535-47bb-0310-9956-ffa450edef68
Merge the r1512432 group from trunk:

 * r1512432, r1512471, r1512472, r1513463, r1513472
   mod_dav_svn: No longer map requests to the filesystem.
   Justification:
     Prevents httpd from logging garbage filenames with %f and stops Directory
     blocks from matching against requests served by mod_dav_svn.
   Votes:
     +1: breser, philip, ivan


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1514941 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.7.x-issue4306 branch:

 * r1438602, r1438683, r1441810
   Fix issue #4306, "multiple editor drive file merges record wrong mergeinfo
   during conflicts"
   Justification:
     Bogus mergeinfo is created during conflicting merges with file targets.
   Notes: r1438602 is the initial test and r1438683 the initial fix. r1441810
     is a follow-up that addressed a bug in the initial fix (see
     http://svn.haxx.se/dev/archive-2013-02/0001.shtml) and also reworked the
     test to use prop edits rather than text edits as the changes to be
     merged.  Unfortunately, 1.7.x has unrelated problems with property
     conflicts: It doesn't abort the merge if it encounters them!  It merrily
     plugs along sans any "One or more conflicts were produced while
     merging...resolve all conflicts and rerun the merge to apply the
     remaining unmerged revisions" error (this is fixed on trunk).  So while
     r1441810 is a valid fix (IMO) its test fails for unrelated reasons.  So
     I reworked the earlier version of test to demonstrate the problem
     r1441810 fixes, but using file conflicts.
   Branch:
     ^/subversion/branches/1.7.x-issue4306
   Votes:
     +1: stsp, pburba, rhuijben


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1514942 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.7.x-issue4408 branch:

 * ^/subversion/branches/1.7.x-issue4408
   Fix invalid output from diff --summarize.
   Branch:
     ^/subversion/branches/1.7.x-issue4408
   Justification:
     User ran into the issue and reported it.  Relatively straightforward fix.
   Notes:
     See r1512154 for the actual change to review on the branch.
   Votes:
     +1: breser, philip, rhuijben


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1514944 13f79535-47bb-0310-9956-ffa450edef68