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 branch to hold fixes for Kerberos/GSSAPI detection on Solaris10 on 1.7.x.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-gssapi-solaris10@1453164 13f79535-47bb-0310-9956-ffa450edef68
Solaris does not support the gssapi library option to krb5-config, however
it does have a gssapi implementation.  Requiring us to look for the library
in a well known path.

This is being put on a branch since trunk no longer has gssapi detection
support since it has been moved into serf.

* build/ac-macros/gssapi.m4:
  (SVN_LIB_RA_SERF_GSSAPI): Detect when krb5-config --libs gssapi fails and
    try with krb5-config --libs krb5 and then use -lgss and
    -I/usr/include/gssapi.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-gssapi-solaris10@1453166 13f79535-47bb-0310-9956-ffa450edef68
Create r1507044 backport branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1507044@1507300 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-r1507044 branch, backport r1507044 from trunk, with the
following changes:

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c:
  Use ye olde apr_hash_set instead of svn_hash_sets.
  Resolve whitepace conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1507044@1507301 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Add backport branch for r1507044.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1507303 13f79535-47bb-0310-9956-ffa450edef68
Vote +1 on the 1.7.x-r1507044 branch, approving.

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

 * r1507044
   Fix a bug in the Perl bindings.
   Branch: ^/subversion/branches/1.7.x-r1507044
   Justification: The bug makes scripts using SVN::Client look like
     as if they didn't honor config settings from ~/.subversion/servers,
     though they should by default.
   Votes:
     +1: rschupp, danielsh


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1511569 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
* STATUS: Nominate fix for Issue #4408.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1512156 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1512432, r1512471, r1512472 for 1.7.x


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1513317 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Fix busted indentation on r1512432, et al.


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

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1513477 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1512432 group.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1513499 13f79535-47bb-0310-9956-ffa450edef68
* branches/1.7.x/STATUS: Vote for r1490684.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1514317 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for and approve r1490684 for 1.7.x


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