Make branch for backport of gpg-agent fixes.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-gpg-agent@1600789 13f79535-47bb-0310-9956-ffa450edef68
On 1.8.x-gpg-agent branch: Merge r1600331, r1600348, 1600368, r1600563, r1600781 from trunk.

SVN_VA_NULL changed to just NULL since that macro is not available in 1.8.x


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-gpg-agent@1600790 13f79535-47bb-0310-9956-ffa450edef68
Create backport branch for r1589360

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1589360@1604732 13f79535-47bb-0310-9956-ffa450edef68
Merge r1589360 from trunk, fixing include for 1.8.x

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1589360@1604733 13f79535-47bb-0310-9956-ffa450edef68
Open 1.8.x backport branch for r1611379 & friends.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1611379@1612525 13f79535-47bb-0310-9956-ffa450edef68
Merge r1611379 from /trunk and resolve the text conflicts.

Note, this will not compile due to usage of svn_io_file_create_empty().
Build will be fixed after all patches have been merged.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1611379@1612527 13f79535-47bb-0310-9956-ffa450edef68
Cleanly merge r1612405 from /trunk.

Note, this will not compile due to usage of svn_io_file_create_empty().
Build will be fixed after all patches have been merged.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1611379@1612529 13f79535-47bb-0310-9956-ffa450edef68
Fix the build by replacing new 1.9 API by their 1.8 equivalent.

* subversion/libsvn_subr/io.c
  (svn_io__file_lock_autocreate): Use old, generic API instead of
                                  the new, unavailable specific one.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1611379@1612534 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1611379 branch: Merge r1615354 from /trunk (no conflicts).

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1611379@1616694 13f79535-47bb-0310-9956-ffa450edef68
On the  Merge 1.8.x-r1611379 branch: Merge r1617687 from /trunk.
There were no conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1611379@1618592 13f79535-47bb-0310-9956-ffa450edef68
On '1.8.x-r1589360' branch: Use qsort() directly since svn_sort__array() is 
not available in 1.8.x.

* subversion/libsvn_diff/util.c
  (propchange_sort): Update docstring.
  (svn_diff__display_prop_diffs): Use qsort() instead of svn_sort__array().


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

 * r1589360
   Make property output in 'svn diff' stable
   Justification:
     Local change that makes it easier to compare patch files.
   Branch:
     ^/subversion/branches/1.8.x-r1589360
   Votes:
     +1: ivan, rhuijben, stefan2


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1640659 13f79535-47bb-0310-9956-ffa450edef68
Merge r1620332 from trunk, with --accept=theirs-conflict:

 * r1620332
   Remove broken conflict resolver menu options.
   Justification:
     svn shouldn't offer menu options that always error out.
   Notes:
     Run merge with --accept theirs-conflict
   Votes:
     +1: stsp, julianfoad, stefan2


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

 * r1542610, r1564576, r1568180
   Add missing description to build.conf, to properly generate a version
   resource (including icon) for this executable on Windows.
   Notes:
     r1564576 breaks compilation on Visual Studio 2010, 2012 and 2013 of
     this project. r1568180 fixes this problem.
   Votes:
     +1: rhuijben, breser, stefan2
     +1: (without r1564576, r1568180): stsp


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1640662 13f79535-47bb-0310-9956-ffa450edef68
Merge the 1.8.x-gpg-agent branch:

 * r1600331, r1600348, 1600368, r1600563, r1600781
   Improve gpg-agent support.
   Justification: Avoids spurious error logs, supports standard socket
     locations and removes double prompts from pinentry.  Without these
     changes it's far less desireable to use.
   Notes:
     Branch is needed since SVN_VA_NULL is not available in 1.8.x.
     This does change the behavior of gpg-agent from prompting twice
     for the password with pinentry to confirm the user hasn't entered
     an incorrect password to instead clearing bad cached passwords and
     reprompting.  See my email on the subject: https://mail-archives.apache.org/mod_mbox/subversion-dev/201406.mbox/%3C538D2BE5.3070706%40reser.org%3E
   Branch:
     ^/subversion/branches/1.8.x-gpg-agent
   Votes:
     +1: breser, philip, stefan2


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

 * r1619380, r1619393
   Fix diff of a locally copied directory with props: it showed all props
   as added instead of a diff against the copy-from props.
   Justification:
     Behaviour regression introduced in 1.8.0.
   Notes:
     r1619380 is the fix; r1619393 a test for it.
     The test on trunk@1619393 is tweaked to account for a trunk bug in the
     display of diff headers; the backport branch provides the correct
     version for 1.8.x.
   Branch:
     ^/subversion/branches/1.8.x-r1611379
   Votes:
     +1: julianfoad, rhuijben, stefan2


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