Create a backport branch for 1.7.x issue #4153 fix.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1309894 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1306275 and r1309865, resolving conflicts.
This is not a complete backport yet. The regression test currently fails to run.
It relies on helper functions which the 1.7.x test suite does not have.
However, manual testing shows that the fix itself works.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1309896 13f79535-47bb-0310-9956-ffa450edef68
Sync the 1.7.x-issue4153 branch with 1.7.x.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1338671 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1230798 from trunk (clean merge).
This brings in required changes for the log_diff_moved() test to run.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1338690 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1338691 from trunk.

* subversion/libsvn_client/diff.c
  (diff_repos_repos): Resolve trivial conflict: Local variables 'path_or_url1'
   and 'path_or_url2' are called 'path1' and 'path2' on this branch.
  (diff_summarize_repos_repos): Huge semantic conflict here. The summarize
   diff implementation in 1.7 does not use a separate set of diff callbacks.
   So the code merged from trunk cannot even compile. Do not call the new code
   that handles newly added/deleted diff targets in summarize mode for now.
   This means that diff --summarize now fails for newly added or deleted
   diff targets. This problem will be addressed in a separate commit.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1338702 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1338297 and r1338314 from trunk.
Clean merge without conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1338720 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1338688 from trunk.

* subversion/libsvn_client/diff.c
  (make_regular_props_hash): Use svn_property_kind() instead of
    svn_property_kind2() -- the latter only exists in trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1338725 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1338708 and r1338713 from trunk.
Clean merge without conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1338727 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, fix summarize diff for added and deleted
diff targets. This is a little more involved than I had hoped.

Partially merge r1164116 from trunk. That revision renamed the
file libsvn_client/repos_diff_summarize.c to libsvn_client/diff_summarize.c.
The merge added libsvn_client/diff_summarize.c as a new file on this branch,
and produced an "local edit vs. incoming delete" tree-conflict on
repos_diff_summarize.c which was trivially resolved by reverting this file.
The intention is to keep both files alive on this branch.

The new diff_summarize.c file contains summarize diff callbacks which
can be driven by the code that handles added and deleted diff targets.

To make these callbacks accessible within libsvn_client, declare the
function svn_client__get_diff_summarize_callbacks() in libsvn_client/client.h.

On trunk, svn_client__get_diff_summarize_callbacks() replaced the
function svn_client__get_diff_summarize_editor(), but in 1.7 we want
to keep the latter function around to minimize changes made to the
summarize diff code.

Also, effectively merge r1338739 from trunk in this commit to fix
instantiation of the summarize diff callbacks.

* subversion/libsvn_client/diff.c
  (diff_summarize_repos_repos): Handle added and deleted diff targets
   by calling diff_repos_repos_added_or_deleted_target() if one of
   the diff targets does not exist.

* subversion/libsvn_client/client.h
  (svn_client__get_diff_summarize_callbacks): Declare.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1338753 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1338748 from trunk (clean merge).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1338755 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1339159 from trunk (clean merge).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1339163 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1341548 from trunk.

I'm not quite happy to inflate this branch even more. But r1341548 depends
on a new helper function introduced to 1.7.x in this backport branch.
I'd rather have one large backport nomination than two conflicting ones.

* subversion/libsvn_client/diff.c
  (diff_repos_wc): Resolve a small merge conflict due to local variables
   that were renamed on trunk ('path_or_url1' vs. just 'path1', etc.)


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1341549 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch, merge r1341562 from trunk (clean merge).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1341563 13f79535-47bb-0310-9956-ffa450edef68
On the 1.7.x-issue4153 branch: Sync with ^/subversion/branches/1.7.x@1392816

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4153@1392818 13f79535-47bb-0310-9956-ffa450edef68
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